From bdbf9db4113d375bb6cec9aab787db5adb14c480 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 03 一月 2025 16:01:38 +0800
Subject: [PATCH] #出库规则完成，盘点拣料出库测试完成
---
src/main/java/com/zy/common/service/CommonService.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 5f4285a..55a2f22 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -128,7 +128,7 @@
*/
switch (rowLastnoType.getType()) {
case 4:
- return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 3);
+ return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 2);
}
} catch (CoolException ex) {
log.error("鍏ュ簱澶辫触锛岄敊璇俊鎭�: {}", ex.getMessage(), ex);
@@ -556,9 +556,15 @@
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
LocMast locMast1 = new LocMast();
- if(sourceStaNo == 101){
+ if(times != 0){
locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("row1", 1)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1,bay1 ASC"));
+ } else {
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 8)
.eq("loc_sts","O")
.eq("loc_type1", locTypeDto.getLocType1())
.orderBy("lev1,bay1 ASC"));
@@ -573,13 +579,11 @@
// 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast)) {
- // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
times = times - 1;
- if (times >0) {
+ if (times >= 0) {
return getLocNoRun4(whsType,staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo,locTypeDto,times);
}
-
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛�", JSON.toJSONString(locTypeDto));
throw new CoolException("娌℃湁绌哄簱浣�");
}
String locNo = locMast.getLocNo();
--
Gitblit v1.9.1