From b28173836631e9ecb1aafbaa5786c0383462208e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 12 三月 2026 15:09:57 +0800
Subject: [PATCH] 1.生产成品添加审核流程，半成品不审核
---
src/main/resources/mapper/stock/StockInRecordMapper.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index 0eee4f3..11a01a0 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -5,7 +5,37 @@
<select id="listPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
SELECT
sir.*,
- p.product_name as productName,
+ p.product_name AS product_name,
+ pm.model,
+ pm.unit,
+ u.nick_name AS createBy
+ FROM
+ stock_in_record AS sir
+ LEFT JOIN product_model AS pm ON sir.product_model_id = pm.id
+ LEFT JOIN product AS p ON pm.product_id = p.id
+ LEFT JOIN product p2 ON p.parent_id = p2.id AND p2.product_name != '鍗婃垚鍝�'
+ LEFT JOIN sys_user AS u ON sir.create_user = u.user_id
+ <where>
+ <if test="params.timeStr != null and params.timeStr != ''">
+ AND sir.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 sir.type = #{params.type}
+ </if>
+ <if test="params.recordType != null and params.recordType != ''">
+ AND sir.record_type = #{params.recordType}
+ </if>
+ </where>
+ ORDER BY
+ sir.id DESC
+ </select>
+ <select id="listStockInRecordExportData" resultType="com.ruoyi.stock.execl.StockInRecordExportData">
+ SELECT
+ sir.*,
+ p.product_name as product_name,
pm.model,
pm.unit,
u.nick_name as createBy
@@ -29,4 +59,27 @@
</where>
order by sir.id desc
</select>
+ <select id="selectByRecord" resultType="com.ruoyi.stock.dto.StockInRecordDto">
+ SELECT
+ po.nps_no,
+ pwo.work_order_no,
+ sir.*,
+ p.product_name AS product_name,
+ pm.model,
+ pm.unit,
+ u.nick_name AS createBy
+ FROM
+ stock_in_record AS sir
+ LEFT JOIN product_model AS pm ON sir.product_model_id = pm.id
+ LEFT JOIN product AS p ON pm.product_id = p.id
+ LEFT JOIN sys_user AS u ON sir.create_user = u.user_id
+ LEFT JOIN quality_inspect qi ON qi.id = sir.record_id
+ LEFT JOIN production_product_main ppm ON ppm.id = qi.product_main_id
+ LEFT JOIN product_work_order pwo ON pwo.id = ppm.work_order_id
+ LEFT JOIN product_order po ON po.id = pwo.product_order_id
+ WHERE
+ sir.id = #{id}
+ ORDER BY
+ sir.id DESC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3