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 |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
index bcf4b64..1fb5907 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>
@@ -39,6 +40,9 @@
             </if>
             <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
@@ -60,7 +64,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,21 +75,28 @@
         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,
+        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>
-            1 = 1
+            t3.type = 1
             <if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
                 AND  T2.status = #{salesLedgerDto.status}
             </if>
@@ -101,13 +112,16 @@
             <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
                 AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
             </if>
-            <if test="salesLedgerDto.schedulingDateStart != null and salesLedgerDto.schedulingDateStart != '' ">
+            <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
                 AND T2.scheduling_date &gt;= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
             </if>
-            <if test="salesLedgerDto.schedulingDateEnd != null and salesLedgerDto.schedulingDateEnd != '' ">
+            <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.update_time desc
+        order by T2.status asc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3