From 441dfbd1908affc1accc52006a2fe81a5067052d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 22 六月 2026 09:28:09 +0800
Subject: [PATCH] 废品库存的批号如果有多个，则需要展示多个
---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index fdd7306..511dcd3 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -67,11 +67,13 @@
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
</select>
<select id="getReturnManagementDtoById" resultType="com.ruoyi.procurementrecord.bean.vo.ShippingProductVo">
- SELECT
+ SELECT distinct
sor.id,
slp.product_category,
slp.specification_model,
slp.unit,
+ slp.product_model_id,
+ COALESCE(spd.stock_type, slp.stock_type, 'qualified') AS stock_type,
sor.outbound_batches,
sor.stock_out_num,
sor.batch_no,
@@ -97,6 +99,7 @@
si.id = #{shippingId}
</if>
</where>
+ order by sor.id
</select>
<select id="getShippingInfoByCustomerName" resultType="com.ruoyi.sales.pojo.ShippingInfo">
select * from shipping_info si
--
Gitblit v1.9.3