From 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 11 十一月 2024 16:29:00 +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 | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 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..3ca6c8c 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) <= #{endDate}
+ fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{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) <= #{endDate}
+ fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{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) <= #{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}
@@ -291,8 +300,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 +350,20 @@
<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