楚江erp：订货单变更消息通知bug修复

 package com.lframework.xingyun.sc.handlers;
 package com.lframework.xingyun.sc.handlers;
 
 
 import com.lframework.starter.mq.core.service.MqProducerService;
 import com.lframework.starter.mq.core.service.MqProducerService;
+import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
@@ -34,10 +35,10 @@ public class MessageHandler {
     public void sendMsg(String userId, List<String> roleCodes, String businessType, String sendUserId) {
     public void sendMsg(String userId, List<String> roleCodes, String businessType, String sendUserId) {
         log.info("================== MessageHandler sendMsg invoke start, userId:{}, roleCodes:{}", userId, JsonUtil.toJsonString(roleCodes));
         log.info("================== MessageHandler sendMsg invoke start, userId:{}, roleCodes:{}", userId, JsonUtil.toJsonString(roleCodes));
         List<String> receiveUserIds = new ArrayList<>();
         List<String> receiveUserIds = new ArrayList<>();
-        if (StringUtils.isBlank(userId)) {
+        if (StringUtils.isNotBlank(userId)) {
             receiveUserIds.add(userId);
             receiveUserIds.add(userId);
         }
         }
-        if (CollectionUtils.isEmpty(roleCodes)) {
+        if (CollectionUtils.isNotEmpty(roleCodes)) {
             // 获取角色下人员ID
             // 获取角色下人员ID
             List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(roleCodes);
             List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(roleCodes);
             if (CollectionUtils.isNotEmpty(userIds)) {
             if (CollectionUtils.isNotEmpty(userIds)) {
@@ -55,6 +56,9 @@ public class MessageHandler {
         String content = "";
         String content = "";
         String bizKey = "";
         String bizKey = "";
         if ("SPEC_CHANGE_SUBMIT".equals(businessType)) {
         if ("SPEC_CHANGE_SUBMIT".equals(businessType)) {
+            title = "已产出，有损消息通知";
+            content = "已产出，有损消息通知";
+            bizKey = IdUtil.getUUID();
         }
         }
         sendMsg(receiveUserIds, title, content, bizKey, sendUserId);
         sendMsg(receiveUserIds, title, content, bizKey, sendUserId);
         log.info("================== MessageHandler sendMsg invoke end!");
         log.info("================== MessageHandler sendMsg invoke end!");

@@ -401,13 +401,24 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         updateWrapper.set(OrderInfoChangeRecord::getOutput, true)
         updateWrapper.set(OrderInfoChangeRecord::getOutput, true)
                 .eq(OrderInfoChangeRecord::getId, id);
                 .eq(OrderInfoChangeRecord::getId, id);
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
-        // 消息通知
+
         List<String> roleCodes = new ArrayList<>();
         List<String> roleCodes = new ArrayList<>();
-        // 各个分厂经营办计划员
-        roleCodes.add("yfcjybjhy");
-        roleCodes.add("efcjybjhy");
-        roleCodes.add("sfcjybjhy");
-        roleCodes.add("ztfcjybjhy");
+        // 获取分厂数据
+        String workshopId = record.getWorkshopId();
+        Workshop workshop = workshopService.findById(workshopId);
+        if (workshop != null) {
+            String code = workshop.getCode();
+            if ("yfc".equals(code)) {
+                roleCodes.add("yfcjybjhy");
+            } else if ("efc".equals(code)) {
+                roleCodes.add("efcjybjhy");
+            } else if ("sfc".equals(code)) {
+                roleCodes.add("sfcjybjhy");
+            } else if ("ztfc".equals(code)) {
+                roleCodes.add("ztfcjybjhy");
+            }
+        }
+        // 消息通知
         messageHandler.sendMsg(record.getCreateById(), roleCodes, "SPEC_CHANGE_SUBMIT", null);
         messageHandler.sendMsg(record.getCreateById(), roleCodes, "SPEC_CHANGE_SUBMIT", null);
     }
     }
 
 

@@ -368,7 +368,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             } else if ("PART".equals(type)) {
             } else if ("PART".equals(type)) {
                 title += "已部分发货！";
                 title += "已部分发货！";
             }
             }
-            messageHandler.sendMsg(userIds, title, "", "", null);
+            messageHandler.sendMsg(userIds, title, title, shipmentsOrderId, null);
         }
         }
     }
     }