From cdcfca91ded792ab73f786a81cdccde8475b3e0c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 07 十月 2023 16:03:51 +0800
Subject: [PATCH] #新增许可证
---
src/main/java/com/zy/common/service/CommonService.java | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 45880cc..b187200 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -102,10 +102,10 @@
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
- if (sourceStaNo.equals(100)) {
+ if (sourceStaNo.equals(202)) {
whsType = 1;
locTypeDto.setLocType1((short) 1);
- } else if (sourceStaNo.equals(200)) {
+ } else if (sourceStaNo.equals(206)) {
whsType = 2;
locTypeDto.setLocType1((short) 2);
}
@@ -127,12 +127,14 @@
// 鐩爣搴撲綅
LocMast locMast = null;
+ crnNo=2;
if (curRow == 3) {
curRow = 4;
} else if (curRow == 4) {
curRow = 3;
} else {
rowCount = 0;
+ crnNo=1;
}
if (crnNo == 0) {
@@ -157,17 +159,34 @@
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
- // 寮�濮嬫煡鎵惧簱浣� ==============================>
- int ruleId = Integer.parseInt(Parameter.get().getFindLocRule());
- if (whsType != 1) {
- locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
- } else if (ruleId == 1) { //鎸夋祴璇曡澶囨帓搴忥紝浼樺厛鎺掓弧鍗曞彴璁惧
- locMast = locMastService.queryFreeLocMast1(curRow, locTypeDto.getLocType1(), channelMax + 1);
- } else if (ruleId == 2) { //鎸夐�氶亾鎺掑簭锛屽潎鍖�鍒嗛厤姣忓彴璁惧
- Short locType2 = getLocType2Small(curRow, locTypeDto.getLocType1());
- locMast = locMastService.queryFreeLocMast2(curRow, locTypeDto.getLocType1(), locType2);
- } else { //榛樿瑙勫垯
- locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
+ if (crnNo==1){
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "F")
+ .eq("loc_type1", (short) 3));
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("loc_type1", (short) 1));
+ if (!Cools.isEmpty(locMast1)||Cools.isEmpty(locMast2)){
+ locMast = locMastService.queryFreeLocMast(2,(short)3);
+ if (Cools.isEmpty(locMast)){
+ locMast = locMastService.queryFreeLocMast(1,(short)3);
+ }
+ }
+ }
+
+ if (Cools.isEmpty(locMast)){
+ // 寮�濮嬫煡鎵惧簱浣� ==============================>
+ int ruleId = Integer.parseInt(Parameter.get().getFindLocRule());
+ if (whsType != 1) {
+ locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
+ } else if (ruleId == 1) { //鎸夋祴璇曡澶囨帓搴忥紝浼樺厛鎺掓弧鍗曞彴璁惧
+ locMast = locMastService.queryFreeLocMast1(curRow, locTypeDto.getLocType1(), channelMax + 1);
+ } else if (ruleId == 2) { //鎸夐�氶亾鎺掑簭锛屽潎鍖�鍒嗛厤姣忓彴璁惧
+ Short locType2 = getLocType2Small(curRow, locTypeDto.getLocType1());
+ locMast = locMastService.queryFreeLocMast2(curRow, locTypeDto.getLocType1(), locType2);
+ } else { //榛樿瑙勫垯
+ locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
+ }
}
// 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
--
Gitblit v1.9.1