From 31a5d6d89b7aa5abd5d8a83aca7fe2700cba029f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 09 六月 2026 17:36:41 +0800
Subject: [PATCH] 销售台账产品状态根据库存类型判断

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

diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 712fd9b..a7819d1 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -62,9 +62,16 @@
         T1.payment_method,
         T1.delivery_date,
         DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
+        COALESCE(stock_type_info.stock_type, 'qualified') AS stock_type,
         IFNULL(shipping_status_counts.is_all_shipped, FALSE) AS is_fh
         FROM sales_ledger T1
         LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
+        LEFT JOIN (
+        SELECT sales_ledger_id, MAX(stock_type) AS stock_type
+        FROM sales_ledger_product
+        WHERE type = 1
+        GROUP BY sales_ledger_id
+        ) stock_type_info ON T1.id = stock_type_info.sales_ledger_id
         LEFT JOIN (
         SELECT sales_ledger_id,
         CASE
@@ -137,7 +144,7 @@
                 and c.customer_name like concat('%',#{customerName},'%')
             </if>
         </where>
-        order by sl.create_time desc
+        order by sl.entry_date desc
     </select>
 
 </mapper>

--
Gitblit v1.9.3