From a08dce3de307ce138396db5fe7274ead2ef5c573 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 17:12:08 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb
---
src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
index 47f3c8c..cac4d0e 100644
--- a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
@@ -50,7 +50,7 @@
</select>
<select id="list" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingDto">
SELECT
- T2.id,
+ T2.id as salesLedgerProductId,
ifNull(sum(t3.scheduling_num),0) AS schedulingNum,
T1.sales_contract_no,
T1.customer_contract_no,
@@ -63,8 +63,8 @@
T2.unit
FROM
sales_ledger_product T2
+ LEFT join sales_ledger_scheduling t3 on T2.id = t3.sales_ledger_product_id
LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
- LEFT join sales_ledger_scheduling t3 on T1.id = t3.sales_ledger_id
where T1.id is not null and T2.type = 1
GROUP BY T2.id
</select>
@@ -86,7 +86,8 @@
T1.customer_name,
t3.product_category,
t3.specification_model,
- t3.unit
+ t3.unit,
+ T2.production_line
FROM
sales_ledger_scheduling T2
LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
@@ -115,6 +116,6 @@
AND T2.scheduling_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
</if>
</where>
- order by T2.status asc
+ order by T2.scheduling_date desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3