From 5fe8ff34be956b9d4beeed5be94ba25715b50474 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 10 Nov 2026 10:22:56 +0800 Subject: [PATCH] =?UTF-8?q?2026-11-10=20=E5=A2=9E=E5=8A=A0=E5=8A=A8?= =?UTF-8?q?=E6=8E=A710013?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ScheduleServiceImpl.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 7f34b25..45627dd 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/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 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 body, String failLabel) {