更新内部报验优化

发起时不设置检验员

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionDispatchServiceImpl.java

@@ -42,14 +42,17 @@ public class ZhcxInsideInspectionDispatchServiceImpl extends ServiceImpl<ZhcxIns
 
         ZhcxInsideInspectionDispatchDo dispatchDo = new ZhcxInsideInspectionDispatchDo();
         //存在派单
-        if(ObjectUtil.isNotEmpty(inspectionDo.getCheckerid())) {
-            dispatchDo.setSupervisionid(inspectionDo.getCheckerid());
-            dispatchDo.setSupervision(inspectionDo.getCheckername());
-            dispatchDo.setSupervisionphone(inspectionDo.getCheckercontact());
-            dispatchDo.setDispatchstatus("20");
-        } else {
+        /**
+         * 需求变更, 保存时不设置检验员 修改于2024年8月7日
+         */
+//        if(ObjectUtil.isNotEmpty(inspectionDo.getCheckerid())) {
+//            dispatchDo.setSupervisionid(inspectionDo.getCheckerid());
+//            dispatchDo.setSupervision(inspectionDo.getCheckername());
+//            dispatchDo.setSupervisionphone(inspectionDo.getCheckercontact());
+//            dispatchDo.setDispatchstatus("20");
+//        } else {
             dispatchDo.setDispatchstatus("10");
-        }
+//        }
 
         if(ObjectUtil.isNotNull(dispatch)) {
             dispatchDo.setId(dispatch.getId());

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionServiceImpl.java

@@ -814,11 +814,14 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
             //改派信息
             StringBuilder sb = new StringBuilder();
             if(req.getDispatchFlag() == 2) {
-                sb.append("改派：");
                 sb.append(inOper.getDispatch().getSupervision());
                 sb.append("改为");
                 sb.append(userDo.getName());
                 descMap.put(insideId, sb.toString());
+            } else if (req.getDispatchFlag() == 1) {
+                sb.append("派单给");
+                sb.append(userDo.getName());
+                descMap.put(insideId, sb.toString());
             }
 
             //更改检验室
@@ -1444,15 +1447,21 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
     private String checkParam4Cancel(InsideOperDto operDto, InsideInspectionRequest dto) {
 
         //报验完成
-        if("30".equals(operDto.getInspection().getInspectioncomplatetime())) {
+        if("30".equals(operDto.getInspection().getInspectionstatus())) {
             return "单据号:".concat(operDto.getInspection().getInspectioncode()).concat("检验员已提交报验结论不能取消,请刷新数据查看");
         }
 
         //未提交
-        if("10".equals(operDto.getInspection().getInspectioncomplatetime())) {
+        if("10".equals(operDto.getInspection().getInspectionstatus())) {
             return "单据号:".concat(operDto.getInspection().getInspectioncode()).concat("未提交的数据可以直接删除,请刷新数据查看");
         }
 
+        // 待报验、已派单
+        if("20".equals(operDto.getInspection().getInspectionstatus())
+        && "20".equals(operDto.getDispatch().getDispatchstatus())) {
+            return "单据号:".concat(operDto.getInspection().getInspectioncode()).concat("该报验单已被派单,不能取消,请刷新数据查看");
+        }
+
         //取消
         if("40".equals(operDto.getInspection().getInspectionstatus())) {
             return "单据号:".concat(operDto.getInspection().getInspectioncode()).concat("已取消不能重复取消,请刷新数据查看");