From a1d5e46f2f5405e7adbbea0b34673e54b2a5ebca Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 20 十月 2022 09:31:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 b76244b..c725877 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -695,7 +695,19 @@
continue;
}
- // 杩囨护
+ // 妫�娴嬫槸鍚﹀瓨鍦ㄥ嚭搴撲换鍔�
+// WrkMast pakoutWrkMast = wrkMastMapper.selectPakout(slave.getId(), null);
+// if (null != pakoutWrkMast) {
+// if ((pakoutWrkMast.getIoType() == 103 || pakoutWrkMast.getIoType() == 104 || pakoutWrkMast.getIoType() == 107)
+// && pakoutWrkMast.getWrkSts() == 17
+// && basDevpService.selectByWrkNo(pakoutWrkMast.getWrkNo()) != null
+// ) {
+//
+// } else {
+// log.error("{}鍏ュ簱浠诲姟鏃犳硶浣滀笟锛屽洜瀛樺湪鍑哄簱涓换鍔�!", wrkMast.getWrkNo());
+// continue;
+// }
+// }
if (null != wrkMastMapper.selectPakout(slave.getId(), null)) {
log.error("{}鍏ュ簱浠诲姟鏃犳硶浣滀笟锛屽洜瀛樺湪鍑哄簱涓换鍔�!", wrkMast.getWrkNo());
continue;
@@ -1006,6 +1018,22 @@
SteThread steThread = queryIdleCar(wrkMast);
if (steThread != null) {
// 娌℃湁鍏朵粬浠诲姟
+// boolean hasPakout = true;
+// WrkMast pakoutWrkMast = wrkMastMapper.selectPakout(slave.getId(), steNo);
+// if (null != pakoutWrkMast) {
+// if ((pakoutWrkMast.getIoType() == 103 || pakoutWrkMast.getIoType() == 104 || pakoutWrkMast.getIoType() == 107)
+// && pakoutWrkMast.getWrkSts() == 17
+// && basDevpService.selectByWrkNo(pakoutWrkMast.getWrkNo()) != null
+// ) {
+// hasPakout = false;
+// }
+// } else {
+// hasPakout = false;
+// }
+// if (!hasPakout) {
+// // 璁╁皬杞︾瓑寰呮惉杩愬緟缁�
+// this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getSourceLocNo());
+// }
if (null == wrkMastMapper.selectPakout(slave.getId(), steNo)) {
// 璁╁皬杞︾瓑寰呮惉杩愬緟缁�
this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getSourceLocNo());
--
Gitblit v1.9.1