From 7fcc682fff2e577ea7cd71c82052cb331edad783 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 10 Dec 2025 14:34:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E4=BC=98=E5=8C=96=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91=E5=B9=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsMaterialCoilBo 中引入 TableField 注解支持
- 调整 itemName 和新增 selectType 字段位置，增强数据绑定准确性
- 修改筛选判断依据，由 itemType 改为 selectType，提高查询灵活性
- 完善细粒度筛选条件拼接逻辑，确保查询条件动态构建正确性
---
 .../src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java | 7 +++++--
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
index c8242be5..b15b5454 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
@@ -1,6 +1,7 @@
 package com.klp.domain.bo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.klp.common.core.domain.BaseEntity;
 import com.klp.common.core.validate.AddGroup;
@@ -134,8 +135,6 @@ public class WmsMaterialCoilBo extends BaseEntity {
     //材料类型
     private String materialType;
 
-    private String itemName;
-
 
     /**
      * 质量状态（0=正常，1=待检，2=不合格）
@@ -167,6 +166,10 @@ public class WmsMaterialCoilBo extends BaseEntity {
      */
     private String coilIds;
 
+    // 筛选类型
+    private String selectType;
+    // 物品名称
+    private String itemName;
     // 材质（两表通用字段名：product.material / raw_material.material）
     private String itemMaterial;
     // 厂家（两表通用字段名：product.manufacturer / raw_material.manufacturer）
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 fe4580c6..71d1ba1a 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
@@ -339,7 +339,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType());
 
         // 按 itemType + 细粒度字段筛选（若对应字段非空则拼接条件；为空则不拼）
-        if (StringUtils.isNotBlank(bo.getItemType())) {
+        if (StringUtils.isNotBlank(bo.getSelectType())) {
             List<Long> matchedItemIds = new ArrayList<>();
             boolean hasAnyItemFilter = StringUtils.isNotBlank(bo.getItemMaterial())
                 || StringUtils.isNotBlank(bo.getItemManufacturer())