Merge branch 'liweidong'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java

@@ -26,6 +26,7 @@ public enum MesApprovalRecordBizTypeEnum {
     PROCESS_MANAGEMENT_PROJECT_APPROVAL("流程管理立项审批/审核"),
     PROCESS_MANAGEMENT_EXECUTION("流程管理执行/审核"),
     PROCESS_MANAGEMENT_INSPECT("流程管理核查/审核"),
+    DISTRIBUTION_CONTROL_ADJUSTMENT("分派控制调整/审核"),
     ;
 
     private final String desc;

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerModifyServiceImpl.java

@@ -25,9 +25,13 @@ import org.springblade.desk.basic.pojo.vo.PlanAssignSteerModifyDVO;
 import org.springblade.desk.basic.pojo.vo.PlanAssignSteerModifyTimelineVO;
 import org.springblade.desk.basic.pojo.vo.PlanAssignSteerModifyVO;
 import org.springblade.desk.basic.service.*;
+import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
+import org.springblade.desk.common.service.IMesApprovalRecordService;
+import org.springblade.desk.order.pojo.enums.PlateGoodsEnum;
 import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.User;
 import org.springblade.system.pojo.entity.UserInfo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -69,6 +73,9 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign
     @Resource
     IUserClient userClient;
 
+    @Autowired
+    IMesApprovalRecordService mesApprovalRecordService;
+
 
     @Override
     public IPage<PlanAssignSteerModifyVO> selectPlanAssignSteerModifyPage(IPage<PlanAssignSteerModifyVO> page, PlanAssignSteerModify planAssignSteerModify) {
@@ -108,6 +115,7 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign
             entity.setUpdateTime(new Date());
             entity.setCreateUser(userId);
             entity.setUpdateUser(userId);
+            entity.setApprovalStatus(PlanAssignSteerModify.ApprovalStatus.DRAFT);
 
             save(entity);
             for (PlanAssignSteerModifyDVO detail : modifyLst) {
@@ -162,6 +170,9 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign
         updateById(modify);
         
         log.info("重新发起审批，清空历史记录，申请单ID：{}", id);
+        //创建代办
+        mesApprovalRecordService.createApproval
+                (id, MesApprovalRecordBizTypeEnum.DISTRIBUTION_CONTROL_ADJUSTMENT.getDesc(),AuthUtil.getUser().getUserId(),new Date());
         return R.success("已提交至一级审批（室主任审批）");
     }
 
@@ -193,11 +204,11 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign
     private R auditLevel1(Long id, PlanAssignSteerModify modify, String userAccount,
                           Long currentUserId, String currentUserName, Integer currentNode,
                           String currentNodeName, Integer result, String remark, Date now) {
-        // 验证审批人
+        // 验证审批人 按角色审批
-        if (!"lixiangyu".equals(userAccount)) {
+//        if (!"lixiangyu".equals(userAccount)) {
-            return R.fail("您不是当前审批节点的审批人（需要李相宇审批）");
+//            return R.fail("您不是当前审批节点的审批人（需要李相宇审批）");
-        }
+//        }
-        
+
         // 检查重复审批
         if (checkDuplicateApproval(id, currentNode, currentUserId)) {
             return R.fail("您已经完成审批，不能重复审批");
@@ -212,6 +223,8 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign
             modify.setApprovalStatus(PlanAssignSteerModify.ApprovalStatus.REJECT);
             modify.setUpdateTime(now);
             updateById(modify);
+            //审批驳回
+            mesApprovalRecordService.rejectApproval(id, MesApprovalRecordBizTypeEnum.DISTRIBUTION_CONTROL_ADJUSTMENT.getDesc(),  AuthUtil.getUserId(), new Date());
             return R.success("审批已驳回");
         } else {
             // 通过：进入二级审批
@@ -219,6 +232,8 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign
             modify.setUpdateTime(now);
             updateById(modify);
             log.info("一级审批通过，进入二级审批，申请单ID：{}", id);
+            //审批通过
+            mesApprovalRecordService.passApproval(id, MesApprovalRecordBizTypeEnum.DISTRIBUTION_CONTROL_ADJUSTMENT.getDesc(),  AuthUtil.getUserId(), new Date());
             return R.success("审批成功");
         }
     }
@@ -252,6 +267,8 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign
             modify.setApprovalStatus(PlanAssignSteerModify.ApprovalStatus.REJECT);
             modify.setUpdateTime(now);
             updateById(modify);
+            //审批驳回
+            mesApprovalRecordService.rejectApproval(id, MesApprovalRecordBizTypeEnum.DISTRIBUTION_CONTROL_ADJUSTMENT.getDesc(),  AuthUtil.getUserId(), new Date());
             return R.success("审批已驳回");
         } else {
             // 通过：检查是否所有人都已通过
@@ -271,6 +288,10 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign
                 modify.setUpdateTime(now);
                 updateById(modify);
                 updatePlanAssignSteerFromModify(id);
+                //审批通过
+                mesApprovalRecordService.passApproval(id, MesApprovalRecordBizTypeEnum.DISTRIBUTION_CONTROL_ADJUSTMENT.getDesc(),  AuthUtil.getUserId(), new Date());
+            }else {
+                mesApprovalRecordService.pendingApproval(id, MesApprovalRecordBizTypeEnum.DISTRIBUTION_CONTROL_ADJUSTMENT.getDesc(), currentUserId, now);
             }
 
             return R.success("审批成功");

blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesPlanAssignSteerModifyServiceImpl.java

@@ -0,0 +1,37 @@
+package org.springblade.desk.common.service.impl;
+
+import jakarta.annotation.Resource;
+import org.springblade.desk.basic.pojo.vo.PlanAssignSteerModifyVO;
+import org.springblade.desk.basic.service.IPlanAssignSteerModifyService;
+import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
+import org.springblade.desk.common.service.ApprovalRecordDetailStrategy;
+import org.springblade.desk.dashboard.pojo.entity.BsWorkCenterEntity;
+import org.springblade.desk.dashboard.pojo.entity.DsBatchPreservePlanEntity;
+import org.springblade.desk.dashboard.pojo.vo.DsBatchPreservePlanVO;
+import org.springblade.desk.dashboard.service.IBsWorkCenterService;
+import org.springblade.desk.dashboard.service.IDsBatchPreservePlanService;
+import org.springblade.system.feign.IUserClient;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 槽液计划类审核待办策略实现类
+ */
+@Service
+public class MesPlanAssignSteerModifyServiceImpl implements ApprovalRecordDetailStrategy<PlanAssignSteerModifyVO> {
+
+    @Resource
+    private IPlanAssignSteerModifyService service;
+
+    @Override
+    public String getBizType() {
+        return MesApprovalRecordBizTypeEnum.DISTRIBUTION_CONTROL_ADJUSTMENT.getDesc();
+    }
+
+    @Override
+    public PlanAssignSteerModifyVO getDetail(Long bizId) {
+        PlanAssignSteerModifyVO detail = service.getDetail(bizId, null);
+        return detail;
+    }
+}