From 2310cd72974e2fb7a5ec006c8c615379f5ba0b9a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 14 四月 2025 10:36:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 34 +---------------------------------
1 files changed, 1 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index ee246ac..d090fe4 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -100,39 +100,7 @@
*/
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
- // 鐩爣搴撲綅
- LocMast locMast = null;
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- locMast = getLocNoStep4(staDescId, locTypeDto, sourceStaNo);
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
- }
-
- //搴撲綅瑙勫垯
-// locMast = getLocNoStepRule(matnr, locTypeDto);
-// if (locMast != null) {
-// //鎵惧埌搴撲綅锛岃繑鍥瀌to
-// return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
-// }
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
- locMast = getLocNoStep3(staDescId, matnr, batch, grade, locTypeDto, sourceStaNo);
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
- }
-
- //鎼滅储鏁翠釜绌哄簱浣嶇粍
- locMast = getLocNoStepSingle(locTypeDto, sourceStaNo);
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
- }
-
- //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
- throw new CoolException("娌℃湁绌哄簱浣�");
+ return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
}
--
Gitblit v1.9.1