From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

---
 src/main/resources/mapper/production/SalesLedgerWorkMapper.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml b/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
index 9629868..5608a08 100644
--- a/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
@@ -23,12 +23,11 @@
         t3.product_category,
         t3.specification_model,
         t3.unit,
-        t2.speculative_trading_name,
         t4.production_line
         FROM
         sales_ledger_work t4
         LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
-        left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id
+        left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id and slp.type = 1
         left join sales_ledger_scheduling t2 on t4.sales_ledger_scheduling_id = t2.id
         <where>
             t3.type = 1
@@ -54,6 +53,6 @@
                 AND  t4.scheduling_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
             </if>
         </where>
-        order by t4.update_time desc
+        order by t4.scheduling_date desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3