From fbea0d1038ee431509c43ace277e51549caae521 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 09 二月 2023 09:24:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 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 8eb15b4..b0b2271 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1076,6 +1076,15 @@
continue;
}
}
+
+ if (wrkMast.getWrkSts() == 11 && wrkMast.getIoType() == 101){
+ Integer sour = wrkMast.getSourceStaNo();
+ List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType1(sour);
+ if (wrkMasts.size() > 0){
+ News.error("MainServiceImpl 1028琛�"+"204瀛樺湪鍏ㄦ澘鍑哄簱涓揣鐗╋紝2鍙峰爢鍨涙満鏆傛椂绂佹鍏ㄦ澘鍑哄簱锛侊紒锛�");
+ continue;
+ }
+ }
}
// 鍒ゆ柇鏄惁宸插瓨鍦ㄥ皬杞︾粦瀹氫换鍔�
@@ -3848,10 +3857,19 @@
boolean success = true;
List<String> insideLoc = Utils.getGroupInsideLoc(one.getLocNo());
for (String inside : insideLoc) {
- if (!locMastService.selectById(inside).getLocSts().equals("O")) {
+ if (locMastService.selectById(inside).getLocSts().equals("P")
+ || locMastService.selectById(inside).getLocSts().equals("R")
+ || locMastService.selectById(inside).getLocSts().equals("S")
+ || locMastService.selectById(inside).getLocSts().equals("Q")) {
success = false; break;
}
}
+
+ Integer steNo = this.hasCar(one.getLocNo());
+ if (steNo != null) {
+ continue;
+ }
+
if (success) {
loc = one;
break;
--
Gitblit v1.9.1