From 3a129dc7cbc261d6d73521875f94ff75ba88aa84 Mon Sep 17 00:00:00 2001
From: gt-fuwuqi <3272660260@qq.com>
Date: 星期二, 11 二月 2025 13:05:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |    2 +-
 1 files changed, 1 insertions(+), 1 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..c22b2dc 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -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