From a3dfc8966bb702c4ccb20f2a2afda7b7c39bd98d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 06 十一月 2024 15:17:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 dfd2c36..3ca6c8c 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -106,7 +106,7 @@
         from sd.`order` o
         left join mm.finished_goods_inventory fgi on o.order_id = fgi.order_id
         <where>
-            fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
+            fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate} and o.create_order>0
             <if test="order.orderId != null and order.orderId != ''">
                 and o.order_id REGEXP #{order.orderId}
             </if>
@@ -164,7 +164,7 @@
         o.money,o.area,o.create_time,o.pack_type,o.order_type,o.creator
         from sd.`order` o left join mm.finished_goods_inventory fgi on o.order_id=fgi.order_id
         <where>
-            fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
+            fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate} and o.create_order>0
             <if test="order.orderId != null and order.orderId != ''">
                 and o.order_id REGEXP #{order.orderId}
             </if>
@@ -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