From b39599abcfce0b8db09fc5c94ff4655a2dc99ee1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 11:48:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index e88ee48..2cf1f94 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -90,6 +90,9 @@
<result column="freight" property="delivery.freight"/>
<result column="freight_price" property="delivery.freightPrice"/>
<result column="freight_quantity" property="delivery.freightQuantity"/>
+ <result column="delivery_state" property="delivery.deliveryState"/>
+ <result column="money" property="delivery.money"/>
+ <result column="other_money" property="delivery.otherMoney"/>
<result column="product_id" property="orderDetail.productId"/>
<result column="product_name" property="orderDetail.productName"/>
@@ -124,6 +127,7 @@
<result column="height" property="orderDetail.shape"/>
<result column="contract_id" property="order.contractId"/>
+ <result column="batch" property="order.batch"/>
@@ -292,7 +296,7 @@
</if>
</where>
- order by dd.id
+ order by dd.box_no,dd.order_id,dd.order_number
</select>
<select id="getSelectShippingOrderDetailPageTotal">
@@ -485,6 +489,7 @@
and od.perimeter regexp #{orderDetail.perimeter}
</if>
</where>
+ order by od.order_id,od.order_number
</select>
<select id="getSelectShippingOrderDetailsPageTotal">
@@ -1049,7 +1054,7 @@
<select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
select dd.delivery_id,od.order_id,od.product_id,IF(#{type}='product_abbreviation',pt.remarks,od.product_name) as product_name,dd.price,sum(dd.area) as area,
- sum(dd.money) as money,sum(dd.quantity) as quantity,o.contract_id from
+ sum(dd.money) as money,sum(dd.quantity) as quantity,o.contract_id,o.batch from
delivery_detail dd left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
left join product pt on pt.id=od.product_id
left join sd.`order` o on o.order_id=dd.order_id
@@ -1398,4 +1403,44 @@
group by dd.delivery_id,dd.order_id,od.product_id
order by dd.delivery_id,dd.delivery_number
</select>
+
+
+ <select id="getDeliverDetailOrderNumber" resultMap="selectDeliveryDetail">
+ select dd.order_id,
+ dd.order_Number,
+ dd.delivery_number,
+ dd.delivery_id,
+ dd.quantity,
+ dd.price,
+ dd.area,
+ dd.money,
+ dd.other_columns,
+ d.delivery_state,
+ d.money
+ from sd.delivery_detail dd
+ left join sd.delivery d on dd.delivery_id=d.delivery_id
+ where dd.order_id=#{orderId} and dd.order_number=#{orderNumber} and dd.delivery_id=#{deliveryId}
+
+ </select>
+
+ <select id="getDeliverOrderNumber">
+ select
+ d.delivery_id,
+ d.delivery_state,
+ d.money
+ from sd.delivery_detail dd
+ left join sd.delivery d on dd.delivery_id=d.delivery_id
+ where dd.order_id=#{orderId} and dd.order_number=#{orderNumber}
+ group by d.delivery_id
+ </select>
+
+ <update id="updateDeliveryDetailmonye">
+ update sd.delivery_detail set price=#{price},money=#{deliveryDetail.money}
+ where delivery_id=#{deliveryDetail.deliveryId} and delivery_number=#{deliveryDetail.deliveryNumber}
+ </update>
+
+ <update id="updateDeliverymonye">
+ update sd.delivery set money=#{money}
+ where delivery_id=#{deliveryId}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0