From 82a5de6d2ec80b45660149c84be28734032562f6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 11 十月 2024 15:21:53 +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 | 192 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 161 insertions(+), 31 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 780c2ff..bec9567 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"/>
@@ -83,9 +84,14 @@
<result column="delivery_date" property="delivery.deliveryDate"/>
<result column="creator" property="delivery.creator"/>
<result column="salesman" property="delivery.salesman"/>
+ <result column="freight" property="delivery.freight"/>
+ <result column="freight_price" property="delivery.freightPrice"/>
+ <result column="freight_quantity" property="delivery.freightQuantity"/>
<result column="product_id" property="orderDetail.productId"/>
<result column="product_name" property="orderDetail.productName"/>
+
+ <result column="other_money" property="order.otherMoney"/>
@@ -145,14 +151,18 @@
select sum(quantity) from sd.order_detail where order_id=#{orderId}
</select>
+ <select id="selectOrderDetailDeliveryCount">
+ SELECT * FROM sd.order_detail where order_id=#{orderDetail.orderId} and order_number=#{orderDetail.orderNumber}
+ </select>
+
<insert id="insertDeliveryDetail" useGeneratedKeys="true" >
insert into sd.delivery_detail (delivery_id,delivery_number,order_number,
- area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price)
+ area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price,other_money)
values (
- #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeArea}*#{orderDetail.deliveryDetail.quantity},
+ #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{deliveryDetailArea},
#{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
- #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price}
+ #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price},#{otherMoneys}
)
</insert>
@@ -164,7 +174,7 @@
dd.delivery_number,
fgi.quantity_available + dd.quantity as quantity_available,
od.order_number,
- od.quantity-dd.quantity as t_quantity,
+ od.quantity-od.delivery_num as t_quantity,
od.quantity as o_quantity,
dd.quantity as d_quantity,
od.building_number,
@@ -177,6 +187,7 @@
od.height,
od.shape,
fgi.actual_signal_area,
+ od.area,
od.gross_area,
od.compute_area,
od.compute_gross_area,
@@ -366,6 +377,7 @@
od.height,
od.shape,
fgi.actual_signal_area,
+ od.area,
od.gross_area,
od.compute_area,
od.compute_gross_area,
@@ -520,6 +532,8 @@
<select id="getSelectDeliveryDetailReport" resultMap="selectDeliveryDetail">
select dd.delivery_id,
dd.delivery_number,
+ od.product_id,
+ od.product_name,
d.payment_terms,
d.project,
d.customer_id,
@@ -535,12 +549,19 @@
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,
+ d.freight_price,
+ d.freight_quantity,
+ d.freight
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 != ''">
@@ -549,6 +570,12 @@
<if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
</if>
+ <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != ''">
+ and od.product_id like concat('%',#{deliveryDetail.orderDetail.productId},'%')
+ </if>
+ <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != ''">
+ and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
+ </if>
<if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
</if>
@@ -556,13 +583,16 @@
and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
</if>
<if test="deliveryDetail.area != null and deliveryDetail.area != ''">
- and dd.area like concat('%', #{deliveryDetail.area},'%')
+ and dd.area regexp REGEXP_REPLACE(#{deliveryDetail.area},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.price != null and deliveryDetail.price != ''">
+ and dd.price regexp REGEXP_REPLACE(#{deliveryDetail.price},'\\.0+$','')
</if>
<if test="deliveryDetail.money != null and deliveryDetail.money != ''">
- and dd.money like concat('%', #{deliveryDetail.money},'%')
+ and dd.money regexp REGEXP_REPLACE(#{deliveryDetail.money},'\\.0+$','')
</if>
<if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
- and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
+ and dd.quantity regexp REGEXP_REPLACE(#{deliveryDetail.quantity},'\\.0+$','')
</if>
<if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
@@ -605,6 +635,18 @@
</if>
<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != '')">
and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
+ </if>
+ <if test="deliveryDetail.order!=null and (deliveryDetail.order.otherMoney != null )">
+ and o.other_money regexp REGEXP_REPLACE(#{deliveryDetail.order.otherMoney},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freight != null )">
+ and d.freight regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freight},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightQuantity != null )">
+ and d.freight_quantity regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightQuantity},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightPrice != null )">
+ and d.freight_price regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightPrice},'\\.0+$','')
</if>
</where>
@@ -617,6 +659,8 @@
count(dd.id) as 'total'
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 != ''">
@@ -625,6 +669,12 @@
<if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
</if>
+ <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != ''">
+ and od.product_id like concat('%',#{deliveryDetail.orderDetail.productId},'%')
+ </if>
+ <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != ''">
+ and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
+ </if>
<if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
</if>
@@ -632,13 +682,16 @@
and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
</if>
<if test="deliveryDetail.area != null and deliveryDetail.area != ''">
- and dd.area like concat('%', #{deliveryDetail.area},'%')
+ and dd.area regexp REGEXP_REPLACE(#{deliveryDetail.area},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.price != null and deliveryDetail.price != ''">
+ and dd.price regexp REGEXP_REPLACE(#{deliveryDetail.price},'\\.0+$','')
</if>
<if test="deliveryDetail.money != null and deliveryDetail.money != ''">
- and dd.money like concat('%', #{deliveryDetail.money},'%')
+ and dd.money regexp REGEXP_REPLACE(#{deliveryDetail.money},'\\.0+$','')
</if>
<if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
- and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
+ and dd.quantity regexp REGEXP_REPLACE(#{deliveryDetail.quantity},'\\.0+$','')
</if>
<if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
@@ -682,7 +735,18 @@
<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != '')">
and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
</if>
-
+ <if test="deliveryDetail.order!=null and (deliveryDetail.order.otherMoney != null )">
+ and o.other_money regexp REGEXP_REPLACE(#{deliveryDetail.order.otherMoney},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freight != null )">
+ and d.freight regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freight},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightQuantity != null )">
+ and d.freight_quantity regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightQuantity},'\\.0+$','')
+ </if>
+ <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>
@@ -708,12 +772,18 @@
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,
+ d.freight_price,
+ d.freight_quantity,
+ d.freight
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 != ''">
@@ -722,6 +792,12 @@
<if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
</if>
+ <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != ''">
+ and od.product_id like concat('%',#{deliveryDetail.orderDetail.productId},'%')
+ </if>
+ <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != ''">
+ and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
+ </if>
<if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
</if>
@@ -729,13 +805,16 @@
and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
</if>
<if test="deliveryDetail.area != null and deliveryDetail.area != ''">
- and dd.area like concat('%', #{deliveryDetail.area},'%')
+ and dd.area regexp REGEXP_REPLACE(#{deliveryDetail.area},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.price != null and deliveryDetail.price != ''">
+ and dd.price regexp REGEXP_REPLACE(#{deliveryDetail.price},'\\.0+$','')
</if>
<if test="deliveryDetail.money != null and deliveryDetail.money != ''">
- and dd.money like concat('%', #{deliveryDetail.money},'%')
+ and dd.money regexp REGEXP_REPLACE(#{deliveryDetail.money},'\\.0+$','')
</if>
<if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
- and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
+ and dd.quantity regexp REGEXP_REPLACE(#{deliveryDetail.quantity},'\\.0+$','')
</if>
<if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
@@ -785,9 +864,21 @@
<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != '')">
and od.product_name like concat('%', #{deliveryDetail.orderDetail.productId},'%')
</if>
+ <if test="deliveryDetail.order!=null and (deliveryDetail.order.otherMoney != null )">
+ and o.other_money regexp REGEXP_REPLACE(#{deliveryDetail.order.otherMoney},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freight != null )">
+ and d.freight regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freight},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightQuantity != null )">
+ and d.freight_quantity like concat('%', #{deliveryDetail.delivery.freightQuantity},'%')
+ </if>
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightPrice != null )">
+ and d.freight_price regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightPrice},'\\.0+$','')
+ </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>
@@ -800,6 +891,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 != ''">
@@ -808,6 +900,12 @@
<if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
</if>
+ <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != ''">
+ and od.product_id like concat('%',#{deliveryDetail.orderDetail.productId},'%')
+ </if>
+ <if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != ''">
+ and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
+ </if>
<if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
</if>
@@ -815,13 +913,16 @@
and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
</if>
<if test="deliveryDetail.area != null and deliveryDetail.area != ''">
- and dd.area like concat('%', #{deliveryDetail.area},'%')
+ and dd.area regexp REGEXP_REPLACE(#{deliveryDetail.area},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.price != null and deliveryDetail.price != ''">
+ and dd.price regexp REGEXP_REPLACE(#{deliveryDetail.price},'\\.0+$','')
</if>
<if test="deliveryDetail.money != null and deliveryDetail.money != ''">
- and dd.money like concat('%', #{deliveryDetail.money},'%')
+ and dd.money regexp REGEXP_REPLACE(#{deliveryDetail.money},'\\.0+$','')
</if>
<if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
- and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
+ and dd.quantity regexp REGEXP_REPLACE(#{deliveryDetail.quantity},'\\.0+$','')
</if>
<if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
@@ -871,9 +972,21 @@
<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != '')">
and od.product_name like concat('%', #{deliveryDetail.orderDetail.productId},'%')
</if>
+ <if test="deliveryDetail.order!=null and (deliveryDetail.order.otherMoney != null )">
+ and o.other_money regexp REGEXP_REPLACE(#{deliveryDetail.order.otherMoney},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freight != null )">
+ and d.freight regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freight},'\\.0+$','')
+ </if>
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightQuantity != null )">
+ and d.freight_quantity like concat('%', #{deliveryDetail.delivery.freightQuantity},'%')
+ </if>
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightPrice != null )">
+ and d.freight_price regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightPrice},'\\.0+$','')
+ </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" >
@@ -893,13 +1006,9 @@
<select id="getSelectOrderPrinting" >
select od.order_id,od.product_id,p.remarks as product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as gross_amount ,sum(od.quantity) as quantity from
order_detail od left join product p on od.product_id=p.id
-
- <where>
- <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
- and od.order_id like concat('%',#{orderDetail.orderId},'%')
- </if>
- </where>
- group by od.product_name,od.product_id
+ where od.order_id = #{orderId}
+ and od.product_id = #{productId}
+ group by od.product_name,od.product_id ;
</select>
<select id="getSelectDeliveryDetailPrinting" >
@@ -934,7 +1043,7 @@
</select>
<select id="getSelectOrderotherMoney" >
- select bom.alias,oom.price,#{value}*od.quantity as count,oom.price*#{value}*od.quantity as monery
+ select bom.alias,ifnull(oom.price,0) as price,#{value}*od.quantity as count,ifnull(oom.price,0)*#{value}*od.quantity as monery
from order_detail od
left join order_other_money oom on oom.order_id=od.order_id and oom.column=#{key}
left join basic_other_money bom on bom.`column`=oom.`column`
@@ -964,10 +1073,13 @@
select dd.id,
dd.delivery_id,
dd.delivery_number,
+ od.product_id,
+ od.product_name,
d.payment_terms,
d.project,
d.customer_id,
d.customer_name,
+ c.customer_abbreviation,
d.delivery_date,
d.pay_method,
d.pay_date,
@@ -979,12 +1091,20 @@
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,
+ d.freight,
+ d.freight_price,
+ d.freight_quantity
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>
@@ -998,6 +1118,7 @@
d.project,
d.customer_id,
d.customer_name,
+ c.customer_abbreviation,
d.delivery_date,
d.pay_method,
d.pay_date,
@@ -1012,9 +1133,18 @@
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,
+ d.freight,
+ d.freight_price,
+ d.freight_quantity
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,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