From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 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 1bd48c7..a7ca291 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -45,6 +45,15 @@
         select count(*) from sd.delivery where  date(create_time)=CURDATE()
     </select>
 
+    <select id="getmaximumMonth">
+        select
+            ifnull(SUBSTR(max(delivery_id) from 7),0)
+        from
+            sd.delivery as a
+        where
+            date(a.create_time)  BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
+    </select>
+
     <select id="getDeliveryConut" >
         select count(*) from sd.delivery where  delivery_id=#{deliveryId}
     </select>
@@ -97,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>
@@ -155,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>
@@ -258,7 +267,7 @@
     </select>
 
     <select id="getSelectShippingOrder">
-        select * from sd.delivery d
+        select * from sd.delivery d left join sd.delivery_detail dd on d.delivery_id=dd.delivery_id
         <where>
             date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
             <if test="delivery.deliveryId != null and delivery.deliveryId != ''">
@@ -280,7 +289,7 @@
                 and d.project regexp #{delivery.project}
             </if>
             <if test="delivery.orderId != null and delivery.orderId != ''">
-                and d.order_id regexp #{delivery.orderId}
+                and dd.order_id regexp #{delivery.orderId}
             </if>
             <if test="delivery.payMethod != null and delivery.payMethod != ''">
                 and d.pay_method regexp #{delivery.payMethod}
@@ -293,6 +302,7 @@
             </if>
 
             </where>
+        group by d.delivery_id
         order by d.id desc
         limit #{offset},#{pageSize};
     </select>
@@ -337,4 +347,11 @@
         </where>
         limit #{offset},#{pageSize};
 </select>
+
+    <update id="updateDeliveryPrintNumber">
+        update sd.delivery
+        set printing_number=printing_number+1
+        where delivery_id = #{deliveryId}
+
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0