From ab6bc93691c09e5b8a6f449d2dc0c33d86cd37e7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 21 一月 2026 17:27:26 +0800
Subject: [PATCH] feat(sales): 出库记录

---
 src/main/resources/mapper/basic/ProductModelMapper.xml |   71 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 4e889f7..e12b63c 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -25,12 +25,77 @@
             <if test="c.productName != null and c.productName != ''">
                 and p.product_name  like  concat('%',#{c.productName},'%')
             </if>
-            <if test="c.speculativeTradingName != null and c.speculativeTradingName != ''">
-                and pm.speculative_trading_name like  concat('%',#{c.speculativeTradingName},'%')
-            </if>
         </where>
         order by  pm.id
     </select>
+    <select id="selectLatestRecord" resultType="com.ruoyi.basic.pojo.ProductModel">
+            SELECT * FROM product_model
+            ORDER BY create_time DESC, id DESC
+            LIMIT 1
+    </select>
 
+    <select id="listPageProductionStock" resultType="com.ruoyi.basic.pojo.ProductModel">
+        SELECT
+        pm.id,
+        pm.product_id,
+        pm.model,
+        pm.unit,
+        p.product_name,
+        GREATEST(s.last_in_time, o.last_out_time) AS create_time,
+        COALESCE(s.inboundNum, 0) AS inboundNum,
+        COALESCE(o.outboundNum, 0) AS outboundNum,
+        COALESCE(s.inboundNum, 0) - COALESCE(o.outboundNum, 0) AS stockQuantity
+        FROM product_model pm
+        LEFT JOIN product p ON pm.product_id = p.id
+
+        -- 鍏ュ簱姹囨��
+        LEFT JOIN (
+        SELECT
+        product_model_id,
+        SUM(inbound_num) AS inboundNum,
+        MAX(create_time) AS last_in_time
+        FROM procurement_record_storage
+        <where>
+            <if test="req.timeStr != null and req.timeStr != ''">
+                AND create_time &gt;= #{req.timeStr}
+                AND create_time &lt; DATE_ADD(#{req.timeStr}, INTERVAL 1 DAY)
+            </if>
+        </where>
+        GROUP BY product_model_id
+        ) s ON s.product_model_id = pm.id
+
+        -- 鍑哄簱姹囨��
+        LEFT JOIN (
+        SELECT
+        product_model_id,
+        SUM(inbound_num) AS outboundNum,
+        MAX(create_time) AS last_out_time
+        FROM procurement_record_out
+        <where>
+            <if test="req.timeStr != null and req.timeStr != ''">
+                AND create_time &gt;= #{req.timeStr}
+                AND create_time &lt; DATE_ADD(#{req.timeStr}, INTERVAL 1 DAY)
+            </if>
+        </where>
+        GROUP BY product_model_id
+        ) o ON o.product_model_id = pm.id
+
+        <where>
+            <if test="req.timeStr != null and req.timeStr != ''">
+                AND (s.product_model_id IS NOT NULL OR o.product_model_id IS NOT NULL)
+            </if>
+
+            <if test="req.productCategory != null and req.productCategory != ''">
+                AND EXISTS (
+                SELECT 1
+                FROM sales_ledger_product slp
+                WHERE slp.product_id = p.id
+                AND slp.product_category LIKE CONCAT('%', #{req.productCategory}, '%')
+                )
+            </if>
+        </where>
+
+        ORDER BY pm.id DESC
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3