From 5ed47a30b8f3af41c906fac6337ea171d7bd39aa Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 31 一月 2023 17:42:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 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 9a993f5..6a2a8b3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -311,6 +311,20 @@
if (basDevps1.size()!=0){
continue;
}
+ List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType(103);
+ if (wrkMasts1.size()!=0){
+ boolean flag = false;
+ for (WrkMast wrkMast1:wrkMasts1){
+ if (!wrkMast1.getWrkNo().equals(wrkMast.getWrkNo())){
+ flag = true;
+ break;
+ }
+ }
+ if (flag) {
+ News.error("MainServiceImpl 324琛�"+"104绔欑偣瀛樺湪璐х墿锛屾崱鏂欑洏鐐硅揣鐗╂殏鏃朵笉閲嶆柊鍏ュ簱锛侊紒锛�");
+ continue;
+ }
+ }
break;
case 204:
case 208:
@@ -318,6 +332,20 @@
List<BasDevp> basDevps2 = basDevpMapper.getLoading(203);
if (basDevps2.size()!=0){
continue;
+ }
+ List<WrkMast> wrkMasts2 = wrkMastMapper.selectWrkStsAndIoType(203);
+ if (wrkMasts2.size()!=0){
+ boolean flag = false;
+ for (WrkMast wrkMast1:wrkMasts2){
+ if (!wrkMast1.getWrkNo().equals(wrkMast.getWrkNo())){
+ flag = true;
+ break;
+ }
+ }
+ if (flag) {
+ News.error("MainServiceImpl 346琛�"+"204绔欑偣瀛樺湪璐х墿锛屾崱鏂欑洏鐐硅揣鐗╂殏鏃朵笉閲嶆柊鍏ュ簱锛侊紒锛�");
+ continue;
+ }
}
break;
default:
@@ -998,11 +1026,14 @@
continue;
}
- if (wrkMast.getWrkSts() == 11 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
- Integer sour = wrkMast.getStaNo();
- List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType(sour);
- if (wrkMasts.size()!=0){
- continue;
+ if (wrkMast.getCrnNo().equals(2)){
+ if (wrkMast.getWrkSts() == 11 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
+ Integer sour = wrkMast.getSourceStaNo();
+ List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType0(sour);
+ if (wrkMasts.size() > 0){
+ News.error("MainServiceImpl 1028琛�"+"瀛樺湪鎹℃枡銆佺洏鐐规湭鍏ュ簱璐х墿锛�2鍙峰爢鍨涙満鏆傛椂绂佹鍑哄簱锛侊紒锛�");
+ continue;
+ }
}
}
--
Gitblit v1.9.1