库存不足通知修改

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

@@ -39,6 +39,7 @@ import org.springframework.beans.BeanUtils;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -157,6 +158,7 @@ public class CollectService {
             if (StringUtils.isNotEmpty(dto.getSign())) {
 
             } else {
+                List<String> warnInfoList = new ArrayList<>();
                 for (CollectDetailed detailInfo : dto.getDetailInfos()) {
 
                     CollectDetailed materialDetailed = detailedMapper.selectById(detailInfo.getId());
@@ -226,27 +228,31 @@ public class CollectService {
                                 BigDecimal whnum = new BigDecimal(wareHouseNumString); // 当前库存量
                                 BigDecimal warnNum = new BigDecimal(byTypeAndTradeName.get(0).getWarnNum()); // 提醒数量
                                 if ("1".equals(byTypeAndTradeName.get(0).getWarnFlag()) && whnum.compareTo(warnNum) <= 0 ) {
-                                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-                                    String day = format.format(new Date());
-                                    String title = "管理员发起了 [库存提醒]";
-                                    //向多个用户发起通知 徐珊、黄丽、杨娟、崇祝燕
-                                    List<UserDTO> usersInfo = wareHouseDetailedMapper.getUsersInfo();
-                                    //获取目前领用流程的taskid，根据procInsId去查taskId
-                                    String uuid = "";
-                                    if (null != usersInfo) {
-                                        for (UserDTO userDTO1 : usersInfo) {
-                                            uuid = UUID.randomUUID().toString();
-                                            //发送通知
-//                                        myNoticeService.add(uuid, title, "", "库存提醒", userDTO.getLoginName(), day,userDTO1.getLoginName(), userDTO1.getId());
-                                            myNoticeService.add(uuid, title, detailInfo.getBasicId(), "库存提醒", "管理员", day,userDTO1.getLoginName(), userDTO1.getId());
-                                        }
-                                    }
+                                    warnInfoList.add(detailInfo.getGoodsName());
                                 }
                             }
                         }
                     }
 
                 }
+                if (CollectionUtil.isNotEmpty(warnInfoList)) {
+                    String warnInfo = String.join("、", warnInfoList);
+                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+                    String day = format.format(new Date());
+                    String title = "管理员发起了 ["+ warnInfo +"] [库存提醒]";
+                    //向多个用户发起通知 徐珊、黄丽、杨娟、崇祝燕
+                    List<UserDTO> usersInfo = wareHouseDetailedMapper.getUsersInfo();
+                    //获取目前领用流程的taskid，根据procInsId去查taskId
+                    String uuid = "";
+                    if (null != usersInfo) {
+                        for (UserDTO userDTO1 : usersInfo) {
+                            uuid = UUID.randomUUID().toString();
+                            //发送通知
+//                                        myNoticeService.add(uuid, title, "", "库存提醒", userDTO.getLoginName(), day,userDTO1.getLoginName(), userDTO1.getId());
+                            myNoticeService.add(uuid, title, dto.getId(), "库存提醒", "管理员", day,userDTO1.getLoginName(), userDTO1.getId());
+                        }
+                    }
+                }
             }
 
         }