From cf9211f711be85c8e0c1c739d01c8694d2cf5c51 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期一, 13 四月 2026 16:23:04 +0800
Subject: [PATCH] 屏蔽预调度任务

---
 src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index c161253..34fe8b5 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -134,11 +134,11 @@
             return;
         }
 
-        //鎵ц绉诲姩浠诲姟
-        boolean executed = executeCrnMoveTask(crnThread, crnProtocol);
-        if (executed) {
-            return;
-        }
+//        //鎵ц绉诲姩浠诲姟
+//        boolean executed = executeCrnMoveTask(crnThread, crnProtocol);
+//        if (executed) {
+//            return;
+//        }
 
         String lastIo = resolveCrnLastIo(crnProtocol);
 
@@ -163,7 +163,7 @@
             if (wrkMast.getWrkSts() != null && wrkMast.getWrkSts() == WrkStsType.INBOUND_STATION_RUN_COMPLETE.sts) {
                 boolean result = this.crnExecuteInPlanner(currentCrn, crnThread, wrkMast);
                 if (result) {
-                    crnProtocol.setLastIo("O");
+                    crnProtocol.setLastIo("I");
                     return;
                 }
                 continue;
@@ -172,7 +172,7 @@
             if (wrkMast.getWrkSts() != null && wrkMast.getWrkSts() == WrkStsType.NEW_OUTBOUND.sts) {
                 boolean result = this.crnExecuteOutPlanner(currentCrn, crnThread, wrkMast);
                 if (result) {
-                    crnProtocol.setLastIo("I");
+                    crnProtocol.setLastIo("O");
                     return;
                 }
                 continue;
@@ -387,9 +387,9 @@
             return false;
         }
 
-        if (!allowBatchOutboundExecute(wrkMast, true)) {
-            return false;
-        }
+//        if (!allowBatchOutboundExecute(wrkMast, true)) {
+//            return false;
+//        }
 
         for (StationObjModel stationObjModel : outStationList) {
             StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());

--
Gitblit v1.9.1