库存不足提醒页面修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/collect/service/CollectService.java

@@ -208,13 +208,11 @@ public class CollectService {
                             detailInfo.setSurplusNumber(num + "");
                             detailedMapper.updateById(detailInfo);
                             //当小于5的时候发起通知
-                            if (num < 5 ) {
+                            if (num <= 5 ) {
                                 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
                                 String day = format.format(new Date());
                                 String title = userDTO.getLoginName() + " 在 " + day + " 发起了 [库存提醒]";
                                 //向多个用户发起通知 徐珊、黄丽、杨娟、崇祝燕
-//                                String[] names = {"徐珊","黄丽","杨娟","崇祝燕"};
-
                                 List<UserDTO> usersInfo = wareHouseDetailedMapper.getUsersInfo();
                                 //获取目前领用流程的taskid，根据procInsId去查taskId
                                 String uuid = "";
@@ -222,18 +220,10 @@ public class CollectService {
                                     for (UserDTO userDTO1 : usersInfo) {
                                         uuid = UUID.randomUUID().toString();
                                         //发送通知
-                                        myNoticeService.add(uuid, title, "", "库存提醒", userDTO.getLoginName(), day,userDTO1.getLoginName(), userDTO1.getId());
+//                                        myNoticeService.add(uuid, title, "", "库存提醒", userDTO.getLoginName(), day,userDTO1.getLoginName(), userDTO1.getId());
+                                        myNoticeService.add(uuid, title, detailInfo.getBasicId(), "库存提醒", userDTO.getLoginName(), day,userDTO1.getLoginName(), userDTO1.getId());
                                     }
-//                                    usersInfo.forEach(us->{
-//
-//                                        try {
-//
-//                                        } catch (Exception e) {
-//                                            e.printStackTrace();
-//                                        }
-//                                    });
                                 }
-//                                myNoticeService.add("", title, "", "库存提醒", userDTO.getLoginName(), day,"程倩", "1613087772650008578");
                             }
                         }
                     }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseBasicMapper.xml

@@ -32,32 +32,46 @@
 	</select>
 	<select id="summaryList2"
 			resultType="com.jeeplus.test.materialManagement.wareHouse.service.dto.WareHouseDto">
-		SELECT
-			a.id,
-			a.create_by,
-			a.create_date,
-			a.ware_house_type,
-			a.trade_name,
-			a.company,
-			c.name as wareHouseTypeName,
-			sum(trade_number) as allNumber,
-			b.collect_number as borrowNumber,
-			IFNULL((sum(trade_number) - collect_number),sum(trade_number)) as tradeNumber
-		FROM
-			material_management_warehouse_detailed a
-			left join
-			(select sum(collect_number) as collect_number,goods_name,status from material_management_collect_detailed e
-			left join material_management_collect_basics f on e.basic_id = f.id and f.del_flag = 0
-			WHERE f.`status` = 5
-			GROUP BY e.goods_name) b
-			on a.trade_name = b.goods_name
-
-			LEFT JOIN material_management_warehouse_basics bas on a.basic_id = bas.id
-			left join material_management_type c on a.ware_house_type = c.id
-			${ew.customSqlSegment}
-			GROUP BY a.trade_name
-			HAVING sum( trade_number ) - IFNULL(collect_number,0) &lt;= 5
-			ORDER BY a.update_date DESC
+			SELECT
+				a.id,
+				a.create_by,
+				a.create_date,
+				a.ware_house_type,
+				a.trade_name,
+				a.company,
+				b.NAME AS wareHouseTypeName,
+				sum( trade_number ) AS allNumber,
+				b.collect_number AS borrowNumber,
+				IFNULL((
+						sum( trade_number ) - collect_number
+						),
+				sum( trade_number )) AS tradeNumber,
+				b.mmcId as mmcId
+			FROM
+				material_management_warehouse_detailed a
+				LEFT JOIN (
+				SELECT
+					sum( g.collect_number ) AS collect_number,
+					e.goods_name,
+					c.NAME as name,
+					e.basic_id as mmcId,
+				STATUS
+				FROM
+					material_management_collect_detailed e
+					LEFT JOIN material_management_collect_basics f ON e.basic_id = f.id
+					AND f.del_flag = 0
+					LEFT JOIN material_management_type c ON e.collect_type = c.id
+					left join material_management_collect_detailed g on e.goods_name = g.goods_name
+				WHERE
+					f.`status` = 5
+				GROUP BY
+					e.id
+				) b ON a.trade_name = b.goods_name
+				LEFT JOIN material_management_type c ON a.ware_house_type = c.id
+				${ew.customSqlSegment}
+				GROUP BY a.trade_name
+				HAVING sum( trade_number ) - IFNULL(collect_number,0) &lt;= 5
+				ORDER BY a.update_date DESC
 	</select>
     <select id="summaryList"
             resultType="com.jeeplus.test.materialManagement.wareHouse.service.dto.WareHouseDto">

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/WareHouseBasicService.java

@@ -500,17 +500,20 @@ public class WareHouseBasicService {
         if (StringUtils.isNotEmpty(dto.getTradeName())) {
             queryWrapper.like("a.trade_name", dto.getTradeName());
         }
-        queryWrapper.and(wq ->{
-            wq.eq("bas.`status`","0")
-                    .or()
-                    .eq("bas.`status`","5");
-        });
+        if (StringUtils.isNotEmpty(dto.getBasicId())) {
+            queryWrapper.eq("b.mmcId", dto.getBasicId());
+        }
+//        queryWrapper.and(wq ->{
+//            wq.eq("bas.`status`","0")
+//                    .or()
+//                    .eq("bas.`status`","5");
+//        });
 
         //入库类型
         if (StringUtils.isNotEmpty(dto.getWareHouseType())) {
             queryWrapper.eq("c.id", dto.getWareHouseType());
         }
-        return basicMapper.summaryList(page, queryWrapper);
+        return basicMapper.summaryList2(page, queryWrapper);
     }
 
     /**