From 3c87c3ff67c2193ab5bfaa31f0fb1ad5a68cd5af Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 15 三月 2024 09:09:10 +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 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 992c11e..5465bd7 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
@@ -81,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.order_number},#{orderDetail.computeGrossArea},
+ #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeGrossArea},
#{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
#{orderDetail.price}*#{orderDetail.deliveryDetail.quantity},'',1,now()
)
@@ -89,7 +89,7 @@
- <select id="getseletShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
+ <select id="getSelectShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
select od.order_id,
o.batch,
dd.delivery_number,
@@ -192,10 +192,11 @@
</if>
</where>
+ order by dd.id desc
limit #{offset},#{pageSize};
</select>
- <select id="getseletShippingOrderDetailPageTotal">
+ <select id="getSelectShippingOrderDetailPageTotal">
select
CEILING(count(dd.id)/#{pageSize})
from sd.delivery_detail dd
@@ -277,7 +278,7 @@
limit #{offset},#{pageSize};
</select>
- <select id="getseletShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
+ <select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
select od.order_id,
od.order_number,
o.batch,
@@ -370,7 +371,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