From 99c61e2e4c5aabe594ff8a463a45f3a6b5cb9add Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 17:55:58 +0800
Subject: [PATCH] feat: 调整
---
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 84 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 83 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 182665c..4b0233d 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -15,7 +15,89 @@
<result column="update_time" property="updateTime" />
<result column="create_user" property="createUser" />
<result column="update_user" property="updateUser" />
- <result column="tenant_id" property="tenantId" />
</resultMap>
+ <select id="listPage" resultType="com.ruoyi.stock.dto.StockOutRecordDto">
+ SELECT
+ sor.*,
+ p.product_name as productName,
+ pm.model,
+ pm.unit,
+ u.nick_name as createBy,
+ CASE sor.record_type
+ WHEN '3' THEN ppm.product_no
+ WHEN '8' THEN sl.sales_contract_no
+ WHEN '9' THEN pr.no
+ WHEN '13' THEN CONCAT(si.shipping_no, IF(sl2.sales_contract_no IS NOT NULL AND sl2.sales_contract_no != '', CONCAT(' / ', sl2.sales_contract_no), ''))
+ WHEN '1' THEN sor.remark
+ WHEN '10' THEN sor.remark
+ ELSE NULL
+ END as sourceNo
+ 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
+ LEFT JOIN production_product_main as ppm on sor.record_type = '3' and sor.record_id = ppm.id
+ LEFT JOIN sales_ledger as sl on sor.record_type = '8' and sor.record_id = sl.id
+ LEFT JOIN purchase_return_orders as pr on sor.record_type = '9' and sor.record_id = pr.id
+ LEFT JOIN shipping_info as si on sor.record_type = '13' and sor.record_id = si.id
+ LEFT JOIN sales_ledger as sl2 on sor.record_type = '13' and si.sales_ledger_id = sl2.id
+ <where>
+ <if test="params.timeStr != null and params.timeStr != ''">
+ and sor.create_time like concat('%',#{params.timeStr},'%')
+ </if>
+ <if test="params.productName != null and params.productName != ''">
+ and p.product_name like concat('%',#{params.productName},'%')
+ </if>
+ <if test="params.type != null and params.type != ''">
+ and sor.type = #{params.type}
+ </if>
+ <if test="params.recordType != null and params.recordType != ''">
+ and sor.record_type = #{params.recordType}
+ </if>
+ </where>
+ order by sor.id desc
+ </select>
+ <select id="listStockOutRecordExportData" resultType="com.ruoyi.stock.execl.StockOutRecordExportData">
+ SELECT
+ sor.*,
+ p.product_name as productName,
+ pm.model,
+ pm.unit,
+ u.nick_name as createBy,
+ CASE sor.record_type
+ WHEN '3' THEN ppm.product_no
+ WHEN '8' THEN sl.sales_contract_no
+ WHEN '9' THEN pr.no
+ WHEN '13' THEN CONCAT(si.shipping_no, IF(sl2.sales_contract_no IS NOT NULL AND sl2.sales_contract_no != '', CONCAT(' / ', sl2.sales_contract_no), ''))
+ WHEN '1' THEN sor.remark
+ WHEN '10' THEN sor.remark
+ ELSE NULL
+ END as sourceNo
+ 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
+ LEFT JOIN production_product_main as ppm on sor.record_type = '3' and sor.record_id = ppm.id
+ LEFT JOIN sales_ledger as sl on sor.record_type = '8' and sor.record_id = sl.id
+ LEFT JOIN purchase_return_orders as pr on sor.record_type = '9' and sor.record_id = pr.id
+ LEFT JOIN shipping_info as si on sor.record_type = '13' and sor.record_id = si.id
+ LEFT JOIN sales_ledger as sl2 on sor.record_type = '13' and si.sales_ledger_id = sl2.id
+ <where>
+ <if test="params.timeStr != null and params.timeStr != ''">
+ and sor.create_time like concat('%',#{params.timeStr},'%')
+ </if>
+ <if test="params.productName != null and params.productName != ''">
+ and p.product_name like concat('%',#{params.productName},'%')
+ </if>
+ <if test="params.type != null and params.type != ''">
+ and sor.type = #{params.type}
+ </if>
+ <if test="params.recordType != null and params.recordType != ''">
+ and sor.record_type = #{params.recordType}
+ </if>
+ </where>
+ order by sor.id desc
+ </select>
+
</mapper>
--
Gitblit v1.9.3