From 2a8a4cf20e55bbef3a9f8959136ee828b058dac0 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 14 十月 2026 15:47:20 +0800
Subject: [PATCH] Merge commit 'e0296ea7' into dev_pro_河南鹤壁_首检
---
src/main/resources/mapper/sales/ShippingProductDetailMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml b/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
index 15a6168..daae569 100644
--- a/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
@@ -11,20 +11,25 @@
<result column="shipping_info_id" property="shippingInfoId" />
</resultMap>
<select id="getDetail" resultType="com.ruoyi.sales.dto.ShippingProductDetailDto">
- select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity
+ select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity,
+ slp.packaging_spec
from shipping_product_detail spd
left join stock_inventory si on si.id = spd.stock_inventory_id
left join product_model pm on pm.id = si.product_model_id
left join product p on p.id = pm.product_id
+ left join shipping_info sh on sh.id = spd.shipping_info_id
+ left join sales_ledger_product slp on slp.id = sh.sales_ledger_product_id and slp.type = 1
where spd.shipping_info_id = #{id}
</select>
<select id="getDateilByShippingNo" resultType="com.ruoyi.sales.dto.ShippingProductDetailDto">
- select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity
+ select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity,
+ slp.packaging_spec
from shipping_product_detail spd
left join shipping_info sp on sp.id = spd.shipping_info_id
left join stock_inventory si on si.id = spd.stock_inventory_id
left join product_model pm on pm.id = si.product_model_id
left join product p on p.id = pm.product_id
+ left join sales_ledger_product slp on slp.id = sp.sales_ledger_product_id and slp.type = 1
where sp.shipping_no = #{shippingNo}
</select>
--
Gitblit v1.9.3