From 0ac445694a8ffc0e26e54d788d889b3797edf7a0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 26 六月 2026 09:48:33 +0800
Subject: [PATCH] feat: 添加备件领用记录功能，包括数据库表
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 0df9c91..99a95a6 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -24,7 +24,7 @@
AND T1.type = #{salesLedgerProduct.type}
</if>
</where>
- ORDER BY T1.register_date DESC
+ ORDER BY T1.register_date ASC,T1.id ASC
</select>
<select id="selectSalesLedgerProductByMainId" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
@@ -159,14 +159,14 @@
sl.supplier_name,
pm.thickness
ORDER BY
- slp.product_category
+ sl.entry_date desc
</select>
<select id="procurementBusinessSummaryStatistics"
resultType="com.ruoyi.purchase.dto.ProcurementBusinessSummaryStatisticsDto">
SELECT
COALESCE(SUM(slp.tax_inclusive_total_price), 0) AS purchaseTotalAmount,
- COALESCE(COUNT(DISTINCT slp.product_category), 0) AS productCategoryCount,
+ COALESCE(COUNT(DISTINCT slp.product_model_id), 0) AS productCategoryCount,
COALESCE(SUM(rop.allocated_return_amount), 0) AS returnTotalAmount
FROM sales_ledger_product slp
LEFT JOIN purchase_ledger sl ON slp.sales_ledger_id = sl.id
--
Gitblit v1.9.3