From 09284f08c7a901f684cf26ccb0e51a9204d9cd64 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 五月 2024 09:30:27 +0800
Subject: [PATCH] #订单组托
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
index 984dbf9..d157cd0 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
@@ -228,6 +228,13 @@
throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
}
+ //鎵剧浉鍚岀┖鎵樼洏
+ LambdaQueryWrapper<LocMast> wrapper0 = new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocSts, "D")
+ .eq(LocMast::getLocType1, locTypeDto.getLocType1())
+ .eq(LocMast::getCrnNo, staDesc.getDeviceNo())
+ .eq(LocMast::getHostId, hostId);
+
LambdaQueryWrapper<LocMast> wrapper1 = new LambdaQueryWrapper<LocMast>()
.eq(LocMast::getLocSts, "O")
.eq(LocMast::getLocType1, locTypeDto.getLocType1())
@@ -245,9 +252,9 @@
wrapper1.le(LocMast::getLev1, locRangeDto.getTargetLev());
}
- List<LocMast> locMasts = locMastService.list(wrapper1);
- if (!locMasts.isEmpty()) {
- for (LocMast loc : locMasts) {
+ List<LocMast> locMasts0 = locMastService.list(wrapper0);
+ if (!locMasts0.isEmpty()) {
+ for (LocMast loc : locMasts0) {
LocMast locMast0 = locMastService.findNearloc(loc.getLocNo(), hostId, locRangeDto);
if (null != locMast0) {
locMast = locMast0;
@@ -257,6 +264,19 @@
}
if (locMast == null) {
+ List<LocMast> locMasts = locMastService.list(wrapper1);
+ if (!locMasts.isEmpty()) {
+ for (LocMast loc : locMasts) {
+ LocMast locMast0 = locMastService.findNearloc(loc.getLocNo(), hostId, locRangeDto);
+ if (null != locMast0) {
+ locMast = locMast0;
+ break;
+ }
+ }
+ }
+ }
+
+ if (locMast == null) {
throw new CoolException("缂哄皯绌哄簱浣�");
}
}
--
Gitblit v1.9.1