From 5491c4c6a6f031155525e34c518d0537a90f4859 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 08 六月 2024 21:30:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 66813da..a18a163 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -136,31 +136,29 @@
// 鎼滅储鍗曞搧(鏁翠釜搴撲綅缁�)
private LocMast getLocNoStepSingle(LocTypeDto locTypeDto,Integer sourceStaNo) {
LocMast locMast = null;
+
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", 1).eq("stn_no", sourceStaNo));
//鍗曞搧
List<LocMast> locMasts = locMastService.selectAreaEmpty(locTypeDto.getLocType1(),staDesc.getCrnNo());//鎼滅储璐х墿
for (LocMast mast : locMasts) {
- List<String> groupLoc = Utils.getGroupLocNo(mast.getLocNo(), true);
- if (!locMastService.checkAllLocEmpty(groupLoc)) {
- continue;
- }
-
LocMast tmp = null;
- for (String loc : groupLoc) {
- LocMast locMast1 = locMastService.selectByLoc(loc);
- if (locMast1 == null) {
- continue;
+ boolean groupLoc = Utils.isShallowLoc(slaveProperties,mast.getLocNo());
+ if (groupLoc) {
+ String shallowLoc = Utils.getDeepLoc(slaveProperties, mast.getLocNo());
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", shallowLoc));
+ if (!Cools.isEmpty(locMast2)) {
+ if (locMast2.getLocSts().equals("F") || locMast2.getLocSts().equals("D")){
+ tmp = locMast2;
+ }
}
+ }else {
+ if (!Cools.isEmpty(mast)) {
+ tmp = mast;
- if (!locMast1.getLocSts().equals("O")) {
- continue;
}
-
- tmp = locMast1;
- break;
}
-
//棰勭暀绌哄簱浣�
if (tmp != null && locMastService.checkEmptyCount(mast, 10)) {
locMast = tmp;
--
Gitblit v1.9.1