From 9a67b09cf3085b5b38675d9d541628a1cb2bdbc2 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 31 一月 2023 17:29:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 50c1f68..38c181f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -313,7 +313,14 @@
}
List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType(103);
if (wrkMasts1.size()!=0){
- continue;
+ boolean flag = false;
+ for (WrkMast wrkMast1:wrkMasts1){
+ if (!wrkMast1.getWrkNo().equals(wrkMast.getWrkNo())){
+ flag = true;
+ break;
+ }
+ }
+ if (flag) continue;
}
break;
case 204:
@@ -325,7 +332,14 @@
}
List<WrkMast> wrkMasts2 = wrkMastMapper.selectWrkStsAndIoType(203);
if (wrkMasts2.size()!=0){
- continue;
+ boolean flag = false;
+ for (WrkMast wrkMast1:wrkMasts2){
+ if (!wrkMast1.getWrkNo().equals(wrkMast.getWrkNo())){
+ flag = true;
+ break;
+ }
+ }
+ if (flag) continue;
}
break;
default:
@@ -1006,11 +1020,13 @@
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){
+ continue;
+ }
}
}
--
Gitblit v1.9.1