From 94f53c5d70e9150b09de00480060b2afe2f6c099 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 12 四月 2023 07:57:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 82359ae..61d1eba 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -326,15 +326,20 @@
continue;
}
short staNo;
+ List<BasDevp> basDevps1 = basDevpMapper.getLoading(103);
+ List<BasDevp> basDevps2 = basDevpMapper.getLoading(203);
+
switch (wrkMast.getSourceStaNo()) {
case 104:
case 108:
staNo = 103;
- List<BasDevp> basDevps1 = basDevpMapper.getLoading(103);
- if (basDevps1.size()!=0){
+ if (basDevps1.size()!=0 && basDevps2.size()!=0){
continue;
+ } else if (basDevps1.size()!=0){
+ staNo = 203;
}
- List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType(103);
+
+ List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType((int)staNo);
if (wrkMasts1.size()!=0){
boolean flag = false;
for (WrkMast wrkMast1:wrkMasts1){
@@ -352,11 +357,16 @@
case 204:
case 208:
staNo = 203;
- List<BasDevp> basDevps2 = basDevpMapper.getLoading(203);
- if (basDevps2.size()!=0){
+ if (basDevps1.size()!=0 && basDevps2.size()!=0){
continue;
+ } else if (basDevps2.size()!=0){
+ staNo = 103;
}
- List<WrkMast> wrkMasts2 = wrkMastMapper.selectWrkStsAndIoType(203);
+
+// if (basDevps2.size()!=0){
+// continue;
+// }
+ List<WrkMast> wrkMasts2 = wrkMastMapper.selectWrkStsAndIoType((int)staNo);
if (wrkMasts2.size()!=0){
boolean flag = false;
for (WrkMast wrkMast1:wrkMasts2){
@@ -1066,11 +1076,11 @@
if (wrkMast.getCrnNo().equals(2)){
if (wrkMast.getStaNo() == 103 && devpThread.ioModeOf1F != IoModeType.PAKOUT_MODE) {
News.error("MainServiceImpl locToCrnStn"+"103闈炲嚭搴撴ā寮忥紝绂佹鍑哄簱銆備换鍔″彿:{}锛侊紒锛�",wrkMast.getWrkNo());
- continue;
+ return false;
}
if (wrkMast.getStaNo() == 203 && devpThread.ioModeOf2F != IoModeType.PAKOUT_MODE) {
News.error("MainServiceImpl locToCrnStn"+"203闈炲嚭搴撴ā寮忥紝绂佹鍑哄簱銆備换鍔″彿:{}锛侊紒锛�",wrkMast.getWrkNo());
- continue;
+ return false;
}
if (wrkMast.getWrkSts() == 11 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
@@ -1078,7 +1088,7 @@
List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType0(sour);
if (wrkMasts.size() > 0){
News.error("MainServiceImpl 1028琛�"+"瀛樺湪鎹℃枡銆佺洏鐐规湭鍏ュ簱璐х墿锛�2鍙峰爢鍨涙満鏆傛椂绂佹鍑哄簱锛侊紒锛�");
- continue;
+ return false;
}
}
@@ -1087,7 +1097,7 @@
List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType1(sour);
if (wrkMasts.size() > 0){
News.error("MainServiceImpl 1028琛�"+"204瀛樺湪鍏ㄦ澘鍑哄簱涓揣鐗╋紝2鍙峰爢鍨涙満鏆傛椂绂佹鍏ㄦ澘鍑哄簱锛侊紒锛�");
- continue;
+ return false;
}
}
}
--
Gitblit v1.9.1