From c4f32cf388c02c64b267cac6cce68392a1ca9d61 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 14 二月 2025 13:03:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index a8e9ebf..1a77b31 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -418,13 +418,13 @@
locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc).eq("loc_sts", "F").eq("whs_type",rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
+ locMast = locMast1;
break;
} else {
locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc).eq("loc_sts", "D").eq("whs_type",rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
+ locMast = locMast1;
break;
}
}
@@ -621,7 +621,7 @@
if (Cools.isEmpty(locMast) && crnNo != 0) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("bay1", nearRow)
- .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
+ .in("loc_sts", "O","X").eq("whs_type",rowLastnoType.getType().longValue())
.eq("crn_no",7)
.eq("loc_type1",locTypeDto.getLocType1())
.orderBy("lev1",true).orderBy("row1",false));//鏈�娴呭簱浣�
--
Gitblit v1.9.1