From 1a04230a60c65e2a7e8d1b392bc6408b2e77aa61 Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期六, 22 二月 2025 13:53:17 +0800
Subject: [PATCH] 配置文件修改

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml |   10 ++++------
 1 files changed, 4 insertions(+), 6 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..6e4192a 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -974,16 +974,14 @@
     </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 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
 
 
-        <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