From 036afcff3c26daba3a79c2e5ae8cd1eb3c753e73 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 8 Aug 2023 14:52:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E5=A4=87?=
 =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockupMapper.xml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index 371c57d05..a52f837d2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -79,10 +79,10 @@
         left join logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id
         left join logpm_distribution_stockup lds on ldsi.stockup_id = lds.id
         <where>
-            <if test="param.stockupDateStart != null and param.stockupDateStart != '' "> and lds.stockup_date &lt;= #{param.stockupDateStart}</if>
-            <if test="param.stockupDateEnd != null and param.stockupDateEnd != '' "> and lds.stockup_date &gt;= #{param.stockupDateEnd}</if>
-            <if test="param.status != null and param.status == 0 "> and  lds.stockup_status in (1,2,3) </if>
-            <if test="param.status != null and param.status == 1 "> and  lds.stockup_status = 4 </if>
+            <if test="param.stockupDateStart != null and param.stockupDateStart != '' "> and lds.stockup_date &gt;= #{param.stockupDateStart}</if>
+            <if test="param.stockupDateEnd != null and param.stockupDateEnd != '' "> and lds.stockup_date &lt;= #{param.stockupDateEnd}</if>
+            <if test="param.status != null and param.status == 0 "> and  lds.stockup_status in (10,20,30) </if>
+            <if test="param.status != null and param.status == 1 "> and  lds.stockup_status = 40 </if>
             and lds.is_deleted = 0
             and lds.forklift_id = #{param.userId}
         </where>