From de18cca83738bdf6b279046e34b910ccd5b73a84 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 08:17:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
index 8feedfa..a3ed5ad 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
@@ -29,6 +29,7 @@
<result column="d_quantity" property="deliveryDetail.quantity"/>
<result column="money" property="deliveryDetail.money"/>
+ <result column="delivery_number" property="deliveryDetail.deliveryNumber"/>
<result column="delivery_detail_remakes" property="deliveryDetail.deliveryDetailRemakes"/>
<result column="batch" property="order.batch"/>
@@ -55,12 +56,24 @@
</resultMap>
+ <delete id="deleteDeliveryDetail">
+ delete from sd.delivery_detail where delivery_id=#{deliveryId}
+ </delete>
+
<update id="updateOrderDetailDeliveryNum">
update sd.order_detail set delivery_num=#{deliveryDetail.quantity} where order_id=#{orderId} and order_number=#{orderNumber}
</update>
+ <update id="updateIsNotOrderDetailDeliveryNum">
+ update sd.order_detail set delivery_num=delivery_num-#{quantity} where order_id=#{orderId} and order_number=#{orderNumber}
+ </update>
+
<select id="getdeliveryDetailmaximum" >
select count(*) from sd.delivery_detail where delivery_id=#{deliveryId}
+ </select>
+
+ <select id="getIsNotDeliveryDetail" >
+ select * from sd.delivery_detail where delivery_id=#{deliveryId}
</select>
@@ -68,7 +81,7 @@
insert into sd.delivery_detail (delivery_id,delivery_number,order_number,
area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,create_time)
values (
- #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeGrossArea},
+ #{number} ,#{deliveryNumber},#{orderDetail.order_number},#{orderDetail.computeGrossArea},
#{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
#{orderDetail.price}*#{orderDetail.deliveryDetail.quantity},'',1,now()
)
@@ -76,11 +89,32 @@
- <select id="getseletShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
- select od.order_id,o.batch,fgi.quantity_available,od.quantity-dd.quantity as t_quantity,od.quantity as o_quantity,dd.quantity
- as d_quantity,od.building_number,od.product_id,od.product_name,od.price,fgi.storage_region,dd.money,od.width,
- od.height,od.shape,fgi.actual_signal_area,od.gross_area,od.compute_area,od.compute_gross_area,
- od.processing_note,od.edging_type,od.perimeter,dd.delivery_detail_remakes
+ <select id="getSelectShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
+ select od.order_id,
+ o.batch,
+ dd.delivery_number,
+ fgi.quantity_available + dd.quantity as quantity_available,
+ od.order_number,
+ od.quantity-dd.quantity as t_quantity,
+ od.quantity as o_quantity,
+ dd.quantity as d_quantity,
+ od.building_number,
+ od.product_id,
+ od.product_name,
+ od.price,
+ fgi.storage_region,
+ dd.money,
+ od.width,
+ od.height,
+ od.shape,
+ fgi.actual_signal_area,
+ od.gross_area,
+ od.compute_area,
+ od.compute_gross_area,
+ od.processing_note,
+ od.edging_type,
+ od.perimeter,
+ dd.delivery_detail_remakes
from sd.delivery_detail dd
left join sd.delivery d on dd.delivery_id=d.delivery_id
left join sd.order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
@@ -161,7 +195,7 @@
limit #{offset},#{pageSize};
</select>
- <select id="getseletShippingOrderDetailPageTotal">
+ <select id="getSelectShippingOrderDetailPageTotal">
select
CEILING(count(dd.id)/#{pageSize})
from sd.delivery_detail dd
@@ -243,7 +277,7 @@
limit #{offset},#{pageSize};
</select>
- <select id="getseletShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
+ <select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
select od.order_id,
od.order_number,
o.batch,
@@ -336,7 +370,7 @@
limit #{offset},#{pageSize};
</select>
- <select id="getseletShippingOrderDetailsPageTotal">
+ <select id="getSelectShippingOrderDetailsPageTotal">
select
CEILING(count(od.id)/#{pageSize})
from sd.order_detail od
--
Gitblit v1.8.0