From 606e903e80fa9a7e77c72879494b47fbd195b93a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 22 八月 2025 13:42:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index dff98a0..8786bf6 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -436,7 +436,8 @@
}
//鏌ヨ褰撳墠搴撲綅绫诲瀷绌哄簱浣� 灏忎簬5涓垯locmast = null
List<LocMast> locTypeLocMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("loc_sts", "O").eq("crn_no", crnNo)
+ .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;
@@ -655,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")) {
@@ -674,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