From a8990be617f61ff8467c5b7cc6a0dfd1493607c5 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期四, 27 二月 2025 09:11:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index bf4a9f5..814365d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -272,9 +272,6 @@
}else if (inSta.getStaNo().equals(213)){
staProtocol.setWorkNo((short)9995);
staProtocol.setStaNo((short)214);
- }else {
- staProtocol.setWorkNo((short)9995);
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
}
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -4950,9 +4947,25 @@
// }
}
} else {
- // 鍏ュ簱妯″紡
- devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
-
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, 1);
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol != null) {
+ if (crnProtocol.getTaskNo() != 0) {
+ if (crnProtocol.isStatusEnd()){
+ // 鍑哄簱妯″紡
+ devpThread.ioModeOf3F = IoModeType.PAKOUT_MODE;
+ } else {
+ // 鍏ュ簱妯″紡
+ devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
+ }
+ } else {
+ // 鍏ュ簱妯″紡
+ devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
+ }
+ } else {
+ // 鍏ュ簱妯″紡
+ devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
+ }
}
}
break;
@@ -4979,8 +4992,25 @@
// }
}
} else {
- // 鍏ュ簱妯″紡
- devpThread.ioModeOf4F = IoModeType.PAKIN_MODE;
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, 3);
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol != null) {
+ if (crnProtocol.getTaskNo() != 0) {
+ if (crnProtocol.isStatusEnd()){
+ // 鍑哄簱妯″紡
+ devpThread.ioModeOf3F = IoModeType.PAKOUT_MODE;
+ } else {
+ // 鍏ュ簱妯″紡
+ devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
+ }
+ } else {
+ // 鍏ュ簱妯″紡
+ devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
+ }
+ } else {
+ // 鍏ュ簱妯″紡
+ devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
+ }
}
}
break;
--
Gitblit v1.9.1