From 2652673d45d9f142baed0d92f1deab38276dbd90 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 03 三月 2026 10:07:15 +0800
Subject: [PATCH] 库存区分原材料和成品和半成品

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |   80 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 0c47ede..6727a36 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -19,9 +19,13 @@
             <if test="ew.qualitity != null">
                 qualitity = qualitity + #{ew.qualitity},
             </if>
+            <if test="ew.netWeight != null">
+                net_weight = net_weight + #{ew.netWeight},
+            </if>
             <if test="ew.version != null">
                 version = version + 1,
             </if>
+
             <if test="ew.remark != null and ew.remark !=''">
                 remark = #{ew.remark},
             </if>
@@ -41,6 +45,9 @@
             <if test="ew.qualitity != null">
                 qualitity = qualitity - #{ew.qualitity},
             </if>
+            <if test="ew.netWeight != null">
+                net_weight = net_weight - #{ew.netWeight},
+            </if>
             <if test="ew.version != null">
                 version = version + 1,
             </if>
@@ -53,6 +60,7 @@
     </update>
     <select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
         select si.id,
+        si.net_weight,
         si.qualitity,
         COALESCE(si.locked_quantity, 0) as locked_quantity,
         si.product_model_id,
@@ -64,14 +72,22 @@
         pm.model,
         si.remark,
         pm.unit,
-        p.product_name
+        p.product_name,
+        p1.product_name as parent_name,
+        p1.id as parent_id
         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
-        <if test="ew.productName != null and ew.productName !=''">
-            and p.product_name like concat('%',#{ew.productName},'%')
-        </if>
+        left join product p1 on p.parent_id = p1.id
+        <where>
+            1=1
+            <if test="ew.parentId != null and ew.parentId !=''">
+                and p.parent_id = #{ew.parentId}
+            </if>
+            <if test="ew.productName != null and ew.productName !=''">
+                and p.product_name like concat('%',#{ew.productName},'%')
+            </if>
+        </where>
     </select>
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
         select si.qualitity,
@@ -91,15 +107,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}
@@ -185,14 +203,54 @@
         p.product_name
     </select>
     <select id="selectTotal" resultType="java.math.BigDecimal">
-        select ifnull(sum(qualitity),0)
+        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">
+        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 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">
+        SELECT DATE(sir.create_time) AS date,
+               SUM(sir.stock_in_num) AS count
+        FROM stock_in_record sir
+                 JOIN product_model pm ON sir.product_model_id = pm.id
+                 JOIN product p ON pm.product_id = p.id
+        WHERE (p.parent_id = #{rootCategoryId} OR p.id = #{rootCategoryId})
+          AND sir.create_time &gt;= #{startDate}
+          AND sir.create_time &lt;= #{endDate}
+        GROUP BY DATE(sir.create_time)
+        ORDER BY DATE(sir.create_time) ASC
+    </select>
+
+    <select id="selectDailyStockOutCounts" resultType="java.util.Map">
+        SELECT DATE(sor.create_time)  AS date,
+               SUM(sor.stock_out_num) AS count
+        FROM stock_out_record sor
+                 JOIN product_model pm ON sor.product_model_id = pm.id
+                 JOIN product p ON pm.product_id = p.id
+        WHERE (p.parent_id = #{rootCategoryId} OR p.id = #{rootCategoryId})
+          AND sor.create_time &gt;= #{startDate}
+          AND sor.create_time &lt;= #{endDate}
+        GROUP BY DATE(sor.create_time)
+        ORDER BY DATE(sor.create_time) ASC
     </select>
 
 </mapper>

--
Gitblit v1.9.3