From 083841bb6c40097e19b17022454fcc7f12b7f092 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 02 八月 2025 08:59:49 +0800
Subject: [PATCH] 1.更换订单出库策略，走托盘多的物料先出 2.完善出库作业工作档丢失导致出库站电视机不显示
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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 6ceab94..1f47c0a 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
@@ -160,7 +160,7 @@
List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd(), hostId,WHS_TYPE);
for (LocMast locMast0 : locMasts) {
//棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10, hostId)) {
+ if (locMastService.checkEmptyCount(locMast0, 5, hostId)) {
return locMast0;
}
}
@@ -349,7 +349,29 @@
// innerLoc = null;
continue;
}
-
+ if(Utils.getRow(one.getLocNo())==2){
+ LocMast locMast1=locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getRow1, 1)
+ .eq(LocMast::getBay1,one.getBay1())
+ .eq(LocMast::getLev1,one.getLev1())
+ .eq(LocMast::getHostId, hostId));
+ if(!locMast1.getLocSts().equals("F")){
+ continue;
+ }else if (locMast1.getLocSts().equals("O")){
+ one=locMast1;
+ }
+ }else if(Utils.getRow(one.getLocNo())==3){
+ LocMast locMast1=locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getRow1, 4)
+ .eq(LocMast::getBay1,one.getBay1())
+ .eq(LocMast::getLev1,one.getLev1())
+ .eq(LocMast::getHostId, hostId));
+ if(!locMast1.getLocSts().equals("F")){
+ continue;
+ }else if (locMast1.getLocSts().equals("O")){
+ one=locMast1;
+ }
+ }
innerLoc = one;
// if (innerLoc == null) {
--
Gitblit v1.9.1