From 3dd2b439ffa1eb8c3bad1fff9a71055138e0b957 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 31 十月 2023 10:56:02 +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 | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 714c1c6..6419cc6 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -164,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("娌℃湁绌哄簱浣�");
}
@@ -310,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)) {
@@ -337,6 +344,11 @@
break;
}
}
+
+ if (locMast == null) {
+ //鍗曞搧鎵句笉鍒板簱浣嶏紝鍏佽灏濊瘯浠庢贩鏀惧尯鍩熶腑杩涜鎼滅储
+ locMast = getLocNoStepMixed(matNos, locTypeDto, 1);
+ }
}
return locMast;
--
Gitblit v1.9.1