From c5dacb89767bb6bab73569aa66c9964af38d3c17 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 5 Mar 2024 12:04:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=BA=93=E8=AE=A2=E5=8D=95=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E5=85=A5=E5=BA=93=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/dto/DistributionStockArticleOweDTO.java | 1 +
 .../distribution/mapper/DistributionStockArticleMapper.xml     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java
index 8c8aecc11..a636c824c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java
@@ -28,5 +28,6 @@ public class DistributionStockArticleOweDTO extends DistributionStockArticleEnti
 	private String reservation;
 	private String startDate;
 	private String entDate;
+	private String warehouseEntryTimeEnd;
 	private List<Long> warehouseIdList;
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 48ab558e6..e2c163331 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -474,6 +474,9 @@
             <if test="  param.warehouseEntryTime != null  ">and DATE(ldsa.warehouse_entry_time) =
                 #{param.warehouseEntryTime}
             </if>
+            <if test="  param.warehouseEntryTimeEnd != null  ">and DATE(ldsa.warehouse_entry_time) =
+                #{param.warehouseEntryTimeEnd}
+            </if>
             <if test="  param.inventoryDate != null  ">and DATE(ldsa.inventory_date) = #{param.inventoryDate}</if>
             <if test="  param.serviceNumber != null and param.serviceNumber != ''  ">and ldsa.service_number like
                 concat('%',#{param.serviceNumber},'%')