From d2756e02d9a9644ee20ced7d8d7ef7bf109126af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 26 十月 2023 16:29:01 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/common/service/CommonService.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f55d534..f5b703e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -120,12 +120,13 @@
/**
* 妫�绱㈠簱浣嶅彿
- * @param staDescId 璺緞ID
+ *
+ * @param staDescId 璺緞ID
* @param sourceStaNo 婧愮珯
- * @param matNos 鐗╂枡鍙烽泦鍚�
+ * @param matNos 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto,int times) {
+ public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
// 鐩爣搴撲綅
LocMast locMast = null;
@@ -163,7 +164,13 @@
//鎵惧埌搴撲綅锛岃繑鍥瀌to
return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
}
-
+ if(locTypeDto.getLocType1()==1){
+ locTypeDto.setLocType1((short)2);
+ return getLocNo(staDescId, 1, sourceStaNo, matNos, locTypeDto,0);
+ }else if(locTypeDto.getLocType1()==2){
+ locTypeDto.setLocType1((short)3);
+ return getLocNo(staDescId, 1, sourceStaNo, matNos, locTypeDto,0);
+ }
//鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
throw new CoolException("娌℃湁绌哄簱浣�");
}
@@ -216,7 +223,7 @@
LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
if (null != locMast0) {
// 娴呭簱浣嶇鍚堝昂瀵告娴�
- if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
locMast = locMast0;
}
}
@@ -228,7 +235,7 @@
LocMast locMast0 = locMastService.findNearloc(locNo);
if (null != locMast0) {
// 娴呭簱浣嶇鍚堝昂瀵告娴�
- if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
locMast = locMast0;
break;
}
@@ -251,7 +258,7 @@
LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
if (null != locMast0) {
// 娴呭簱浣嶇鍚堝昂瀵告娴�
- if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
locMast = locMast0;
break;
}
@@ -265,7 +272,7 @@
LocMast locMast0 = locMastService.findNearloc(loc.getLocNo());
if (null != locMast0) {
// 娴呭簱浣嶇鍚堝昂瀵告娴�
- if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
locMast = locMast0;
break;
}
@@ -309,6 +316,7 @@
if (matNos.size() == 1) {
//鍗曞搧
List<LocMast> locMasts = locMastService.selectAreaEmpty(locTypeDto.getLocType1(), 2);//鎼滅储鍗曞搧搴撲綅
+
for (LocMast mast : locMasts) {
List<String> groupLoc = Utils.getGroupLoc(mast.getLocNo());
if (!locMastService.checkAllLocEmpty(groupLoc)) {
--
Gitblit v1.9.1