From 9313437c98bcd5f1561817bc93950e45d6c34c45 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 06 四月 2025 14:28:21 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |    3 ++-
 1 files changed, 2 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 dff98a0..0875990 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -436,7 +436,8 @@
         }
         //鏌ヨ褰撳墠搴撲綅绫诲瀷绌哄簱浣� 灏忎簬5涓垯locmast = null
         List<LocMast> locTypeLocMasts = locMastService.selectList(new EntityWrapper<LocMast>()
-                .eq("loc_sts", "O").eq("crn_no", crnNo)
+                .eq("loc_sts", "O").eq("crn_no", crnNo).eq("loc_type1", locTypeDto.getLocType1())
+                        .eq("whs_type", rowLastnoType.getType().longValue())
                 );
         if (null !=locTypeLocMasts && locTypeLocMasts.size()<=5){
             locMast = null;

--
Gitblit v1.9.1