From 98c48cd18c0de3141e444b86886f816931f51cc2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 16 八月 2022 13:30:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 90 ++++++++++++++-------------------------------
1 files changed, 28 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 51545f9..a5c41cf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -87,9 +87,9 @@
return workNo;
}
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, boolean emptyMk, List<String> matNos, LocTypeDto locTypeDto, int times) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
LocTypeDto oldLocType = locTypeDto.clone();
- return getLocNo(whsType, staDescId, sourceStaNo, emptyMk, matNos, locTypeDto, oldLocType, times);
+ return getLocNo(whsType, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
}
/**
@@ -100,13 +100,9 @@
* @param matNos 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, boolean emptyMk, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
StartupDto startupDto = new StartupDto();
- if (sourceStaNo == 100) { // 杞昏揣淇″彿
- whsType = 1; // 1 - 11 宸�
- } else if (sourceStaNo == 200) { // 閲嶈揣淇″彿
- whsType = 2; // 12 - 21 鍙�
- }
+ whsType = 1;
// 鐢熸垚宸ヤ綔鍙�
int workNo = getWorkNo(0);
RowLastno rowLastno = rowLastnoService.selectById(whsType);
@@ -143,7 +139,7 @@
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- if (emptyMk) {
+ if (staDescId == 10) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
@@ -168,59 +164,29 @@
int t = 0;
boolean execute = true;
int crnNo1;
- // 1 - 11鎺�
- if (whsType == 1) {
- while (execute && t < 4) {
- t++;
- switch (curRow) {
- case 3:
- curRow = 11;
- crnNo1 = 2;
- break;
- case 11:
- curRow = 4;
- crnNo1 = 1;
- break;
- case 4:
- curRow = 12;
- crnNo1 = 2;
- break;
- default:
- curRow = 3;
- crnNo1 = 1;
- break;
- }
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
- execute = false;
- }
+ while (execute && t < 4) {
+ t++;
+ switch (curRow) {
+ case 3:
+ curRow = 11;
+ crnNo1 = 2;
+ break;
+ case 11:
+ curRow = 4;
+ crnNo1 = 1;
+ break;
+ case 4:
+ curRow = 12;
+ crnNo1 = 2;
+ break;
+ default:
+ curRow = 3;
+ crnNo1 = 1;
+ break;
}
- // 12 - 21鎺�
- } else {
- while (execute && t < 4) {
- t++;
- switch (curRow) {
- case 11:
- curRow = 18;
- crnNo1 = 3;
- break;
- case 18:
- curRow = 12;
- crnNo1 = 2;
- break;
- case 12:
- curRow = 19;
- crnNo1 = 3;
- break;
- default:
- curRow = 11;
- crnNo1 = 2;
- break;
- }
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
- execute = false;
- }
+ if (basCrnpService.checkSiteError(crnNo1, true)) {
+ crnNo = crnNo1;
+ execute = false;
}
}
}
@@ -265,7 +231,7 @@
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
if (times < rowCount) {
times = times + 1;
- return getLocNo(whsType, staDescId, sourceStaNo, emptyMk, matNos, locTypeDto, oldLocType, times);
+ return getLocNo(whsType, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
}
// // 璐х墿妫�绱綆搴撲綅浠撳け璐ワ紝鍏煎楂樺簱浣嶄粨鍚庣户缁墽琛�
// if (locTypeDto.getLocType1() == 1) {
--
Gitblit v1.9.1