From e055beb51893fc3dcb301cb0d6dc5919a47502ce Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Mon, 11 Aug 2025 15:02:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E4=BB=93=E5=BA=93=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4?=
 =?UTF-8?q?=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

- 在 WmsStockLogBo 类中添加 startTime 和 endTime 字段，用于指定查询的时间区间
- 修改 WmsStockLogServiceImpl 类中的查询逻辑，使用 startTime 和 endTime 替代原有的 changeTime 字段进行区间查询- 通过这些改动，用户可以更灵活地查询特定时间段内的仓库日志
---
 .../main/java/com/klp/domain/bo/WmsStockLogBo.java  | 13 +++++++++++++
 .../klp/service/impl/WmsStockLogServiceImpl.java    |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java
index 19abd587..d12db343 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.klp.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -65,5 +66,17 @@ public class WmsStockLogBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
 
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java
index 86dc2d6a..d05a0baa 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java
@@ -67,7 +67,11 @@ public class WmsStockLogServiceImpl implements IWmsStockLogService {
         lqw.eq(bo.getChangeQty() != null, WmsStockLog::getChangeQty, bo.getChangeQty());
         lqw.eq(bo.getAfterQty() != null, WmsStockLog::getAfterQty, bo.getAfterQty());
         lqw.eq(StringUtils.isNotBlank(bo.getChangeType()), WmsStockLog::getChangeType, bo.getChangeType());
-        lqw.eq(bo.getChangeTime() != null, WmsStockLog::getChangeTime, bo.getChangeTime());
+//        lqw.eq(bo.getChangeTime() != null, WmsStockLog::getChangeTime, bo.getChangeTime());
+
+        // 根据时间区间查询
+        lqw.ge(bo.getStartTime() != null, WmsStockLog::getChangeTime, bo.getStartTime());
+        lqw.le(bo.getEndTime() != null, WmsStockLog::getChangeTime, bo.getEndTime());
         return lqw;
     }