From 109e6d0e1f954b7c06d39c285b87cb9fbebc493c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 02 八月 2024 17:39:12 +0800
Subject: [PATCH] 修改金额重置
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 001696a..26a2681 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -66,6 +66,7 @@
<result column="delivery_number" property="deliveryNumber"/>
<result column="quantity" property="quantity"/>
<result column="area" property="area"/>
+ <result column="price" property="price"/>
<result column="money" property="money"/>
<result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
<result column="delivery_detail_state" property="deliveryDetailState"/>
@@ -86,6 +87,8 @@
<result column="product_id" property="orderDetail.productId"/>
<result column="product_name" property="orderDetail.productName"/>
+
+ <result column="other_money" property="order.otherMoney"/>
@@ -537,13 +540,16 @@
dd.order_id,
dd.order_number,
dd.area,
+ dd.price,
dd.money,
dd.quantity,
dd.delivery_detail_remakes,
- dd.create_time
+ dd.create_time,
+ o.other_money
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.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -566,6 +572,9 @@
</if>
<if test="deliveryDetail.area != null and deliveryDetail.area != ''">
and dd.area like concat('%', #{deliveryDetail.area},'%')
+ </if>
+ <if test="deliveryDetail.price != null and deliveryDetail.price != ''">
+ and dd.price like concat('%', #{deliveryDetail.price},'%')
</if>
<if test="deliveryDetail.money != null and deliveryDetail.money != ''">
and dd.money like concat('%', #{deliveryDetail.money},'%')
@@ -627,6 +636,7 @@
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.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -649,6 +659,9 @@
</if>
<if test="deliveryDetail.area != null and deliveryDetail.area != ''">
and dd.area like concat('%', #{deliveryDetail.area},'%')
+ </if>
+ <if test="deliveryDetail.price != null and deliveryDetail.price != ''">
+ and dd.price like concat('%', #{deliveryDetail.price},'%')
</if>
<if test="deliveryDetail.money != null and deliveryDetail.money != ''">
and dd.money like concat('%', #{deliveryDetail.money},'%')
@@ -724,12 +737,15 @@
dd.order_id,
dd.order_number,
sum(dd.area) as area,
+ dd.price,
sum(dd.money) as money,
sum(dd.quantity) as quantity,
dd.delivery_detail_remakes,
- dd.create_time
+ dd.create_time,
+ o.other_money
from sd.delivery_detail dd left join 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.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -752,6 +768,9 @@
</if>
<if test="deliveryDetail.area != null and deliveryDetail.area != ''">
and dd.area like concat('%', #{deliveryDetail.area},'%')
+ </if>
+ <if test="deliveryDetail.price != null and deliveryDetail.price != ''">
+ and dd.price like concat('%', #{deliveryDetail.price},'%')
</if>
<if test="deliveryDetail.money != null and deliveryDetail.money != ''">
and dd.money like concat('%', #{deliveryDetail.money},'%')
@@ -809,7 +828,7 @@
</if>
</where>
- group by dd.delivery_id,od.product_id
+ group by dd.delivery_id,dd.order_id,od.product_id
order by dd.delivery_id,dd.delivery_number
limit #{offset},#{pageSize};
</select>
@@ -822,6 +841,7 @@
select dd.id as id
from sd.delivery_detail dd left join 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.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -844,6 +864,9 @@
</if>
<if test="deliveryDetail.area != null and deliveryDetail.area != ''">
and dd.area like concat('%', #{deliveryDetail.area},'%')
+ </if>
+ <if test="deliveryDetail.price != null and deliveryDetail.price != ''">
+ and dd.price like concat('%', #{deliveryDetail.price},'%')
</if>
<if test="deliveryDetail.money != null and deliveryDetail.money != ''">
and dd.money like concat('%', #{deliveryDetail.money},'%')
@@ -901,7 +924,7 @@
</if>
</where>
- group by dd.delivery_id,od.product_id) as zu
+ group by dd.delivery_id,dd.order_id,od.product_id) as zu
</select>
<select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
@@ -1010,13 +1033,16 @@
dd.order_id,
dd.order_number,
dd.area,
+ dd.price,
dd.money,
dd.quantity,
dd.delivery_detail_remakes,
- dd.create_time
+ dd.create_time,
+ o.other_money
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
left join sd.customer c on d.customer_id=c.id
where date(d.create_time)>=#{dates[0]} and date(d.create_time) <= #{dates[1]}
</select>
@@ -1046,12 +1072,15 @@
sum(dd.money) as money,
sum(dd.quantity) as quantity,
dd.delivery_detail_remakes,
- dd.create_time
+ dd.price,
+ dd.create_time,
+ o.other_money
from sd.delivery_detail dd left join 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
left join sd.customer c on d.customer_id=c.id
where date(d.create_time)>=#{dates[0]} and date(d.create_time) <= #{dates[1]}
- group by dd.delivery_id,od.product_id
+ group by dd.delivery_id,dd.order_id,od.product_id
order by dd.delivery_id,dd.delivery_number
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0