From 3c55debea2b60faf89acdf89074ffd135dc44d7e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 四月 2025 17:37:19 +0800
Subject: [PATCH] 提交筛选日期调整
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 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 f89f3e6..1a28bca 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -114,6 +114,8 @@
<result column="product_name" property="orderDetail.productName"/>
<result column="order_id" property="orderDetail.orderId"/>
+ <result column="contract_id" property="order.contractId"/>
+
@@ -188,9 +190,9 @@
od.shape,
fgi.actual_signal_area,
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,
@@ -274,7 +276,6 @@
</where>
order by dd.id
- limit #{offset},#{pageSize};
</select>
<select id="getSelectShippingOrderDetailPageTotal">
@@ -356,7 +357,6 @@
and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
<select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
@@ -452,7 +452,6 @@
and od.perimeter regexp #{orderDetail.perimeter}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
<select id="getSelectShippingOrderDetailsPageTotal">
@@ -525,7 +524,6 @@
and od.perimeter regexp #{orderDetail.perimeter}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
@@ -978,21 +976,20 @@
</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,IF(#{type}='product_abbreviation',pt.remarks,od.product_name) as product_name,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="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 od.order_id = #{orderId}
and od.product_id = #{productId}
@@ -1002,7 +999,7 @@
<select id="getSelectDeliveryDetailPrinting" >
select od.order_id,
od.order_number,
- p.remarks as product_name,
+ od.product_name,
od.width,
od.height,
dd.quantity,
@@ -1011,7 +1008,8 @@
ifnull(od.processing_note,"") as processingNote,
ifnull(od.building_number,"") as buildingNumber,
dd.price,
- od.other_columns
+ od.other_columns,
+ od.remarks
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
@@ -1031,8 +1029,16 @@
</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)
@@ -1047,10 +1053,12 @@
od.quantity,
od.gross_amount,
od.compute_gross_area,
+ od.area,
ifnull(od.processing_note,"") as processingNote,
ifnull(od.building_number,"") as buildingNumber,
od.price,
- od.other_columns
+ od.other_columns,
+ od.remarks
from order_detail od
where od.order_id = #{orderId}
and od.product_id = #{productId}
--
Gitblit v1.8.0