From 1c2ef69ca01ddfff732119d757d1fbeee1a15e85 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 24 十月 2024 10:28:59 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 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 2c4ee46..bda9e42 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5814,6 +5814,12 @@
             if (wrkMastExecuteService.getWrkMastExecuteByJarIdCount(jarSlave.getId())!=0){
                 return false;
             }
+            List<BasJarMast> basJarMastList1 = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getJarOtherId(), new ArrayList<Integer>() {{
+                add(0);add(1);add(2);add(3);
+            }});
+            if (!basJarMastList1.isEmpty()){
+                return false;
+            }
             List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{
                 add(8);
             }});

--
Gitblit v1.9.1