From 66b740288b6a5d3b8c60c7405b7b0a3c88fa4c13 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 1 Nov 2025 11:45:58 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=94=AF=E6=8C=81=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=8D=B7=E6=8C=89=E5=A4=9A=E4=B8=AAitemId=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在WmsMaterialCoilBo中新增itemIds字段用于接收多个ID

- 修改查询逻辑，支持逗号分隔的多个itemId查询- 兼容原有的单个itemId查询方式
- 对非法ID格式进行过滤处理
---
 .../com/klp/domain/bo/WmsMaterialCoilBo.java  |  2 ++
 .../impl/WmsMaterialCoilServiceImpl.java      | 21 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

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 b3493bbe..41aae277 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
@@ -122,5 +122,7 @@ public class WmsMaterialCoilBo extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
+    private String itemIds;
+
 }
 
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 c4300174..8a8477b0 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
@@ -152,7 +152,26 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         qw.eq(bo.getHasMergeSplit() != null, "mc.has_merge_split", bo.getHasMergeSplit());
         qw.eq(bo.getStatus() != null, "mc.status", bo.getStatus());
         qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType());
-        qw.eq(bo.getItemId() !=null, "mc.item_id", bo.getItemId());
+        // 修改itemId筛选逻辑，支持逗号分隔的多个ID查询
+        if (StringUtils.isNotBlank(bo.getItemIds())) {
+            String[] itemIdArray = bo.getItemIds().split(",");
+            List<Long> itemIdList = new ArrayList<>();
+            for (String itemIdStr : itemIdArray) {
+                if (StringUtils.isNotBlank(itemIdStr)) {
+                    try {
+                        itemIdList.add(Long.parseLong(itemIdStr.trim()));
+                    } catch (NumberFormatException e) {
+                        // 忽略无效的ID格式
+                    }
+                }
+            }
+            if (!itemIdList.isEmpty()) {
+                qw.in("mc.item_id", itemIdList);
+            }
+        } else if (bo.getItemId() != null) {
+            // 兼容原来的itemId单值查询
+            qw.eq("mc.item_id", bo.getItemId());
+        }
         //逻辑删除
         qw.eq("mc.del_flag", 0);
         //把team字段作为筛选条件