From 2f22c6ea825cc32975dfa4eaaa23649c6f633682 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 09 二月 2026 16:03:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

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

diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 2a1b94a..d8655c9 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -8,7 +8,7 @@
         SELECT
         T1.*,
         CASE
-        WHEN t2.qualitity > T1.quantity THEN 1
+        WHEN t2.qualitity-t2.locked_quantity >= T1.quantity THEN 1
         ELSE 0
         END as has_sufficient_stock
         FROM
@@ -97,7 +97,7 @@
                 AND slp.product_category like concat('%',#{req.productCategory},'%')
             </if>
             <if test="req.status != null and req.status ">
-                AND slp.pending_invoice_total &gt; 0
+                AND slp.pending_tickets_total &gt; 0
             </if>
         </where>
         order by slp.register_date desc

--
Gitblit v1.9.3