From d3234825d804a6a205dba1c6092acc8e29981b81 Mon Sep 17 00:00:00 2001
From: lfd <1>
Date: 星期四, 06 三月 2025 10:11:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d3e073e..189bc19 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -341,9 +341,13 @@
return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
}
- // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
- if (locTypeDto.getLocType1() == 1) {
- locTypeDto.setLocType1((short) 2);
+// // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
+// if (locTypeDto.getLocType1() == 1) {
+// locTypeDto.setLocType1((short) 2);
+// return getLocNo(1, staDescId, source2StaNo, matNos, locTypeDto, times);
+// }
+ if ((times < rowCount+2) && (whsType==2 || whsType==4)) {
+ times = times + 1;
return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
@@ -352,8 +356,8 @@
String locNo = locMast.getLocNo();
if (crnNo==5 || crnNo==7){
int i = locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", crnNo));
- if (i<=5){
- throw new CoolException("绌哄簱浣嶆暟灏忎簬绛変簬5涓紝绂佹鍏ュ簱");
+ if (i<=10){
+ throw new CoolException("绌哄簱浣嶆暟灏忎簬绛変簬10涓紝绂佹鍏ュ簱");
}
}
--
Gitblit v1.9.1