From 75f553f89590fc616d6f590c253d36d68ca36e05 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 08 六月 2024 21:21:02 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/VersionUtils.java | 5 +++++ src/main/java/com/zy/common/service/CommonService.java | 29 +++++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java index ad8cd6f..94737bb 100644 --- a/src/main/java/com/zy/asrs/utils/VersionUtils.java +++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java @@ -18,6 +18,11 @@ return false; } + public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) { + // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅 + return dto.getLocType1().equals(loc.getLocType1()); + } + // 涓氬姟 ---------------------------------------------------------------------- diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 66813da..1e047c8 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -136,31 +136,28 @@ // 鎼滅储鍗曞搧(鏁翠釜搴撲綅缁�) 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).eq("loc_sts", "O")); + if (!Cools.isEmpty(locMast2)) { + tmp = locMast2; + break; } - - if (!locMast1.getLocSts().equals("O")) { - continue; + }else { + if (!Cools.isEmpty(mast)) { + tmp = mast; + break; } - - tmp = locMast1; - break; } - //棰勭暀绌哄簱浣� if (tmp != null && locMastService.checkEmptyCount(mast, 10)) { locMast = tmp; -- Gitblit v1.9.1