From 45cf0155027278bd4927ad25b40322b47df78c1c Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期三, 28 一月 2026 13:31:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java
index 409f546..f4b4492 100644
--- a/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java
@@ -248,11 +248,6 @@
}
Integer crnNo = basDualCrnp.getCrnNo();
- int station = calcStation(dualCrnProtocol, "in");
- if (station == 0) {
- News.info("鍙屽伐浣嶅爢鍨涙満:{} 鏃犲彲鐢ㄥ伐浣�", basDualCrnp.getCrnNo());
- return false;
- }
if (wrkMast.getWrkSts() != WrkStsType.INBOUND_DEVICE_RUN.sts) {
return false;
@@ -311,6 +306,33 @@
inStationObjModel = stationObjModel;
break;
}
+
+ StationObjModel dualCrnSlaveStationObjModel = stationObjModel.getDualCrnSlaveStation();
+ if (dualCrnSlaveStationObjModel == null) {
+ continue;
+ }
+
+ StationProtocol slaveStationProtocol = stationProtocolMap.get(dualCrnSlaveStationObjModel.getStationId());
+ if (slaveStationProtocol == null) {
+ continue;
+ }
+
+ if (!slaveStationProtocol.isAutoing()) {
+ continue;
+ }
+
+ if (!slaveStationProtocol.isLoading()) {
+ continue;
+ }
+
+ if (slaveStationProtocol.getTaskNo() <= 0) {
+ continue;
+ }
+
+ if (slaveStationProtocol.getTaskNo().equals(wrkMast.getWrkNo())) {
+ inStationObjModel = dualCrnSlaveStationObjModel;
+ break;
+ }
}
if (inStationObjModel == null) {
@@ -318,6 +340,7 @@
return false;
}
+ Integer station = inStationObjModel.getDualCrnExecuteStation();
String sourceLocNo = Utils.getLocNo(inStationObjModel.getDeviceRow(), inStationObjModel.getDeviceBay(), inStationObjModel.getDeviceLev());
List<DualCrnCommand> commandList = new ArrayList<>();
--
Gitblit v1.9.1