From 5a5df7b6529a62233bd2541a9abbb7bd588e9a4d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 十二月 2025 17:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hckx' into hckx
---
src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
index 6009d15..72321ec 100644
--- a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
@@ -43,6 +43,10 @@
</if>
</where>
GROUP BY T2.id
+ <if test="salesLedgerDto.status != null and salesLedgerDto.status.equals('true')">
+ HAVING quantity - schedulingNum > 0
+ </if>
+ order by T1.entry_date desc
</select>
<select id="list" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingDto">
SELECT
@@ -82,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
@@ -111,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