From 4b9dc71d162f3fcd79bc88b170154b7516fc4962 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 18 十二月 2025 13:37:14 +0800
Subject: [PATCH] 新增设备维修保养过程描述,上传对应附件

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

diff --git a/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml b/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
index 87ede93..7f0e711 100644
--- a/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
@@ -8,29 +8,35 @@
         t4.status,
         t4.scheduling_user_id,
         t4.scheduling_user_name,
+        t4.production_user_id,
         t4.scheduling_date,
         t4.scheduling_num,
         t4.finished_num,
         t4.work_hours,
         t4.process,
-        t4.loss,
         t4.type,
         t4.remark,
+        t4.receive,
         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.speculative_trading_name
         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_scheduling t2 on t4.sales_ledger_scheduling_id = t2.id
         <where>
             t3.type = 1
             <if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
                 AND  t4.status = #{salesLedgerDto.status}
+            </if>
+            <if test="salesLedgerDto.productionUserId != null and salesLedgerDto.productionUserId != '' ">
+                AND  t4.production_user_id = #{salesLedgerDto.productionUserId}
             </if>
             <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
                 AND  T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
@@ -51,6 +57,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