From 28d6f88c4122d6276c8e9dd6a817c4b3675551aa Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 26 五月 2026 09:24:09 +0800
Subject: [PATCH] feat:1.销售采购合同按照录入日期生成 2.采购合同号按照录入日期生成

---
 src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml b/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
index 05617b1..a41c8c1 100644
--- a/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
+++ b/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
@@ -18,9 +18,9 @@
     <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