From 682cdfa409bd3535b345cfb9d0ca84a96a9e352f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 01 六月 2026 17:17:44 +0800
Subject: [PATCH] docs: 工序管理操作日志系统模块中文

---
 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml |   50 +++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 49569de..6898fcf 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -89,6 +89,22 @@
                 AND slp.sales_ledger_id = qi.purchase_ledger_id
                 AND slp.product_model_id = qi.product_model_id
             WHERE sir.approval_status = 1
+
+            UNION ALL
+
+            SELECT slp.id AS sales_ledger_product_id,
+                   sir.stock_in_num
+            FROM stock_in_record sir
+            INNER JOIN quality_unqualified qu
+                ON TRIM(sir.record_type) = '4'
+                AND sir.record_id = qu.id
+            INNER JOIN quality_inspect qi
+                ON qi.id = qu.inspect_id
+            INNER JOIN sales_ledger_product slp
+                ON slp.type = 2
+                AND slp.sales_ledger_id = qi.purchase_ledger_id
+                AND slp.product_model_id = qi.product_model_id
+            WHERE sir.approval_status = 1
         ) rel
         GROUP BY rel.sales_ledger_product_id
         ) t4 ON t4.sales_ledger_product_id = T1.id
@@ -207,7 +223,7 @@
             JOIN product pr ON slp.product_id = pr.id
         WHERE
             slp.type = 2
-            AND pr.parent_id = ( SELECT id FROM product WHERE product_name = '鍘熸潗鏂�' )
+            AND pr.parent_id = ( SELECT id FROM product WHERE product_name = '鍘熸枡' )
         GROUP BY
             pr.id,
             pr.product_name
@@ -218,20 +234,36 @@
 
     <select id="selectProductCountByTypeAndDate" resultType="int">
         SELECT IFNULL(COUNT(*), 0)
-        FROM sales_ledger_product
+        FROM sales_ledger_product slp
+        LEFT JOIN sales_ledger sl ON sl.id = slp.sales_ledger_id
+        LEFT JOIN purchase_ledger pl ON pl.id = slp.sales_ledger_id
         WHERE type = #{type}
-        <if test="startDate != null">
-            AND register_date &gt;= #{startDate}
-        </if>
-        <if test="endDate != null">
-            AND register_date &lt;= #{endDate}
-        </if>
+
+        <choose>
+            <when test="type == 1">
+                <if test="startDate != null">
+                    AND sl.entry_date &gt;= #{startDate}
+                </if>
+                <if test="endDate != null">
+                    AND sl.entry_date &lt;= #{endDate}
+                </if>
+            </when>
+
+            <when test="type == 2">
+                <if test="startDate != null">
+                    AND pl.entry_date &gt;= #{startDate}
+                </if>
+                <if test="endDate != null">
+                    AND pl.entry_date &lt;= #{endDate}
+                </if>
+            </when>
+        </choose>
     </select>
 
     <select id="selectRawMaterialExpense" resultType="java.math.BigDecimal">
         WITH RECURSIVE product_tree AS (SELECT id
                                         FROM product
-                                        WHERE product_name = '鍘熸潗鏂�'
+                                        WHERE product_name = '鍘熸枡'
 
                                         UNION ALL
 

--
Gitblit v1.9.3