From ea66f8ba50bd32589cab54dc67cb49bed728c1e7 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 10 十二月 2025 11:38:57 +0800
Subject: [PATCH] yys 修改bug
---
src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
index 8a2bb9e..47f3c8c 100644
--- a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
@@ -15,13 +15,14 @@
T2.quantity,
T2.product_category,
T2.specification_model,
+ T2.speculative_trading_name,
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
<where>
- T1.id is not null
+ T1.id is not null and T2.type = 1
<if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
</if>
@@ -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
@@ -60,7 +65,7 @@
sales_ledger_product T2
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
+ where T1.id is not null and T2.type = 1
GROUP BY T2.id
</select>
<select id="listPageProcess" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingProcessDto">
@@ -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,
@@ -85,7 +92,7 @@
LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
left join sales_ledger_product t3 on T2.sales_ledger_product_id = t3.id
<where>
- 1 = 1
+ t3.type = 1
<if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
AND T2.status = #{salesLedgerDto.status}
</if>
@@ -108,6 +115,6 @@
AND T2.scheduling_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
</if>
</where>
- order by T2.update_time desc
+ order by T2.status asc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3