From 60af4db0b445edbb2856f9bc7199a3e627d32db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/common/service/CommonService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index eb95817..959b9c2 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -182,7 +182,7 @@
nearRow = locNecessaryParameters[3];
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100));
- if (locMasts.size()-crnCountO<=2){
+ if (locMasts.size()-crnCountO<=0){
times++;
continue;
}
--
Gitblit v1.9.1