From 2737e108612c3ea013e8bcd0ee0f71a4969205bb Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 04 十二月 2025 15:14:01 +0800
Subject: [PATCH] yys

---
 src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
index aacfbba..1fb5907 100644
--- a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
@@ -41,6 +41,9 @@
             <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
                 AND  T1.entry_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
             </if>
+            <if test="salesLedgerDto.productionUserId != null and salesLedgerDto.productionUserId != '' ">
+                AND  T1.entry_person = #{salesLedgerDto.productionUserId}
+            </if>
         </where>
         GROUP BY T2.id
     </select>
@@ -72,6 +75,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,11 +85,16 @@
         T1.customer_name,
         t3.product_category,
         t3.specification_model,
-        t3.unit
+        t3.unit,
+        t4.name as productionLineName,
+        t4.id as productionLineId,
+        T2.production_user_name,
+        T2.production_user_id
         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 production_line t4 on t4.id = T2.production_line_id
         <where>
             t3.type = 1
             <if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
@@ -109,6 +118,9 @@
             <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
                 AND  T2.scheduling_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
             </if>
+            <if test="salesLedgerDto.productionUserId != null and salesLedgerDto.productionUserId != '' ">
+                AND  T2.production_user_id = #{salesLedgerDto.productionUserId}
+            </if>
         </where>
         order by T2.status asc
     </select>

--
Gitblit v1.9.3