From ba69a4fb6db917d5e4d0fb14c37add8ee859b0e1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 13 三月 2026 17:57:51 +0800
Subject: [PATCH] 1.耗材迁移 2.仓储物流新增字段（毛重，皮重，净重） 3.设备保养多选（多条定时任务）
---
src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
index aacfbba..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
@@ -72,6 +76,7 @@
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,
@@ -81,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
@@ -110,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