From aa95589f3b49e10a72b2200a865c46b8077a4204 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 六月 2025 11:16:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 55c721c..0875990 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -127,14 +127,6 @@
switch (rowLastnoType.getType()) {
case 1:
- List<LocMast> locMasts;
- for (int i = locTypeDto.getLocType1(); i < 4; i++) {
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("loc_sts", "O").eq("loc_type1", i).eq("whs_type", rowLastnoType.getType().longValue()));
- if (i == 3 && locMasts != null && locMasts.size() < 8) {
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
- }
return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
case 2:
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
@@ -442,6 +434,14 @@
}
}
}
+ //鏌ヨ褰撳墠搴撲綅绫诲瀷绌哄簱浣� 灏忎簬5涓垯locmast = null
+ List<LocMast> locTypeLocMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O").eq("crn_no", crnNo).eq("loc_type1", locTypeDto.getLocType1())
+ .eq("whs_type", rowLastnoType.getType().longValue())
+ );
+ if (null !=locTypeLocMasts && locTypeLocMasts.size()<=5){
+ locMast = null;
+ }
if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
locMast = null;
--
Gitblit v1.9.1