From e012a72a5660566d698c93ca4f29b6e5ffe997b0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 29 十月 2025 16:47:35 +0800
Subject: [PATCH] 3077,3106只有合格能出,2041 只有待判能出
---
src/main/java/com/zy/common/service/CommonService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fe43f14..c269c0f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -175,11 +175,14 @@
.gt("bay1",columnNum));
// 娣卞簱浣嶆病鏈夊垯鎼滅储娴呭簱浣�
- if (locMasts.isEmpty()) {
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+// if (locMasts.isEmpty()) {
+ List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts","O").in("crn_no",crnNoList).in("row1","2,3,6,7,10,11,14,15,18,19,22,23").orderBy("lev1,bay1,row1")
.gt("bay1",columnNum));
- }
+ if(!locMasts2.isEmpty()) {
+ locMasts.addAll(locMasts2);
+ }
+// }
if (locMasts.isEmpty()) {
throw new CoolException("娌℃湁鍙敤搴撲綅");
}
--
Gitblit v1.9.1