From 4fc35bc07b14aa6fea89b9ba89141eb69e1caa43 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 04 十二月 2025 15:08:41 +0800
Subject: [PATCH] yys1.协同办公：关闭签字功能，除报销管理外，关闭其余附件功能。    2.营销管理：关闭销售台账附件功能。    3.仓储物料：需增加成品入库    4.生产管控：生产派工需要新增派工产线及生产人    5.设备管理：设备台账关闭设备品牌和存放位置

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

diff --git a/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml b/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
index e2c884b..892f4b8 100644
--- a/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
@@ -8,26 +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.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>
-            1 = 1
+            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},'%')
@@ -41,10 +50,10 @@
             <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 t4.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  t4.scheduling_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
             </if>
         </where>

--
Gitblit v1.9.3