From 04fc5c36fae9add2eeaac561c3388b5a70830992 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 24 十月 2022 10:56:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index b8748fb..3281c7f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -112,14 +112,17 @@
StartupDto startupDto = new StartupDto();
int start = 2;
int end = 30;
+ int dualCrnNo;
switch (sourceStaNo) {
case 107:
whsType = 1;
+ dualCrnNo = 2;
break;
case 118:
whsType = 2;
start = 31;
end = 32;
+ dualCrnNo = 3;
break;
default:
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -150,23 +153,21 @@
if (!Cools.isEmpty(matNos) && matNos.size() == 1) {
List<String> locNos = locDetlService.getSameDetl(matNos.get(0), start, end);
for (String locNo : locNos) {
- LocMast locMast0 = locMastService.findOutMost(locNo);
- if (null != locMast0) {
- // 娴呭簱浣嶇鍚堝昂瀵告娴�
- if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
- int locCrnNo;
- if (whsType == 1) {
- locCrnNo = 2;
- } else {
- locCrnNo = 3;
- }
- // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
- if (basCrnpService.checkSiteError(locCrnNo, true)) {
- crnNo = locCrnNo;
- locMast = locMast0;
- break;
+ if (whsType == 1) {
+ LocMast locMast0 = locMastService.findOutMost(locNo);
+ if (null != locMast0) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+ if (basCrnpService.checkSiteError(dualCrnNo, true)) {
+ crnNo = dualCrnNo;
+ locMast = locMast0;
+ break;
+ }
}
}
+ } else {
+
}
}
}
@@ -206,9 +207,8 @@
} else if (curRow == 30) {
curRow = 2;
}
- int crnNo1 = 2;
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
+ if (basCrnpService.checkSiteError(dualCrnNo, true)) {
+ crnNo = dualCrnNo;
}
}
--
Gitblit v1.9.1