From 6d6ac6f6bbe92712f4872dcf6287eea5619d6737 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 27 三月 2025 09:08:23 +0800
Subject: [PATCH] 添加 显示订单超时状态问题
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 15 ++++++++-------
1 files changed, 8 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 eabbdab..2c72047 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"/>
+
@@ -190,7 +192,7 @@
od.area,
od.gross_area,
od.compute_area,
- od.compute_gross_area,
+ dd.area as compute_gross_area,
od.processing_note,
od.edging_type,
od.perimeter,
@@ -974,16 +976,15 @@
</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,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>
--
Gitblit v1.8.0