From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro

---
 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml |   75 ++++++++++++++++++++++++++++++++-----
 1 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 7eb7b79..6b48bbe 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -38,7 +38,13 @@
          WHEN IFNULL(t3.shipped_quantity, 0) = 0 THEN '寰呭彂璐�'
          WHEN (IFNULL(T1.quantity, 0) - IFNULL(t3.shipped_quantity, 0)) > 0 THEN '閮ㄥ垎鍙戣揣'
         ELSE '宸插彂璐�'
-        END as shippingStatus
+        END as shippingStatus,
+        CASE
+         WHEN T1.type != 2 THEN NULL
+         WHEN IFNULL(t4.approved_stock_in_num, 0) &lt;= 0 THEN '寰呭叆搴�'
+         WHEN IFNULL(t4.approved_stock_in_num, 0) &gt;= IFNULL(T1.quantity, 0) THEN '瀹屽叏鍏ュ簱'
+        ELSE '鍏ュ簱涓�'
+        END AS stock_in_approval_status
         FROM
         sales_ledger_product T1
         LEFT JOIN (
@@ -53,6 +59,39 @@
         where si.status != '瀹℃牳鎷掔粷'
         GROUP BY sales_ledger_product_id
         ) t3 ON t3.sales_ledger_product_id = T1.id
+        LEFT JOIN (
+        SELECT rel.sales_ledger_product_id,
+               IFNULL(SUM(rel.stock_in_num), 0) AS approved_stock_in_num
+        FROM (
+            SELECT slp.id AS sales_ledger_product_id,
+                   sir.stock_in_num
+            FROM stock_in_record sir
+            INNER JOIN sales_ledger_product slp
+                ON slp.type = 2
+                AND TRIM(sir.record_type) = '7'
+                AND sir.record_id = slp.sales_ledger_id
+                AND (
+                    (sir.batch_no IS NOT NULL AND sir.batch_no LIKE CONCAT('%-', slp.id))
+                    OR (sir.batch_no IS NULL AND sir.product_model_id = slp.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_inspect qi
+                ON TRIM(sir.record_type) = '10'
+                AND sir.record_id = qi.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
         left join product_model pm ON T1.product_model_id = pm.id
         left join product p ON pm.product_id = p.id
         <where>
@@ -168,7 +207,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
@@ -179,20 +218,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