From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 104 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 90 insertions(+), 14 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 ab21c0e..2cf1f94 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -73,9 +73,8 @@
<result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
<result column="delivery_detail_state" property="deliveryDetailState"/>
<result column="create_time" property="createTime"/>
- <result column="batch" property="batch"/>
- <result column="width" property="width"/>
- <result column="height" property="height"/>
+ <result column="box_no" property="boxNo"/>
+
<result column="customer_id" property="delivery.customerId"/>
<result column="customer_name" property="delivery.customerName"/>
<result column="project" property="delivery.project"/>
@@ -91,12 +90,18 @@
<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"/>
+ <result column="width" property="orderDetail.width"/>
+ <result column="height" property="orderDetail.height"/>
+ <result column="building_number" property="orderDetail.buildingNumber"/>
<result column="other_money" property="order.otherMoney"/>
-
+ <result column="batch" property="order.batch"/>
</resultMap>
@@ -122,6 +127,7 @@
<result column="height" property="orderDetail.shape"/>
<result column="contract_id" property="order.contractId"/>
+ <result column="batch" property="order.batch"/>
@@ -290,7 +296,7 @@
</if>
</where>
- order by dd.id
+ order by dd.box_no,dd.order_id,dd.order_number
</select>
<select id="getSelectShippingOrderDetailPageTotal">
@@ -483,6 +489,7 @@
and od.perimeter regexp #{orderDetail.perimeter}
</if>
</where>
+ order by od.order_id,od.order_number
</select>
<select id="getSelectShippingOrderDetailsPageTotal">
@@ -592,21 +599,29 @@
d.freight,
o.batch,
od.width,
- od.height
+ od.height,
+ od.building_number,
+ dd.box_no
from sd.delivery_detail dd
left join sd.delivery d on dd.delivery_id=d.delivery_id
left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
left join sd.`order` o on dd.order_id=o.order_id
<where>
and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
- <if test="deliveryDetail.batch != null and deliveryDetail.batch != ''">
- and o.batch like concat('%',#{deliveryDetail.batch},'%')
+ <if test="deliveryDetail.order!=null and (deliveryDetail.order.batch != null and deliveryDetail.order.batch != '')">
+ and o.batch like concat('%',#{deliveryDetail.order.batch},'%')
</if>
- <if test="deliveryDetail.width != null and deliveryDetail.width != ''">
- and od.width like concat('%',#{deliveryDetail.width},'%')
+ <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.width != null and deliveryDetail.orderDetail.width != '')">
+ and od.width regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.width},'\\.0+$','')
</if>
- <if test="deliveryDetail.height != null and deliveryDetail.height != ''">
- and od.height like concat('%',#{deliveryDetail.height},'%')
+ <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.height != null and deliveryDetail.orderDetail.height != '')">
+ and od.height regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.height},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.buildingNumber != null and deliveryDetail.orderDetail.buildingNumber != '')">
+ and od.building_number like concat('%',#{deliveryDetail.orderDetail.buildingNumber},'%')
+ </if>
+ <if test="deliveryDetail.boxNo != null and deliveryDetail.boxNo != ''">
+ and dd.box_no like concat('%',#{deliveryDetail.boxNo},'%')
</if>
<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
@@ -707,6 +722,21 @@
left join sd.`order` o on dd.order_id=o.order_id
<where>
and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
+ <if test="deliveryDetail.order!=null and (deliveryDetail.order.batch != null and deliveryDetail.order.batch != '')">
+ and o.batch like concat('%',#{deliveryDetail.order.batch},'%')
+ </if>
+ <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.width != null and deliveryDetail.orderDetail.width != '')">
+ and od.width regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.width},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.height != null and deliveryDetail.orderDetail.height != '')">
+ and od.height regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.height},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.buildingNumber != null and deliveryDetail.orderDetail.buildingNumber != '')">
+ and od.building_number like concat('%',#{deliveryDetail.orderDetail.buildingNumber},'%')
+ </if>
+ <if test="deliveryDetail.boxNo != null and deliveryDetail.boxNo != ''">
+ and dd.box_no like concat('%',#{deliveryDetail.boxNo},'%')
+ </if>
<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
</if>
@@ -791,6 +821,7 @@
<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightPrice != null )">
and d.freight_price regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightPrice},'\\.0+$','')
</if>
+
</where>
order by dd.delivery_id,dd.delivery_number
</select>
@@ -1023,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
@@ -1319,7 +1350,12 @@
o.other_money,
d.freight,
d.freight_price,
- d.freight_quantity
+ d.freight_quantity,
+ od.width,
+ od.height,
+ o.batch,
+ od.building_number,
+ dd.box_no
from sd.delivery_detail dd
left join sd.delivery d on dd.delivery_id=d.delivery_id
left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
@@ -1367,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