From 99f52fa038d8618981a98176ffee410c67ce3481 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sun, 11 Jan 2026 08:55:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(WmsMaterialCoil):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsMaterialCoilBo 中新增 byExportTimeStart 和 byExportTimeEnd 字段
- 为新增字段添加 JsonFormat 和 DateTimeFormat 注解支持
- 在服务实现中添加根据发货时间范围筛选的查询条件
- 支持通过发货开始时间和结束时间进行数据查询过滤
---
 .../src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java | 7 +++++++
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java   | 3 +++
 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 0bd3640e..9846537f 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
@@ -197,5 +197,12 @@ public class WmsMaterialCoilBo extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date byCreateTimeEnd;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date byExportTimeStart;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date byExportTimeEnd;
 }
 
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 f21ac41a..119fcf97 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
@@ -1914,6 +1914,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         lqw.ge(bo.getStartTime() != null, "mc.update_time", bo.getStartTime());
         lqw.le(bo.getEndTime() != null, "mc.update_time", bo.getEndTime());
 
+        // 根据发货开始和结束筛选发货时间
+        lqw.ge(bo.getByExportTimeStart() != null, "mc.export_time", bo.getByExportTimeStart());
+        lqw.le(bo.getByExportTimeEnd() != null, "mc.export_time", bo.getByExportTimeEnd());
         // 逻辑删除
         lqw.eq("mc.del_flag", 0);