From 59d34cb3d22f4f99805f78997b7229a46bec4fe5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 28 七月 2025 17:05:52 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 213 insertions(+), 11 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 eabbdab..52c1051 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -53,6 +53,7 @@
<result column="quantity_available" property="finishedGoodsInventory.quantityAvailable"/>
<result column="storage_region" property="finishedGoodsInventory.storageRegion"/>
<result column="actual_signal_area" property="finishedGoodsInventory.actualSignalArea"/>
+ <result column="box_no" property="finishedGoodsInventory.boxNo"/>
</resultMap>
@@ -105,6 +106,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"/>
@@ -113,6 +115,10 @@
<result column="product_id" property="orderDetail.productId"/>
<result column="product_name" property="orderDetail.productName"/>
<result column="order_id" property="orderDetail.orderId"/>
+ <result column="width" property="orderDetail.edgingType"/>
+ <result column="height" property="orderDetail.shape"/>
+
+ <result column="contract_id" property="order.contractId"/>
@@ -158,11 +164,11 @@
<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,other_money)
+ area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price,other_money,box_no)
values (
#{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{deliveryDetailArea},
#{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
- #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price},#{otherMoneys}
+ #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price},#{otherMoneys},#{orderDetail.finishedGoodsInventory.boxNo}
)
</insert>
@@ -187,10 +193,11 @@
od.height,
od.shape,
fgi.actual_signal_area,
+ dd.box_no,
od.area,
- od.gross_area,
+ dd.area as gross_area,
od.compute_area,
- od.compute_gross_area,
+ dd.area as compute_gross_area,
od.processing_note,
od.edging_type,
od.perimeter,
@@ -234,6 +241,9 @@
</if>
<if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
+ </if>
+ <if test="orderDetail.deliveryDetail.boxNo != null and orderDetail.deliveryDetail.boxNo != ''">
+ and dd.box_no regexp #{orderDetail.deliveryDetail.boxNo}
</if>
<if test="orderDetail.deliveryDetail.money != null and orderDetail.deliveryDetail.money != ''">
and dd.money regexp REGEXP_REPLACE(#{orderDetail.deliveryDetail.money},'\\.0+$','')
@@ -318,6 +328,9 @@
<if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
</if>
+ <if test="orderDetail.deliveryDetail.boxNo != null and orderDetail.deliveryDetail.boxNo != ''">
+ and dd.box_no regexp #{orderDetail.deliveryDetail.boxNo}
+ </if>
<if test="orderDetail.deliveryDetail.money != null and orderDetail.deliveryDetail.money != ''">
and dd.money regexp REGEXP_REPLACE(#{orderDetail.deliveryDetail.money},'\\.0+$','')
</if>
@@ -375,6 +388,7 @@
od.height,
od.shape,
fgi.actual_signal_area,
+ fgi.box_no,
od.area,
od.gross_area,
od.compute_area,
@@ -418,6 +432,9 @@
</if>
<if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.boxNo != null and orderDetail.finishedGoodsInventory.boxNo != ''">
+ and fgi.box_no regexp #{orderDetail.finishedGoodsInventory.boxNo}
</if>
<if test="orderDetail.width != null and orderDetail.width != ''">
and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
@@ -490,6 +507,9 @@
</if>
<if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.boxNo != null and orderDetail.finishedGoodsInventory.boxNo != ''">
+ and fgi.box_no regexp #{orderDetail.finishedGoodsInventory.boxNo}
</if>
<if test="orderDetail.width != null and orderDetail.width != ''">
and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
@@ -974,17 +994,191 @@
</select>
<select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
- 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
+ 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
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
- <where>
- <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
- and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
- </if>
- </where>
+ where dd.delivery_id like concat('%',#{deliveryId},'%')
+
group by od.order_id,od.product_name,od.product_id
+ </select>
+
+ <select id="getSelectDeliveryPrintingMoney" resultMap="selectDeliveryDetailOrderDetail" >
+ select dd.delivery_id,
+ od.order_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,
+ od.width,
+ od.height
+ from delivery_detail dd
+ left join (select product_name,
+ order_id,
+ product_id,
+ order_number,
+ CASE
+ WHEN height < 4000 AND height >= 3660 and height>width THEN
+ '3660<H<4000'
+ WHEN height < 5000 AND height >= 4000 and height>width THEN
+ '4000<H<5000'
+ WHEN height < 6000 AND height >= 5000 and height>width THEN
+ '5000<H<6000'
+ WHEN height < 7000 AND height >= 6000 and height>width THEN
+ '6000<H<7000'
+ WHEN height < 8000 AND height >= 7000 and height>width THEN
+ '7000<H<8000'
+ WHEN height < 9000 AND height >= 8000 and height>width THEN
+ '8000<H<9000'
+ WHEN height < 10000 AND height >= 9000 and height>width THEN
+ '9000<H<10000'
+ WHEN height < 11000 AND height >= 10000 and height>width THEN
+ '10000<H<11000'
+ WHEN height < 12000 AND height >= 11000 and height>width THEN
+ '11000<H<12000'
+ ELSE
+ ''
+ END height,
+ CASE
+
+ WHEN width < 4000 AND width >= 3660 and width>height THEN
+ '3660<H<4000'
+ WHEN width < 5000 AND width >= 4000 and width>height THEN
+ '4000<H<5000'
+ WHEN width < 6000 AND width >= 5000 and width>height THEN
+ '5000<H<6000'
+ WHEN width < 7000 AND width >= 6000 and width>height THEN
+ '6000<H<7000'
+ WHEN width < 8000 AND width >= 7000 and width>height THEN
+ '7000<H<8000'
+ WHEN width < 9000 AND width >= 8000 and width>height THEN
+ '8000<H<9000'
+ WHEN width < 10000 AND width >= 9000 and width>height THEN
+ '9000<H<10000'
+ WHEN width < 11000 AND width >= 10000 and width>height THEN
+ '10000<H<11000'
+ WHEN width < 12000 AND width >= 11000 and width>height THEN
+ '11000<H<12000'
+ ELSE
+ ''
+ END width
+ from order_detail) as 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
+
+
+ where dd.delivery_id like concat('%', #{deliveryId}, '%')
+
+ group by od.order_id, od.product_name,od.width,od.height, dd.price
+ </select>
+
+ <select id="getSelectDeliveryPrintingNoMoney" resultMap="selectDeliveryDetailOrderDetail" >
+ select dd.delivery_id,
+ od.order_id,
+ IF(#{type} = 'product_abbreviation', pt.remarks, od.product_name) as product_name,
+ sum(dd.area) as area,
+ sum(dd.quantity) as quantity,
+ o.contract_id,
+ od.width,
+ od.height
+ from delivery_detail dd
+ left join (select product_name,
+ order_id,
+ product_id,
+ order_number,
+ CASE
+ WHEN height < 4000 AND height >= 3660 and height>width THEN
+ '3660<H<4000'
+ WHEN height < 5000 AND height >= 4000 and height>width THEN
+ '4000<H<5000'
+ WHEN height < 6000 AND height >= 5000 and height>width THEN
+ '5000<H<6000'
+ WHEN height < 7000 AND height >= 6000 and height>width THEN
+ '6000<H<7000'
+ WHEN height < 8000 AND height >= 7000 and height>width THEN
+ '7000<H<8000'
+ WHEN height < 9000 AND height >= 8000 and height>width THEN
+ '8000<H<9000'
+ WHEN height < 10000 AND height >= 9000 and height>width THEN
+ '9000<H<10000'
+ WHEN height < 11000 AND height >= 10000 and height>width THEN
+ '10000<H<11000'
+ WHEN height < 12000 AND height >= 11000 and height>width THEN
+ '11000<H<12000'
+ ELSE
+ ''
+ END height,
+ CASE
+
+ WHEN width < 4000 AND width >= 3660 and width>height THEN
+ '3660<H<4000'
+ WHEN width < 5000 AND width >= 4000 and width>height THEN
+ '4000<H<5000'
+ WHEN width < 6000 AND width >= 5000 and width>height THEN
+ '5000<H<6000'
+ WHEN width < 7000 AND width >= 6000 and width>height THEN
+ '6000<H<7000'
+ WHEN width < 8000 AND width >= 7000 and width>height THEN
+ '7000<H<8000'
+ WHEN width < 9000 AND width >= 8000 and width>height THEN
+ '8000<H<9000'
+ WHEN width < 10000 AND width >= 9000 and width>height THEN
+ '9000<H<10000'
+ WHEN width < 11000 AND width >= 10000 and width>height THEN
+ '10000<H<11000'
+ WHEN width < 12000 AND width >= 11000 and width>height THEN
+ '11000<H<12000'
+ ELSE
+ ''
+ END width
+ from order_detail) as 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
+
+
+ where dd.delivery_id like concat('%', #{deliveryId}, '%')
+
+ group by od.order_id, od.product_name, width, height
+ </select>
+
+
+ <select id="getSelectDeliveryPrintingMoneySpecifications" >
+ select od.order_id,
+ od.width,
+ od.height,
+ od.product_name,
+ sum(dd.area) as area,
+ sum(dd.money) as money,
+ sum(dd.quantity) as quantity,
+ dd.price
+ 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 p on od.product_id = p.id
+ where delivery_id = #{deliveryId}
+ and od.order_id = #{orderId}
+ and od.product_id = #{productId}
+ group by od.width,od.height, dd.price
+ </select>
+
+ <select id="getSelectDeliveryPrintingNoMoneySpecifications" >
+ select od.order_id,
+ od.width,
+ od.height,
+ od.product_name,
+ sum(dd.area) as area,
+ 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 p on od.product_id = p.id
+ where delivery_id = #{deliveryId}
+ and od.order_id = #{orderId}
+ and od.product_id = #{productId}
+ group by od.width,od.height
</select>
<select id="getSelectOrderPrinting" >
@@ -1028,13 +1222,21 @@
</select>
<select id="getSelectOrderotherMoney" >
- select bom.alias,ifnull(oom.price,0) as price,#{value}*od.quantity as count,ifnull(oom.price,0)*#{value}*od.quantity as monery
+ select bom.alias,ifnull(oom.price,0) as price,#{value}*#{quantity} as count,ifnull(oom.price,0)*#{value}*#{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`
where od.order_id = #{orderId} and od.order_number=#{orderNumber} and (od.other_columns!='{}' or od.other_columns!=null)
</select>
+ <select id="getSelectOrderotherMoneys" >
+ 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`
+ where od.order_id = #{orderId} and od.order_number=#{orderNumber} and (od.other_columns!='{}' or od.other_columns!=null)
+ </select>
+
<select id="getSelectOrderDetailPrinting" >
select od.order_id,
od.order_number,
--
Gitblit v1.8.0