From a643b25f9f0584e2c4aedf0479f14bce53acce24 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 16 Jan 2026 11:30:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=8D=B7=E6=9D=90=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复了当 hasSelectType 为 true 但 hasAnyItemFilter 为 false 时的条件判断问题
- 调整了筛选逻辑的位置，确保只在满足双重条件时执行相关筛选
- 移除了多余的右大括号，优化了代码结构
---
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index 5673312d..ecd10735 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -432,9 +432,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         }
 
         // 使用 EXISTS 针对 selectType 的细粒度筛选（使用参数占位符防注入）
-        if (hasSelectType) {
-            qw.eq("mc.item_type", bo.getSelectType());
-            if (hasAnyItemFilter) {
+        if (hasSelectType && hasAnyItemFilter) {
+            // 执行筛选逻辑（和上面完全一样）
+                qw.eq("mc.item_type", bo.getSelectType());
                 StringBuilder existsSql = new StringBuilder();
                 List<Object> existsArgs = new ArrayList<>();
                 if ("product".equals(bo.getSelectType())) {
@@ -474,7 +474,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                     qw.apply(existsSql.toString(), existsArgs.toArray());
                 }
             }
-        }
 
         // 显式 itemId 条件：与 EXISTS 共存时，语义为交集
         if (CollectionUtils.isNotEmpty(explicitItemIds)) {