From 3e5e22f5358156ff7430ee117546123ffe042611 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 20 九月 2026 20:23:52 +0800
Subject: [PATCH] feat(stock): 实现出品出库绑定销售台账功能
---
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 3808606..784790c 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -34,11 +34,14 @@
p.product_name as productName,
pm.model,
pm.unit,
- u.nick_name as createBy
+ u.nick_name as createBy,
+ sl.sales_contract_no as salesContractNo
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
LEFT JOIN product as p on pm.product_id = p.id
LEFT JOIN sys_user as u on sor.create_user = u.user_id
+ <!-- 缁戝畾浜嗛攢鍞彴璐︾殑鍑哄簱甯﹀嚭鍚堝悓鍙凤紱sales_ledger_id 鏈韩宸查殢 sor.* 杩斿洖 -->
+ LEFT JOIN sales_ledger as sl on sl.id = sor.sales_ledger_id
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{params.timeStr},'%')
@@ -76,6 +79,39 @@
</foreach>
</select>
+ <!-- 娌瑰搧鍑哄簱鍙粦瀹氱殑閿�鍞彴璐︿笅鎷夈��
+ sales_ledger 涓嶅湪鏁版嵁鏉冮檺鐧藉悕鍗曢噷锛屾寜 create_user/dept_id 杩囨护浼氳娌瑰簱/鍙戣揣瑙掕壊閫変笉鍒伴攢鍞缓鐨勫彴璐︼紝
+ 鎵�浠ュ姞 /*data_scope*/ 璺宠繃鏁版嵁鏉冮檺锛涘彧璇绘煡璇紝涓嶆寜 ledger_type 杩囨护锛堜唬鍌ㄥ彴璐︿篃瑕佽兘缁戯級 -->
+ <select id="bindableSalesLedgerPage" resultType="com.ruoyi.sales.pojo.SalesLedger">
+ select /*data_scope*/ id,
+ sales_contract_no,
+ customer_contract_no,
+ project_name,
+ entry_date,
+ salesman,
+ customer_id,
+ customer_name,
+ ledger_type,
+ oil_depot_id,
+ oil_depot_name,
+ tank_id,
+ tank_no,
+ approval_status,
+ contract_amount
+ from sales_ledger
+ where 1=1
+ <if test="req.salesContractNo != null and req.salesContractNo != ''">
+ and sales_contract_no like concat('%',#{req.salesContractNo},'%')
+ </if>
+ <if test="req.customerName != null and req.customerName != ''">
+ and customer_name like concat('%',#{req.customerName},'%')
+ </if>
+ <if test="req.projectName != null and req.projectName != ''">
+ and project_name like concat('%',#{req.projectName},'%')
+ </if>
+ order by id desc
+ </select>
+
<select id="listStockOutRecordExportData" resultType="com.ruoyi.stock.execl.StockOutRecordExportData">
SELECT
sor.*,
--
Gitblit v1.9.3