From 03386a78c3a1f92efa21a6748e38c2c5d1c996d9 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 27 一月 2026 10:57:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index e27d27e..2fdd8d3 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -7,10 +7,6 @@
<select id="selectSalesLedgerProductList" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
SELECT
T1.*,
- t3.shipping_car_number,
- t3.shipping_date,
- t3.status as shippingStatus
- t3.shipping_date,
CASE
WHEN t2.qualitity > T1.quantity THEN 1
ELSE 0
@@ -18,7 +14,6 @@
FROM
sales_ledger_product T1
LEFT JOIN stock_inventory t2 ON T1.product_model_id = t2.product_model_id
- LEFT JOIN shipping_info t3 ON T1.id = t3.sales_ledger_product_id
<where>
1=1
<if test="salesLedgerProduct.salesLedgerId != null and salesLedgerProduct.salesLedgerId != '' ">
@@ -28,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.*
@@ -158,7 +154,7 @@
select
p.product_name as product_category,
pm.model as specification_model,
- pm.id
+ pm.id as product_model_id
from product_model pm
left join product p on pm.product_id = p.id
</select>
--
Gitblit v1.9.3