From 4e153a00e6e74da96d073ec504868bf1f0c67061 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 12 四月 2025 10:01:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 12 +++++++++++-
1 files changed, 11 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 f7146fd..9bb9ded 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5940,11 +5940,21 @@
return false;
}
List<BasJarMast> basJarMastList1 = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getJarOtherId(), new ArrayList<Integer>() {{
- add(0);add(1);add(2);add(3);add(8);add(9);add(10);add(11);add(12);
+ add(0);add(1);add(2);add(3);
}});
if (!basJarMastList1.isEmpty()){
return false;
}
+ BasJar basJarOther11 = basJarMapper.selectById(jarSlave.getJarOtherId());
+ if (!Cools.isEmpty(basJarOther11)){
+ List<BasJarMast> basJarMastList2 = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getJarOtherId(), new ArrayList<Integer>() {{
+ add(8);add(9);add(10);add(11);add(12);
+ }});
+ if (!basJarMastList2.isEmpty() && basJarMastList2.size()!=basJarOther11.getJarCount()){
+ return false;
+ }
+ }
+
List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{
add(8);
}});
--
Gitblit v1.9.1