From dcc8bb8f47544cbad6e6440640dcdaa946086013 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 17:31:54 +0800
Subject: [PATCH] feat(staff): 员工模块新增民族出生日期入职日期字段

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |   40 +++++++++++++++++++++++++++++++++-------
 1 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 97dc81d..86661d6 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -12,6 +12,8 @@
         <result column="version" property="version"/>
         <result column="locked_quantity" property="lockedQuantity"/>
         <result column="warn_num" property="warnNum"/>
+        <result column="remark" property="remark"/>
+        <result column="stock_location" property="stockLocation"/>
     </resultMap>
     <update id="updateAddStockInventory">
         update stock_inventory
@@ -34,6 +36,7 @@
             update_time = now()
         </set>
         where product_model_id = #{ew.productModelId}
+          and stock_location = #{ew.stockLocation}
     </update>
     <update id="updateSubtractStockInventory">
         update stock_inventory
@@ -49,7 +52,9 @@
             </if>
             update_time = now()
         </set>
-        where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
+        where product_model_id = #{ew.productModelId}
+          and stock_location = #{ew.stockLocation}
+          and qualitity >= #{ew.qualitity}
     </update>
     <select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
         select si.id,
@@ -63,14 +68,24 @@
         (si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
         pm.model,
         si.remark,
+        si.stock_location,
         pm.unit,
         p.product_name
         from stock_inventory si
         left join product_model pm on si.product_model_id = pm.id
         left join product p on pm.product_id = p.id
-        where 1 = 1
+        where pm.product_type = #{ew.productType}
         <if test="ew.productName != null and ew.productName !=''">
             and p.product_name like concat('%',#{ew.productName},'%')
+        </if>
+        <if test="ew.productModelId != null">
+            and pm.id = #{ew.productModelId}
+        </if>
+        <if test="ew.stockLocation != null and ew.stockLocation != ''">
+            and si.stock_location = #{ew.stockLocation}
+        </if>
+        <if test="ew.model != null and ew.model !=''">
+            and pm.model like concat('%',#{ew.model},'%')
         </if>
     </select>
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -81,6 +96,7 @@
         coalesce(si.warn_num, 0) as warn_num,
         coalesce(si.locked_quantity, 0) as locked_quantity,
         si.remark,
+        si.stock_location,
         si.update_time
         from stock_inventory si
         left join product_model pm on si.product_model_id = pm.id
@@ -89,17 +105,23 @@
         <if test="ew.productName != null and ew.productName !=''">
             and p.product_name like concat('%',#{ew.productName},'%')
         </if>
+        <if test="ew.stockLocation != null and ew.stockLocation != ''">
+            and si.stock_location = #{ew.stockLocation}
+        </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
+        and sir.stock_location = si.stock_location
         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}
@@ -110,6 +132,9 @@
             </if>
             <if test="ew.endMonth != null">
                 and sir.create_time &lt;= #{ew.endMonth}
+            </if>
+            <if test="ew.stockLocation != null and ew.stockLocation != ''">
+                and sir.stock_location = #{ew.stockLocation}
             </if>
         </where>
     </select>
@@ -188,11 +213,12 @@
         select ifnull(sum(qualitity), 0)
         from stock_inventory
     </select>
+
     <select id="selectTotalByDate" resultType="java.math.BigDecimal">
-        select sum(qualitity)
+        select IFNULL(sum(qualitity), 0)
         from stock_inventory
-        where
-           create_time &gt;= #{now} and create_time &lt; DATE_ADD(#{now}, INTERVAL 1 DAY)
+        where create_time &gt;= #{now}
+          and create_time &lt; DATE_ADD(#{now}, INTERVAL 1 DAY)
     </select>
 
     <select id="selectStorageProductCountByDate" resultType="int">

--
Gitblit v1.9.3