From ff8920b4e676bcc82e069f6651740533cc60d0df Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 16 四月 2026 17:24:41 +0800
Subject: [PATCH] 扫码出入库联调

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 79b08cd..ebda2fc 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -66,11 +66,14 @@
         pm.unit,
         p.product_name
         from stock_inventory si
-        left join product_model pm on si.product_model_id = pm.id
+        left join product_model pm on si. = pm.id
         left join product p on pm.product_id = p.id
         where 1 = 1
         <if test="ew.productName != null and ew.productName !=''">
             and p.product_name like concat('%',#{ew.productName},'%')
+        </if>
+        <if test="ew.productModelId != null">
+            and si.product_model_id = #{ew.productModelId}
         </if>
     </select>
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -91,15 +94,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}
@@ -197,14 +202,16 @@
     </select>
 
     <select id="selectStorageProductCountByDate" resultType="int">
-        SELECT COUNT(*)
-        FROM (SELECT create_time
+        SELECT SUM(total_count)
+        FROM (SELECT COUNT(*) as total_count
               FROM stock_inventory
+              WHERE create_time &gt;= #{startDate}
+                AND create_time &lt;= #{endDate}
               UNION ALL
-              SELECT create_time
-              FROM stock_uninventory) combined
-        WHERE create_time &gt;= #{startDate}
-          AND create_time &lt;= #{endDate}
+              SELECT COUNT(*) as total_count
+              FROM stock_uninventory
+              WHERE create_time &gt;= #{startDate}
+                AND create_time &lt;= #{endDate}) AS combined_counts
     </select>
 
     <select id="selectDailyStockInCounts" resultType="java.util.Map">

--
Gitblit v1.9.3