From 10e96d8bde12ac7a754111dbd063e3dee7edb9aa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 17 七月 2026 09:47:08 +0800
Subject: [PATCH] fix: 首页生产订单进度按照订单编号倒序
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index a818160..ea98e2b 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -88,6 +88,23 @@
AND slp.sales_ledger_id = qi.purchase_ledger_id
AND slp.product_model_id = qi.product_model_id
WHERE sir.approval_status = 1
+
+ UNION ALL
+
+ SELECT slp.id AS sales_ledger_product_id,
+ sir.stock_in_num
+ FROM stock_in_record sir
+ INNER JOIN quality_unqualified qu
+ ON TRIM(sir.record_type) = '11'
+ AND sir.record_id = qu.id
+ INNER JOIN quality_inspect qi
+ ON qi.id = qu.inspect_id
+ INNER JOIN sales_ledger_product slp
+ ON slp.type = 2
+ AND slp.sales_ledger_id = qi.purchase_ledger_id
+ AND slp.product_model_id = qi.product_model_id
+ WHERE sir.approval_status = 1
+
) rel
GROUP BY rel.sales_ledger_product_id
) approved_qty ON approved_qty.sales_ledger_product_id = slp.id
@@ -128,7 +145,7 @@
<if test="c.stockInStatus != null and c.stockInStatus != ''">
WHERE result.stock_in_status = #{c.stockInStatus}
</if>
- ORDER BY result.entry_date DESC
+ ORDER BY result.entry_date DESC, result.purchase_contract_number DESC
</select>
<select id="selectTotalPurchaseAmount" resultType="java.math.BigDecimal">
--
Gitblit v1.9.3