From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml |   52 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 45 insertions(+), 7 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..953bc40 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -42,7 +42,21 @@
 
 
     <select id="getmaximum" >
-        select count(*) from sd.delivery where  date(create_time)=CURDATE()
+        select
+            ifnull(SUBSTR(max(right(delivery_id,8)) from 7),0)
+        from
+            sd.delivery as a
+        where
+            date(a.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" >
@@ -65,7 +79,7 @@
         update  sd.delivery set payment_terms=#{delivery.paymentTerms},
                                 delivery_date=#{delivery.deliveryDate},
                                 pay_method=#{delivery.payMethod},
-                                pay_date=#{delivery.payDate},contacts=#{delivery.creator},contact_number=#{delivery.contactNumber},
+                                pay_date=#{delivery.payDate},contacts=#{delivery.contacts},contact_number=#{delivery.contactNumber},
                                 delivery_address=#{delivery.deliveryAddress},
                                 freight=#{delivery.freightPrice}*#{delivery.freightQuantity},
                                 freight_price=#{delivery.freightPrice},
@@ -97,7 +111,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 +169,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>
@@ -235,7 +249,8 @@
     <select id="getSelectShippingOrderDetailPrinting" >
         select
         d.order_id,d.quantity,round(d.money,0) as money ,d.area,d.project,
-        d.customer_id,d.customer_name,d.creator,d.salesman,d.salesman_id
+        d.customer_id,d.customer_name,d.creator,d.salesman,d.salesman_id,
+        d.processing_note,d.contract_id,d.delivery_date
         from sd.`order` d
         <where>
             <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
@@ -258,7 +273,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 +295,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}
@@ -291,8 +306,15 @@
             <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
         order by d.id desc
         limit #{offset},#{pageSize};
     </select>
@@ -334,7 +356,23 @@
             <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>
+
+    <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