From be7bdf82d63d64f96c4ae2e06514dda4b990122b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 10 五月 2025 11:17:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index db0e4f2..0875990 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -127,13 +127,7 @@
switch (rowLastnoType.getType()) {
case 1:
- StartupDto locNoRun = getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("loc_sts", "O").eq("loc_type1", locTypeDto.getLocType1()).eq("whs_type", rowLastnoType.getType().longValue()));
- if (locMasts != null && locMasts.size() < 8) {
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
- return locNoRun;
+ return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
case 2:
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
break;
@@ -440,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