From 398def2341c5b960d4f88d4b449642317310af28 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 31 Oct 2025 11:38:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E9=92=A2=E5=8D=B7=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=AD=9B=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 中新增 startTime 和 endTime 字段
- 使用 @JsonFormat 和 @DateTimeFormat 注解格式化时间字段- 在 WmsMaterialCoilServiceImpl 中根据时间范围筛选数据- 支持按更新时间区间查询物料钢卷信息
---
 .../java/com/klp/domain/bo/WmsMaterialCoilBo.java    | 12 ++++++++++++
 .../klp/service/impl/WmsMaterialCoilServiceImpl.java |  3 +++
 2 files changed, 15 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 aad30dd1..b3493bbe 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,12 +1,16 @@
 package com.klp.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.klp.common.core.domain.BaseEntity;
 import com.klp.common.core.validate.AddGroup;
 import com.klp.common.core.validate.EditGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import javax.validation.constraints.*;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -110,5 +114,13 @@ public class WmsMaterialCoilBo extends BaseEntity {
      */
     private List<WmsMaterialCoilBo> newCoils;
 
+    //时间格式化
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
 }
 
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 b0fb3b65..3c9601ff 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
@@ -155,6 +155,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         qw.eq(bo.getItemId() !=null, "mc.item_id", bo.getItemId());
         //逻辑删除
         qw.eq("mc.del_flag", 0);
+        //根据开始时间和结束时间筛选修改时间
+        qw.ge(bo.getStartTime() != null, "mc.update_time", bo.getStartTime());
+        qw.le(bo.getEndTime() != null, "mc.update_time", bo.getEndTime());
         return qw;
     }