From 4e45da16b0a307dd56a85936c7319e559f27de92 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 13:52:37 +0800
Subject: [PATCH] feat(stock): 实现质检库存管理和报废流程

---
 src/main/resources/mapper/stock/StockInRecordMapper.xml |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index 8064b7b..0eee4f3 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -7,13 +7,24 @@
         sir.*,
         p.product_name as productName,
         pm.model,
-        pm.unit
+        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
         <where>
             <if test="params.timeStr != null and params.timeStr != ''">
-                and sir.create_time like concat('%',#{param.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

--
Gitblit v1.9.3