From 35173cda98e2be25cf30a028697e6d363f8c4f77 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 13 十一月 2025 14:54:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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..8b8f807 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);
@@ -212,7 +204,7 @@
}
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- for (int i = times; i <= crnNumber * 2; i++) {
+ for (int i = times; i <= crnNumber * 4; i++) {
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber, whsType);
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
@@ -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;
@@ -656,7 +656,7 @@
continue;
}
for (LocMast locMastGro1 : locMasts1) {
- if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R") || locMastGro1.getLocSts().equals("X")) {
+ if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("S") || locMastGro1.getLocSts().equals("R") || locMastGro1.getLocSts().equals("X")) {
break;
}
if (locMastGro1.getLocSts().equals("O")) {
@@ -675,6 +675,12 @@
times = times + 1;
return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, times, mixture);
}
+ // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+ if (locTypeDto.getLocType1() < 2) {
+ int i = locTypeDto.getLocType1() + 1;
+ locTypeDto.setLocType1((short) i);
+ return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, 0, mixture);
+ }
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
}
--
Gitblit v1.9.1