From e00b54ec7322cf7cba5883e17f2e2843f71b8833 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 十一月 2025 17:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 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 e88ee48..8da1dbe 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -124,6 +124,7 @@
<result column="height" property="orderDetail.shape"/>
<result column="contract_id" property="order.contractId"/>
+ <result column="batch" property="order.batch"/>
@@ -1049,7 +1050,7 @@
<select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
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
+ sum(dd.money) as money,sum(dd.quantity) as quantity,o.contract_id,o.batch 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
--
Gitblit v1.8.0