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 | 74 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 10 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 0406043..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" >
@@ -53,13 +67,25 @@
<insert id="insertDelivery" useGeneratedKeys="true" >
insert into sd.delivery(delivery_state,stock_state,payment_terms,delivery_id,order_id,project,customer_id,customer_name,
delivery_date,pay_method,pay_date,salesman_id,salesman,creator_id,creator,contacts,contact_number,delivery_address,
- area,quantity,money,remarks,create_time)
+ area,quantity,money,remarks,create_time,freight,freight_price,freight_quantity)
values (
0,0,#{delivery.paymentTerms},#{number} ,#{orderId},#{delivery.project},#{delivery.customerId},#{delivery.customerName},#{delivery.deliveryDate},#{delivery.payMethod},
#{delivery.payDate},#{delivery.salesmanId},#{delivery.salesman},#{delivery.creatorId},#{delivery.creator},#{delivery.contacts},#{delivery.contactNumber},#{delivery.deliveryAddress},
- 0,0,0,#{delivery.remarks},now()
+ 0,0,0,#{delivery.remarks},now(),#{delivery.freightPrice}*#{delivery.freightQuantity},#{delivery.freightPrice},#{delivery.freightQuantity}
)
</insert>
+
+ <update id="updateDelivery" >
+ update sd.delivery set payment_terms=#{delivery.paymentTerms},
+ delivery_date=#{delivery.deliveryDate},
+ pay_method=#{delivery.payMethod},
+ pay_date=#{delivery.payDate},contacts=#{delivery.contacts},contact_number=#{delivery.contactNumber},
+ delivery_address=#{delivery.deliveryAddress},
+ freight=#{delivery.freightPrice}*#{delivery.freightQuantity},
+ freight_price=#{delivery.freightPrice},
+ freight_quantity=#{delivery.freightQuantity}
+ where delivery_id=#{number}
+ </update>
<select id="getSelectOrderInventory" resultMap="selectOrderInventory">
select o.create_order,
@@ -85,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) <= #{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>
@@ -130,6 +156,10 @@
limit #{offset},#{pageSize};
</select>
+ <select id="selectOrderId" >
+ select * from sd.`order` where order_id=#{orderId}
+ </select>
+
<select id="getSelectOrderInventoryPageTotal" >
select CEILING(count(zu.order_id)/#{pageSize}) as 'pageTotal',
count(zu.order_id) as 'total' from
@@ -139,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) <= #{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>
@@ -191,7 +221,7 @@
select
d.delivery_state,d.stock_state,d.payment_terms,
d.customer_id,d.customer_name,d.project,d.pay_method,d.pay_date,d.contacts,d.contact_number,
- d.delivery_address,d.remarks,d.create_time,d.delivery_date,d.creator,d.salesman,d.salesman_id
+ d.delivery_address,d.remarks,d.create_time,d.delivery_date,d.creator,d.salesman,d.salesman_id,d.freight,d.freight_price,d.freight_quantity
from sd.delivery d
<where>
<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
@@ -206,7 +236,7 @@
select
d.delivery_id,d.quantity,d.money,d.area,d.project,
d.customer_id,d.customer_name,d.project,d.pay_method,d.pay_date,d.contacts,d.contact_number,
- d.delivery_address,d.remarks,d.create_time,d.delivery_date,d.creator,d.salesman,d.salesman_id
+ d.delivery_address,d.remarks,d.create_time,d.delivery_date,d.creator,d.salesman,d.salesman_id,d.freight,d.freight_price,d.freight_quantity
from sd.delivery d
<where>
<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -219,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 != ''">
@@ -242,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) <= #{endDate}
<if test="delivery.deliveryId != null and delivery.deliveryId != ''">
@@ -264,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}
@@ -275,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>
@@ -318,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