From f1af5ff174b04f63f9e622639d4394703042a07e Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 10 八月 2022 17:09:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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 5056bba..2b59854 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1861,22 +1861,32 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- WrkMast pakout = wrkMastMapper.selectWorkingPakout();
- if (pakout != null) {
- if (devpThread.ioMode != IoModeType.PAKOUT_MODE) {
- // 鍑哄簱鍒囨崲涓�
- devpThread.ioMode = IoModeType.PAKOUT_BOOTING;
-
- WrkMast pakin = wrkMastMapper.selectWorkingPakin();
- if (pakin == null) {
- // 鍑哄簱妯″紡
- devpThread.ioMode = IoModeType.PAKOUT_MODE;
- }
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ if (inSta.getStaNo() == 2) {
+ continue;
}
- } else {
- // 鍏ュ簱妯″紡
- devpThread.ioMode = IoModeType.PAKIN_MODE;
+ WrkMast pakout = wrkMastMapper.selectWorkingPakout(inSta.getStaNo());
+ switch (inSta.getStaNo()) {
+ case 203://1F
+ if (pakout != null) {
+ if (devpThread.ioModeOf2F != IoModeType.PAKOUT_MODE) {
+ // 鍑哄簱鍒囨崲涓�
+ devpThread.ioModeOf2F = IoModeType.PAKOUT_BOOTING;
+ WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
+ if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
+ && !devpThread.getStation().get(inSta.getStaNo()+1).isLoading()) {
+ // 鍑哄簱妯″紡
+ devpThread.ioModeOf2F = IoModeType.PAKOUT_MODE;
+ }
+ }
+ } else {
+ // 鍏ュ簱妯″紡
+ devpThread.ioModeOf2F = IoModeType.PAKIN_MODE;
+ }
+ break;
+ }
}
+
}
} catch (Exception e) {
--
Gitblit v1.9.1