From 1b912a25864dfbe6968740738afe7c042919724a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 02 二月 2026 15:53:21 +0800
Subject: [PATCH] 生产报工的报废未进入库存记录页面中+不合格处理后不能删除

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 79b08cd..7fe1f4f 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -91,15 +91,17 @@
         </if>
     </select>
     <select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
-        select sir.*,si.qualitity,
+        select sir.*,si.qualitity as current_stock,
         pm.model,
         pm.unit,
-        p.product_name
+        p.product_name,
+        su.nick_name as create_by
         from
         stock_in_record sir
         left join stock_inventory si on sir.product_model_id = si.product_model_id
         left join product_model pm on sir.product_model_id = pm.id
         left join product p on pm.product_id = p.id
+        left join sys_user su on sir.create_user = su.user_id
         <where>
             <if test="ew.reportDate != null">
                 and sir.create_time >= #{ew.reportDate}

--
Gitblit v1.9.3