From 2683793796366a4b6361baf4a16e5c65c8dce068 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 21 四月 2026 16:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
index 27c0fe7..92198b5 100644
--- a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
@@ -2,7 +2,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.SalesLedgerSchedulingMapper">
- <select id="listPage" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingDto">
+ <select id="listPage" resultType="com.ruoyi.production2.dto.SalesLedgerSchedulingDto">
SELECT
T2.id as salesLedgerProductId,
T1.id as salesLedgerId,
@@ -15,6 +15,7 @@
T2.quantity,
T2.product_category,
T2.specification_model,
+ T2.speculative_trading_name,
T2.unit
FROM
sales_ledger_product T2
@@ -42,8 +43,12 @@
</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 id="list" resultType="com.ruoyi.production2.dto.SalesLedgerSchedulingDto">
SELECT
T2.id,
ifNull(sum(t3.scheduling_num),0) AS schedulingNum,
@@ -63,7 +68,7 @@
where T1.id is not null and T2.type = 1
GROUP BY T2.id
</select>
- <select id="listPageProcess" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingProcessDto">
+ <select id="listPageProcess" resultType="com.ruoyi.production2.dto.SalesLedgerSchedulingProcessDto">
SELECT
t3.id as salesLedgerProductId,
T1.id as salesLedgerId,
@@ -71,19 +76,22 @@
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,
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
- left join sales_ledger_product t3 on T2.sales_ledger_product_id = t3.id
+ left join sales_ledger_product t3 on T2.sales_ledger_product_id = t3.id and slp.type = 1
<where>
t3.type = 1
<if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
@@ -108,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