From b97e00dae4fa017c8273e41fb0f24cf7c7c69a33 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 25 十一月 2024 13:28:35 +0800
Subject: [PATCH] 工程打印标签调整
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 62 ++++++++++++++----------------
1 files changed, 29 insertions(+), 33 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 2b2d990..678fe83 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -151,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>
@@ -170,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,
@@ -183,6 +187,7 @@
od.height,
od.shape,
fgi.actual_signal_area,
+ od.area,
od.gross_area,
od.compute_area,
od.compute_gross_area,
@@ -372,6 +377,7 @@
od.height,
od.shape,
fgi.actual_signal_area,
+ od.area,
od.gross_area,
od.compute_area,
od.compute_gross_area,
@@ -786,12 +792,6 @@
<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>
@@ -853,10 +853,10 @@
and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
</if>
<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != '')">
- and od.product_id like concat('%', #{deliveryDetail.orderDetail.productName},'%')
+ and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
</if>
<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != '')">
- and od.product_name like concat('%', #{deliveryDetail.orderDetail.productId},'%')
+ and od.product_id 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+$','')
@@ -894,12 +894,6 @@
<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>
@@ -961,10 +955,10 @@
and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
</if>
<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != '')">
- and od.product_id like concat('%', #{deliveryDetail.orderDetail.productName},'%')
+ and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
</if>
<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != '')">
- and od.product_name like concat('%', #{deliveryDetail.orderDetail.productId},'%')
+ and od.product_id 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+$','')
@@ -984,7 +978,7 @@
</select>
<select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
- select dd.delivery_id,od.order_id,od.product_id,pt.remarks as product_name,sum(dd.area) as area,sum(dd.money) as money,sum(dd.quantity) as quantity from
+ select dd.delivery_id,od.order_id,od.product_id,od.product_name,sum(dd.area) as area,sum(dd.money) as money,sum(dd.quantity) as quantity 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
@@ -998,21 +992,17 @@
</select>
<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
+ select od.order_id,od.product_id,od.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" >
select od.order_id,
od.order_number,
- p.remarks as product_name,
+ od.product_name,
od.width,
od.height,
dd.quantity,
@@ -1041,7 +1031,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`
@@ -1094,7 +1084,10 @@
dd.quantity,
dd.delivery_detail_remakes,
dd.create_time,
- o.other_money
+ 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
@@ -1130,7 +1123,10 @@
dd.delivery_detail_remakes,
dd.price,
dd.create_time,
- o.other_money
+ 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
--
Gitblit v1.8.0