From 9263100d664598f22f6f1c2ea600382f752ad3d0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 19 二月 2023 21:04:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 125bb8d..e9c7014 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1969,10 +1969,37 @@
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
for (DevpSlave.Sta inSta : devp.getInSta()) {
- if (inSta.getStaNo() == 2) {
- continue;
+// if (inSta.getStaNo() == 2) {
+// continue;
+// }
+ Integer staNo = 0;
+ switch (inSta.getStaNo()){
+ case 101:
+ staNo = 102;
+ break;
+ case 104:
+ staNo = 106;
+ break;
+ case 111:
+ staNo = 112;
+ break;
+ case 114:
+ staNo = 116;
+ break;
+ case 201:
+ staNo = 202;
+ break;
+ case 204:
+ staNo = 205;
+ break;
+ case 301:
+ staNo = 302;
+ break;
+ case 304:
+ staNo = 305;
+ break;
}
- WrkMast pakout = wrkMastMapper.selectWorkingPakout(inSta.getStaNo());
+ WrkMast pakout = wrkMastMapper.selectWorkingPakout(staNo);
switch (inSta.getStaNo()) {
case 101: // 1F1
if (pakout != null) {
@@ -2064,7 +2091,7 @@
devpThread.ioModeOf2F1 = IoModeType.PAKIN_MODE;
}
break;
- case 203: // 2F2
+ case 204: // 2F2
if (pakout != null) {
if (devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
@@ -2100,7 +2127,7 @@
devpThread.ioModeOf3F1 = IoModeType.PAKIN_MODE;
}
break;
- case 303: // 3F2
+ case 304: // 3F2
if (pakout != null) {
if (devpThread.ioModeOf3F2 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
--
Gitblit v1.9.1