From dec442000bc7c51516954c6618a4bc94bf729ffd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 09 十月 2025 16:15:20 +0800
Subject: [PATCH] 工序待完成汇总报表修改、发货明细报表添加字段
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 b3ea803..ab21c0e 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -73,7 +73,9 @@
<result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
<result column="delivery_detail_state" property="deliveryDetailState"/>
<result column="create_time" property="createTime"/>
-
+ <result column="batch" property="batch"/>
+ <result column="width" property="width"/>
+ <result column="height" property="height"/>
<result column="customer_id" property="delivery.customerId"/>
<result column="customer_name" property="delivery.customerName"/>
<result column="project" property="delivery.project"/>
@@ -587,13 +589,25 @@
o.other_money,
d.freight_price,
d.freight_quantity,
- d.freight
+ d.freight,
+ o.batch,
+ od.width,
+ od.height
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.batch != null and deliveryDetail.batch != ''">
+ and o.batch like concat('%',#{deliveryDetail.batch},'%')
+ </if>
+ <if test="deliveryDetail.width != null and deliveryDetail.width != ''">
+ and od.width like concat('%',#{deliveryDetail.width},'%')
+ </if>
+ <if test="deliveryDetail.height != null and deliveryDetail.height != ''">
+ and od.height like concat('%',#{deliveryDetail.height},'%')
+ </if>
<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
</if>
--
Gitblit v1.8.0