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 | 80 +++++++++++----------------------------
1 files changed, 23 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d1d6a72..a5c41cf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -102,11 +102,7 @@
*/
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);
@@ -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;
}
}
}
--
Gitblit v1.9.1