From c828579bf44bf5b2ded4c04b16670be71cc76514 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 18 四月 2026 10:56:31 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 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..d58d707 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());
@@ -398,7 +398,15 @@
}
Map<Integer, StationProtocol> stationProtocolMap = stationThread.getStatusMap();
- StationProtocol stationProtocol = stationProtocolMap.get(stationObjModel.getStationId());
+
+ //鑾峰彇褰撳墠浠诲姟鍫嗗灈鏈轰换鍔＄珯鍙�
+ Integer staNo = wrkMast.getSourceStaNo();
+ Integer stationId = stationObjModel.getStationId();
+ StationProtocol stationProtocol = stationProtocolMap.get(staNo);
+
+ if (!staNo.equals(stationId)) {
+ continue;
+ }
if (stationProtocol == null) {
continue;
}
--
Gitblit v1.9.1