From 1cf91e355038837f30f2d727507b2229263d7de7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 17:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index e432bc9..2fdd8d3 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -7,12 +7,13 @@
<select id="selectSalesLedgerProductList" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
SELECT
T1.*,
- t3.shipping_car_number,
- t3.shipping_date,
- t3.status as shippingStatus
+ CASE
+ WHEN t2.qualitity > T1.quantity THEN 1
+ ELSE 0
+ END as has_sufficient_stock
FROM
sales_ledger_product T1
- left join shipping_info t3 on T1.id = t3.sales_ledger_product_id
+ LEFT JOIN stock_inventory t2 ON T1.product_model_id = t2.product_model_id
<where>
1=1
<if test="salesLedgerProduct.salesLedgerId != null and salesLedgerProduct.salesLedgerId != '' ">
@@ -22,6 +23,7 @@
AND T1.type = #{salesLedgerProduct.type}
</if>
</where>
+ ORDER BY T1.register_date DESC
</select>
<select id="selectSalesLedgerProductByMainId" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
select slp.*
@@ -148,4 +150,12 @@
WHERE sl.id = #{salesLedegerId}) A
group by a.model, a.product_name, a.unit
</select>
+ <select id="selectProduct" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
+ select
+ p.product_name as product_category,
+ pm.model as specification_model,
+ pm.id as product_model_id
+ from product_model pm
+ left join product p on pm.product_id = p.id
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3