From a26089ce15ac427a8908116475582a21d65e0f25 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 20 Apr 2026 13:32:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(WmsMaterialCoil):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8C=89=E5=85=A5=E5=9C=BA=E9=92=A2=E5=8D=B7=E5=8F=B7=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsMaterialCoilBo 中新增 groupByEnterCoilNo 字段
- 实现按 enter_coil_no 分组的查询逻辑
- 根据 bo 中的 groupByEnterCoilNo 参数动态添加分组条件
---
 .../src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java  | 6 ++++++
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java    | 4 ++++
 2 files changed, 10 insertions(+)

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 31e81007..0d07ee5f 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
@@ -360,5 +360,11 @@ public class WmsMaterialCoilBo extends BaseEntity {
      */
     @TableField(exist = false)
     private Boolean hasTransferType;
+
+    /**
+     * 是否按入场钢卷号分组（true=按enter_coil_no分组）
+     */
+    @TableField(exist = false)
+    private Boolean groupByEnterCoilNo;
 }
 
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 e9c34793..3f4bd813 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
@@ -881,6 +881,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             //根据创建时间倒叙
             qw.orderByDesc("mc.create_time");
         }
+        // 按入场钢卷号分组
+        if (Boolean.TRUE.equals(bo.getGroupByEnterCoilNo())) {
+            qw.groupBy("mc.enter_coil_no");
+        }
         return qw;
     }