From 17a63200983a8e154a1eb3549d1caffa050372c1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 30 三月 2026 17:14:45 +0800
Subject: [PATCH] feat:1.生产订单领用 2.报工领用（关联订单领用） 3.报工删除（关联报工领用） 4.不合格处理（返工生成返工附件并下载）

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |   66 +++++++++++++++++++++++++++++----
 1 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 79b08cd..da3f233 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -64,6 +64,7 @@
         pm.model,
         si.remark,
         pm.unit,
+        pm.uid_no as uidNo,
         p.product_name
         from stock_inventory si
         left join product_model pm on si.product_model_id = pm.id
@@ -91,15 +92,18 @@
         </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
+        pm.uid_no as uidNo,
+        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 +201,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">
@@ -233,4 +239,48 @@
         ORDER BY DATE(sor.create_time) ASC
     </select>
 
+    <select id="getStockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
+        SELECT
+        p.product_name,
+        pm.model,
+        pm.unit,
+        si.*
+        FROM
+        product_model pm
+        LEFT JOIN product p ON p.id = pm.product_id
+        LEFT JOIN stock_inventory si ON si.product_model_id = pm.id
+        WHERE
+        pm.id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        ORDER BY pm.id
+    </select>
+
+    <select id="getMaterials" resultType="com.ruoyi.stock.dto.StockInventoryDto">
+        SELECT
+            si.id,
+            si.qualitity,
+            COALESCE(si.locked_quantity, 0) AS locked_quantity,
+            si.product_model_id,
+            si.create_time,
+            si.update_time,
+            COALESCE(si.warn_num, 0) AS warn_num,
+            si.version,
+            (si.qualitity - COALESCE(si.locked_quantity, 0)) AS un_locked_quantity,
+            pm.model,
+            si.remark,
+            pm.unit,
+            pm.uid_no AS uidNo,
+            p.product_name,
+            p1.product_name AS parentName
+        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
+                LEFT JOIN product p1 ON p1.id = p.parent_id
+        WHERE
+            p1.product_name = '鍘熸潗鏂�';
+    </select>
+
 </mapper>

--
Gitblit v1.9.3