From d0eaee38a59ec4f2600bfec41b3db5f80500af32 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 12 十二月 2025 16:16:01 +0800
Subject: [PATCH] yys
---
src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
index 27c0fe7..f0e3fc1 100644
--- a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
@@ -15,6 +15,7 @@
T2.quantity,
T2.product_category,
T2.specification_model,
+ T2.speculative_trading_name,
T2.unit
FROM
sales_ledger_product T2
@@ -42,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
@@ -71,8 +76,10 @@
T2.status,
T2.scheduling_user_id,
T2.scheduling_user_name,
+ T2.speculative_trading_name,
T2.scheduling_date,
ifNull(T2.scheduling_num,0) AS schedulingNum,
+ ifNull(T2.finished_num,0) AS successNum,
T1.sales_contract_no,
T1.customer_contract_no,
T1.project_name,
@@ -108,6 +115,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