From c3e3920e4e7fcda3dd986c00bb80188381e93015 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 四月 2024 09:59:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/resources/mapper/sd/Delivery.xml | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/Delivery.xml b/north-glass-erp/src/main/resources/mapper/sd/Delivery.xml
index 186d9ea..bf2a184 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/Delivery.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/Delivery.xml
@@ -28,6 +28,10 @@
<result column="quantity_available" property="finishedGoodsInventory.quantityAvailable"/>
</resultMap>
+
+ <delete id="deleteDelivery">
+ delete from sd.delivery where delivery_id=#{deliveryId}
+ </delete>
<update id="updateDeliveryToExamine">
update sd.delivery set delivery_state=#{deliveryState} where delivery_id=#{deliveryId}
</update>
@@ -122,7 +126,7 @@
and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
</if>
</where>
- group by o.order_id
+ group by o.order_id order by o.id desc
limit #{offset},#{pageSize};
</select>
@@ -183,7 +187,7 @@
</select>
- <select id="getseletShippingOrderDetaildelivery" >
+ <select id="getSelectShippingOrderDetailDelivery" >
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,
@@ -198,8 +202,22 @@
limit 0,1
</select>
+ <select id="getSelectShippingOrderDetailDeliveryPrinting" >
+ select
+ d.delivery_id,d.quantity,d.money,d.area,
+ 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
+ from sd.delivery d
+ <where>
+ <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
+ and d.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
+ </if>
- <select id="getseletShippingOrderDetaildeliverys" >
+ </where>
+ </select>
+
+
+ <select id="getSelectShippingOrderDetailDeliverys" >
select customer_id,customer_name,project,salesman,salesman_id,contacts,contact_number,delivery_address from sd.`order`
<where>
<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
@@ -210,7 +228,7 @@
limit 0,1
</select>
- <select id="getseletShippingOrder">
+ <select id="getSelectShippingOrder">
select * from sd.delivery d
<where>
date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate}
@@ -250,7 +268,7 @@
limit #{offset},#{pageSize};
</select>
- <select id="getseletShippingOrderPageTotal">
+ <select id="getSelectShippingOrderPageTotal">
select
CEILING(count(id)/#{pageSize}) as 'pageTotal',
count(id) as 'total'
--
Gitblit v1.8.0