2026-11-10

增加动控10013

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -87,6 +87,7 @@ public class ScheduleServiceImpl implements ScheduleService {
     private static final String FLAG_N = "N";
     private static final String TID_SPLIT_CONTROL_NO = "10011";
     private static final String TID_FINISH_CONTROL_NO = "10012";
+    private static final String TID_FINISH_SPLIT_CONTROL_NO = "10013";
     private static final String TODO_DETAIL_STAGE_TRIGGER = "TRIGGER";
     private static final String TODO_DETAIL_STAGE_REPORT = "REPORT";
 
@@ -3104,6 +3105,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         String exceptionReason = inData.getExceptionReason();
 
         checkTidFinishControl(inData);
+        checkTidFinishSplitControl(inData);
 
         //1.调用检查的方法
         this.checkFinishScheduleWithNoFqc(inData);
@@ -5062,8 +5064,16 @@ public class ScheduleServiceImpl implements ScheduleService {
     }
 
     private void checkTidSplitControl(SearchScheduleData inData) {
+        checkTidRollsControl(inData, TID_SPLIT_CONTROL_NO, "TID分卷校验");
+    }
+
+    private void checkTidFinishSplitControl(SearchScheduleData inData) {
+        checkTidRollsControl(inData, TID_FINISH_SPLIT_CONTROL_NO, "TID结单控制（分卷）");
+    }
+
+    private void checkTidRollsControl(SearchScheduleData inData, String controlNo, String failLabel) {
         String workCenterNo = inData.getWorkCenterNo() == null ? "" : inData.getWorkCenterNo().trim();
-        if (!sysSceneDynamicControlModelService.isAnyCheckedDimensionEnabled(inData.getSite(), TID_SPLIT_CONTROL_NO, buildTidControlContext(inData))) {
+        if (!sysSceneDynamicControlModelService.isAnyCheckedDimensionEnabled(inData.getSite(), controlNo, buildTidControlContext(inData))) {
             return;
         }
         List<String> rollNos = scheduleMapper.listTidPendingNormalRolls(inData.getSite(), inData.getSeqNo());
@@ -5082,9 +5092,9 @@ public class ScheduleServiceImpl implements ScheduleService {
         body.put("process", workCenterNo);
         body.put("rollLabels", rollNos);
         body.put("machineNo", resourceId);
-        logger.info("TID分卷校验请求: site={}, orderNo={}, seqNo={}",
-                inData.getSite(), inData.getOrderNo(), inData.getSeqNo());
-        postMesLogs("/checkRolls", body, "TID分卷校验");
+        logger.info("{}请求: site={}, orderNo={}, seqNo={}",
+                failLabel, inData.getSite(), inData.getOrderNo(), inData.getSeqNo());
+        postMesLogs("/checkRolls", body, failLabel);
         scheduleMapper.updateTidPassFlag(inData.getSite(), inData.getSeqNo(), rollNos);
     }
 
@@ -5169,9 +5179,9 @@ public class ScheduleServiceImpl implements ScheduleService {
         body.put("quantity", quantityValue);
         body.put("process", workCenterNo);
         body.put("machineNo", resourceId);
-        logger.info("TID结单校验请求: site={}, orderNo={}, seqNo={}, process={}, machineNo={}, quantity={}",
+        logger.info("TID结单控制（结单）请求: site={}, orderNo={}, seqNo={}, process={}, machineNo={}, quantity={}",
                 inData.getSite(), inData.getOrderNo(), inData.getSeqNo(), workCenterNo, resourceId, quantityValue);
-        postMesLogs("/checkQuantity", body, "TID结单校验");
+        postMesLogs("/checkQuantity", body, "TID结单控制（结单）");
     }
 
     private void postMesLogs(String path, Map<String, Object> body, String failLabel) {