From 5ec293fc94e2b05ea02815de3be492e0f1102d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Thu, 2 Apr 2026 14:24:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=A8=E9=87=8F=E7=8A=B6=E6=80=81=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在物料管理模块中新增质量状态多选查询功能，包括：
1. 后端添加qualityStatusCsv字段支持多选查询
2. 前端CoilSelector组件增加品质多选下拉框
3. 服务层实现多选条件过滤逻辑
---
 klp-ui/src/components/CoilSelector/index.vue     |  6 +++++-
 .../com/klp/domain/bo/WmsMaterialCoilBo.java     |  5 +++++
 .../service/impl/WmsMaterialCoilServiceImpl.java | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue
index b12ff919..cb0a4a13 100644
--- a/klp-ui/src/components/CoilSelector/index.vue
+++ b/klp-ui/src/components/CoilSelector/index.vue
@@ -63,6 +63,10 @@
             <el-option label="简包" value="简包" />
           </el-select>
         </el-form-item>
+        <el-form-item label="品质">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status" placeholder="请选择品质"
+            clearable />
+        </el-form-item>
         <el-form-item label="实际库区" v-if="orderBy">
           <actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择实际库区" canSelectLevel2
             canSelectDisabled :clearInput="false" clearable />
@@ -179,7 +183,7 @@ export default {
     WarehouseBirdMini,
     DragResizeBox
   },
-  dicts: ['coil_itemname', 'coil_material', 'coil_manufacturer'],
+  dicts: ['coil_itemname', 'coil_material', 'coil_manufacturer', 'coil_quality_status'],
   props: {
     // 非触发器模式下，外部控制显隐（触发器模式下无效）
     visible: {
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 406f7756..937e49b4 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
@@ -167,6 +167,11 @@ public class WmsMaterialCoilBo extends BaseEntity {
      */
     private String qualityStatus;
 
+    /**
+     * 质量状态多选查询
+     */
+    private String qualityStatusCsv;
+
     /**
      * 切边要求
      */
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 92ac8552..8a3f3113 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
@@ -485,6 +485,22 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             qw.in("mc.warehouse_id", warehouseIdList.stream().distinct().collect(Collectors.toList()));
         }
 
+        List<String> qualityStatusList = new ArrayList<>();
+        if (StringUtils.isNotBlank(bo.getQualityStatusCsv())) {
+            String[] qualityStatusArray = bo.getQualityStatusCsv().split(",");
+            for (String qualityStatusStr : qualityStatusArray) {
+                if (StringUtils.isNotBlank(qualityStatusStr)) {
+                    try {
+                        qualityStatusList.add(qualityStatusStr.trim());
+                    } catch (NumberFormatException ignore) {
+                    }
+                }
+            }
+        }
+        if (!qualityStatusList.isEmpty()) {
+            qw.in("mc.quality_status", qualityStatusList.stream().distinct().collect(Collectors.toList()));
+        }
+
         // 统一处理 nextWarehouseId 与 nextWarehouseIds：
         List<Long> nextWarehouseIdList = new ArrayList<>();
         if (bo.getNextWarehouseId() != null) {