From 26a50a5c95185ff573aea7ec718e31e509cdd31d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 06 四月 2025 14:17:40 +0800
Subject: [PATCH] #预留库位
---
src/main/java/com/zy/common/service/CommonService.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index cfbcda4..dff98a0 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -127,17 +127,6 @@
switch (rowLastnoType.getType()) {
case 1:
- List<LocMast> locMasts;
- Short locType1 = locTypeDto.getLocType1();
- 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("娌℃湁绌哄簱浣�");
- }
- locType1= (short) i;
- }
- locTypeDto.setLocType1(locType1);
return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
case 2:
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
@@ -445,6 +434,13 @@
}
}
}
+ //鏌ヨ褰撳墠搴撲綅绫诲瀷绌哄簱浣� 灏忎簬5涓垯locmast = null
+ List<LocMast> locTypeLocMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O").eq("crn_no", crnNo)
+ );
+ if (null !=locTypeLocMasts && locTypeLocMasts.size()<=5){
+ locMast = null;
+ }
if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
locMast = null;
--
Gitblit v1.9.1