From ab6e2f8fb15bf4ddb8e940ab6b979c111130df4d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 05 十一月 2024 10:09:19 +0800
Subject: [PATCH] 新增发货主页审核跟出库状态筛选

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
index a7ca291..3ca6c8c 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -300,6 +300,12 @@
             <if test="delivery.area != null and delivery.area != ''">
                 and d.area regexp REGEXP_REPLACE(#{delivery.area},'\\.0+$','')
             </if>
+            <if test="delivery.deliveryState != null ">
+                and d.delivery_state = #{delivery.deliveryState}
+            </if>
+            <if test="delivery.stockState != null ">
+                and d.stock_state = #{delivery.stockState}
+            </if>
 
             </where>
         group by d.delivery_id
@@ -344,6 +350,12 @@
             <if test="delivery.area != null and delivery.area != ''">
                 and d.area regexp REGEXP_REPLACE(#{delivery.area},'\\.0+$','')
             </if>
+            <if test="delivery.deliveryState != null ">
+                and d.delivery_state = #{delivery.deliveryState}
+            </if>
+            <if test="delivery.stockState != null ">
+                and d.stock_state = #{delivery.stockState}
+            </if>
         </where>
         limit #{offset},#{pageSize};
 </select>

--
Gitblit v1.8.0