From fb66e418d8f899db90b80c45fab1882b94eba5d2 Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Tue, 11 Mar 2025 15:31:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/wms/controller/ExcelController.java     |  1 +
 .../java/com/wms/controller/StockController.java     | 12 ++++++++++--
 .../entity/app/request/StockUpdateRecordQuery.java   | 11 ++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/wms/controller/ExcelController.java b/src/main/java/com/wms/controller/ExcelController.java
index ee20ea5..aa976d8 100644
--- a/src/main/java/com/wms/controller/ExcelController.java
+++ b/src/main/java/com/wms/controller/ExcelController.java
@@ -782,6 +782,7 @@ public class ExcelController {
                 .like(StringUtils.isNotEmpty(workSummaryQuery.getGoodsId()), WorkSummary::getGoodsId, workSummaryQuery.getGoodsId());
         if(workSummaryQuery.getWorkDate() != null && workSummaryQuery.getWorkEndDate() != null) {
             workSummaryQueryWrapper.between(WorkSummary::getWorkDate, workSummaryQuery.getWorkDate(), workSummaryQuery.getWorkEndDate());
+
         }
         if(workSummaryQuery.getWorkDate() != null && workSummaryQuery.getWorkEndDate() == null) {
             workSummaryQueryWrapper.eq(WorkSummary::getWorkDate, workSummaryQuery.getWorkDate());
diff --git a/src/main/java/com/wms/controller/StockController.java b/src/main/java/com/wms/controller/StockController.java
index 9bbf543..443f234 100644
--- a/src/main/java/com/wms/controller/StockController.java
+++ b/src/main/java/com/wms/controller/StockController.java
@@ -353,7 +353,15 @@ public class StockController {
                     .like(StringUtils.isNotEmpty(stockUpdateRecordQuery.getVehicleId()), StockUpdateRecord::getVehicleId, stockUpdateRecordQuery.getVehicleId())
                     .like(StringUtils.isNotEmpty(stockUpdateRecordQuery.getGoodsId()), StockUpdateRecord::getGoodsId, stockUpdateRecordQuery.getGoodsId())
                     .orderByDesc(StockUpdateRecord::getUpdateTime);
-            if (stockUpdateRecordQuery.getUpdateTime() != null) {
+            if (stockUpdateRecordQuery.getUpdateTime() != null && stockUpdateRecordQuery.getUpdateEndTime() != null) {
+                if(stockUpdateRecordQuery.getUpdateEndTime().isBefore(stockUpdateRecordQuery.getUpdateTime())) {
+                    response.setCode(ResponseCode.ERROR.getCode());
+                    response.setMessage("结束日期不能小于开始日期");
+                    return convertJsonString(response);
+                }
+                stockLambdaQueryWrapper.between(StockUpdateRecord::getUpdateTime, stockUpdateRecordQuery.getUpdateTime().toLocalDate().atStartOfDay(), stockUpdateRecordQuery.getUpdateEndTime().toLocalDate().plusDays(1).atStartOfDay().minusSeconds(1));
+            }
+            if (stockUpdateRecordQuery.getUpdateTime() != null && stockUpdateRecordQuery.getUpdateEndTime() == null) {
                 stockLambdaQueryWrapper.between(StockUpdateRecord::getUpdateTime, stockUpdateRecordQuery.getUpdateTime().toLocalDate().atStartOfDay(), stockUpdateRecordQuery.getUpdateTime().toLocalDate().plusDays(1).atStartOfDay().minusSeconds(1));
             }
             Page<StockUpdateRecord> recordsPage = stockUpdateRecordService.page(page, stockLambdaQueryWrapper);
@@ -562,4 +570,4 @@ public class StockController {
             return convertJsonString(rsp);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/wms/entity/app/request/StockUpdateRecordQuery.java b/src/main/java/com/wms/entity/app/request/StockUpdateRecordQuery.java
index b4c7b1f..840a13b 100644
--- a/src/main/java/com/wms/entity/app/request/StockUpdateRecordQuery.java
+++ b/src/main/java/com/wms/entity/app/request/StockUpdateRecordQuery.java
@@ -63,12 +63,21 @@ public class StockUpdateRecordQuery extends PageQuery {
     @JsonProperty("reason")
     private String reason;
     /**
-     * 更新时间
+     * 更新时间 -- 开始时间
      */
     @JsonProperty("updateTime")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
+
+    /**
+     * 更新时间 -- 结束时间
+     */
+    @JsonProperty("updateEndTime")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateEndTime;
+
     /**
      * 更新用户
      */