From 9468068e746f25fc2d4bd618b9a07166f269e32a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 五月 2026 17:32:18 +0800
Subject: [PATCH] feat(stock): 不合格库存批次号自动生成及使用
---
src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml b/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
index 355151a..a41c8c1 100644
--- a/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
+++ b/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
@@ -15,12 +15,12 @@
<result column="create_user_id" property="createUserId" />
<result column="update_user_id" property="updateUserId" />
</resultMap>
- <select id="pageSalesRefundAmountOrderDto" resultType="com.ruoyi.account.dto.SalesRefundAmountOrderDto">
+ <select id="pageSalesRefundAmountOrderDto" resultType="com.ruoyi.account.bean.dto.SalesRefundAmountOrderDto">
select sl.sales_contract_no,
sl.customer_contract_no,
- slp.specification_model,
- slp.product_category as product_name,
- slp.unit,
+ pm.model as specification_model,
+ p.product_name ,
+ pm.unit,
sl.customer_name,
rm.return_no as return_management_no,
srao.*
@@ -28,6 +28,8 @@
left join return_management rm on srao.return_management_id = rm.id
left join return_sale_product rs on rm.id = rs.return_management_id
left join sales_ledger_product slp on rs.return_sales_ledger_product_id = slp.id
+ left join product_model pm on slp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
left join sales_ledger sl on slp.sales_ledger_id = sl.id
<where>
<if test="ew.salesContractNo != null and ew.salesContractNo !=''">
--
Gitblit v1.9.3