楚江ERP：延期发货-消息通知

房远帅
1 parent 58ce32a4
Showing 3 changed files with 141 additions and 11 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/DelayedShipmentDetail.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/delay/DelayedShipmentServiceImpl.java
xingyun-sc/src/main/resources/mappers/shipments/delay/DelayedShipmentDetailMapper.xml
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/DelayedShipmentDetail.java
View file @5212d10
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/DelayedShipmentDetail.java
View file @5212d10
@@ -117,6 +117,12 @@ public class DelayedShipmentDetail extends BaseEntity implements BaseDto {
     private String delayReason;
     /**
+     * 合同创建人
+     */
+    @TableField(exist = false)
+    private String contractCreateById;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/delay/DelayedShipmentServiceImpl.java
View file @5212d10
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/delay/DelayedShipmentServiceImpl.java
View file @5212d10
@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.mq.core.service.MqProducerService;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;;
@@ -20,16 +21,22 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.bo.usercenter.UserInfoBo;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.starter.web.inner.dto.system.UserInfoDto;
+import com.lframework.starter.web.inner.entity.SysRole;
+import com.lframework.starter.web.inner.service.system.SysRoleService;
+import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.entity.DelayedShipment;
 import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
+import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.mappers.DelayedShipmentMapper;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
 import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentService;
 import com.lframework.xingyun.sc.vo.shipments.delay.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -51,6 +58,12 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
     private SysUserService sysUserService;
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private MqProducerService mqProducerService;
+    @Resource
+    private SysUserRoleService sysUserRoleService;
+    @Resource
+    private TransactorHandler transactorHandler;
     @Override
     public PageResult<DelayedShipment> query(Integer pageIndex, Integer pageSize, QueryDelayedShipmentVo vo) {
@@ -160,9 +173,9 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
         newRoleCodes.add("sfcsckjhy");
         newRoleCodes.add("ztfcsckjhy");
         boolean hasAny = newRoleCodes.stream().anyMatch(roleCodes::contains);
+        DelayedShipmentDetail delayedShipmentDetail = delayedShipmentDetailService.findById(id);
         if (delayedExceedOneDay && !hasAny) {
             //开启审核
-            DelayedShipmentDetail delayedShipmentDetail = delayedShipmentDetailService.findById(id);
             vo.setWorkshopCode(delayedShipmentDetail.getWorkshopCode());
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
@@ -174,14 +187,68 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
             vo1.setDelayedShipmentId(data.getId());
             List<DelayedShipmentDetail> query = delayedShipmentDetailService.query(vo1);
             if (CollectionUtil.isNotEmpty(query)) {
-                for (DelayedShipmentDetail delayedShipmentDetail : query) {
-                    purchaseOrderLineService.updateDeliveryDate(delayedShipmentDetail.getOrderSpecId(),
-                            delayedShipmentDetail.getApplyShipmentDate());
+                for (DelayedShipmentDetail detail : query) {
+                    purchaseOrderLineService.updateDeliveryDate(detail.getOrderSpecId(), detail.getApplyShipmentDate());
                 }
             }
         }
-        //todo 消息通知
-
+        //todo 消息通知经营办计划员、经营办发货员、业务员、办事处内勤和经营办主管。
+        List<String> userIdList = new ArrayList<>();
+        List<String> codeList = new ArrayList<>();
+        String workshopCode = delayedShipmentDetail.getWorkshopCode();
+        //业务员
+        String contractCreateById = delayedShipmentDetail.getContractCreateById();
+        userIdList.add(contractCreateById);
+        //办事处内勤
+        List<String> list1 = transactorHandler.listTransactorsByRoleCode("bscnq", contractCreateById);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            userIdList.addAll(list1);
+        }
+        if ("yfc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("yfcjybjhy");
+            codeList.add("yfcjybfhy");
+            codeList.add("yfcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        } else if ("efc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("efcjybjhy");
+            codeList.add("efcjybfhy");
+            codeList.add("efcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        } else if ("sfc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("sfcjybjhy");
+            codeList.add("sfcjybfhy");
+            codeList.add("sfcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        } else if ("sfc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("ztfcjybjhy");
+            codeList.add("ztfcjybfhy");
+            codeList.add("ztcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        }
+        SysSiteMessageDto messageDto = new SysSiteMessageDto();
+        messageDto.setUserIdList(userIdList);
+        messageDto.setTitle("延期发货通知");
+        messageDto.setContent("延期发货通知！");
+        messageDto.setBizKey(IdUtil.getId());
+        //如果是空表示由系统自动发起
+        messageDto.setCreateUserId(null);
+        mqProducerService.createSysSiteMessage(messageDto);
         return data.getId();
     }
@@ -256,9 +323,9 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
         newRoleCodes.add("sfcsckjhy");
         newRoleCodes.add("ztfcsckjhy");
         boolean hasAny = newRoleCodes.stream().anyMatch(roleCodes::contains);
+        DelayedShipmentDetail delayedShipmentDetail = delayedShipmentDetailService.findById(id);
         if (delayedExceedOneDay && !hasAny) {
             //开启审核
-            DelayedShipmentDetail delayedShipmentDetail = delayedShipmentDetailService.findById(id);
             vo.setWorkshopCode(delayedShipmentDetail.getWorkshopCode());
             flowInstanceWrapperService.startInstance(BPM_FLAG, vo.getId(), BPM_FLAG, vo);
@@ -270,13 +337,68 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
             vo1.setDelayedShipmentId(data.getId());
             List<DelayedShipmentDetail> query = delayedShipmentDetailService.query(vo1);
             if (CollectionUtil.isNotEmpty(query)) {
-                for (DelayedShipmentDetail delayedShipmentDetail : query) {
-                    purchaseOrderLineService.updateDeliveryDate(delayedShipmentDetail.getOrderSpecId(),
-                            delayedShipmentDetail.getApplyShipmentDate());
+                for (DelayedShipmentDetail detail : query) {
+                    purchaseOrderLineService.updateDeliveryDate(detail.getOrderSpecId(), detail.getApplyShipmentDate());
                 }
             }
         }
-        //todo 消息通知
+        //todo 消息通知经营办计划员、经营办发货员、业务员、办事处内勤和经营办主管。
+        List<String> userIdList = new ArrayList<>();
+        List<String> codeList = new ArrayList<>();
+        String workshopCode = delayedShipmentDetail.getWorkshopCode();
+        //业务员
+        String contractCreateById = delayedShipmentDetail.getContractCreateById();
+        userIdList.add(contractCreateById);
+        //办事处内勤
+        List<String> list1 = transactorHandler.listTransactorsByRoleCode("bscnq", contractCreateById);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            userIdList.addAll(list1);
+        }
+        if ("yfc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("yfcjybjhy");
+            codeList.add("yfcjybfhy");
+            codeList.add("yfcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        } else if ("efc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("efcjybjhy");
+            codeList.add("efcjybfhy");
+            codeList.add("efcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        } else if ("sfc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("sfcjybjhy");
+            codeList.add("sfcjybfhy");
+            codeList.add("sfcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        } else if ("ztfc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("ztfcjybjhy");
+            codeList.add("ztfcjybfhy");
+            codeList.add("ztcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        }
+        SysSiteMessageDto messageDto = new SysSiteMessageDto();
+        messageDto.setUserIdList(userIdList);
+        messageDto.setTitle("延期发货通知");
+        messageDto.setContent("延期发货通知！");
+        messageDto.setBizKey(IdUtil.getId());
+        //如果是空表示由系统自动发起
+        messageDto.setCreateUserId(null);
+        mqProducerService.createSysSiteMessage(messageDto);
     }
     @OpLog(type = OtherOpLogType.class, name = "修改状态，ID：{}", params = {"#id"})
--- a/xingyun-sc/src/main/resources/mappers/shipments/delay/DelayedShipmentDetailMapper.xml
View file @5212d10
+++ b/xingyun-sc/src/main/resources/mappers/shipments/delay/DelayedShipmentDetailMapper.xml
View file @5212d10
@@ -20,6 +20,7 @@
         <result column="apply_count" property="applyCount"/>
         <result column="quantity" property="quantity"/>
         <result column="delay_reason" property="delayReason"/>
+        <result column="contract_create_by_id" property="contractCreateById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -52,6 +53,7 @@
             tb.apply_count,
             tb.quantity,
             tb.delay_reason,
+            o.contract_create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.update_by_id,