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/ProductionProductMainMapper.xml |   51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index aeb4230..21ad83c 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -18,14 +18,18 @@
         pwo.status as workOrderStatus,
         u.nick_name as nickName,
         p.product_name as productName,
+        pp.name as process,
         pm.model as productModelName,
         ppo.quantity,
         ppo.scrap_qty,
+        ppo.add_qty,
         pm.unit,
         sl.sales_contract_no salesContractNo
         from
         production_product_main ppm
         left join product_work_order pwo on pwo.id = ppm.work_order_id
+        left join product_process_route_item ppri on ppri.id = pwo.product_process_route_item_id
+        left join product_process pp on pp.id = ppri.process_id
         left join product_order po on po.id = pwo.product_order_id
         left join production_product_output ppo on ppm.id = ppo.product_main_id
         left join product_model pm on pm.id = ppo.product_model_id
@@ -45,8 +49,14 @@
             <if test="c.status != null and c.status != ''">
                 and ppm.status = #{c.status}
             </if>
+            <if test="c.auditStatus != null">
+                and ppm.audit_status = #{c.auditStatus}
+            </if>
+            <if test="c.workOrderId != null">
+                and ppm.work_order_id = #{c.workOrderId}
+            </if>
         </where>
-        order by ppm.id
+        order by  ppm.id desc
 
     </select>
     <select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
@@ -63,15 +73,24 @@
         sl.sales_contract_no,
         sl.customer_name,
         p.product_name,
-        pm.model,
+        pm.model as product_model_name,
         pm.unit,
         slpa.process,
         ppo.quantity,
         slpa.work_hours,
-        slpa.work_hours * slpa.finished_num AS wages
+        slpa.work_hours * slpa.finished_num AS wages,
+        dl.device_name,
+        slpa.work_hour as work_minutes,
+        IFNULL(
+        TIMESTAMPDIFF(MINUTE, ppm.start_time, ppm.end_time),
+        0
+        ) AS work_minutes,
+        ppo.add_qty,
+        ppo.scrap_qty,
+        ppo.replenish_qty
         FROM
         production_product_main ppm
-        LEFT JOIN sales_ledger_production_accounting slpa ON slpa.sales_ledger_work_id = ppm.id
+        LEFT JOIN sales_ledger_production_accounting slpa ON slpa.product_main_id = ppm.id
         LEFT JOIN production_product_output ppo ON ppm.id = ppo.product_main_id
         LEFT JOIN product_work_order pwo ON pwo.id = ppm.work_order_id
         LEFT JOIN product_order po ON po.id = pwo.product_order_id
@@ -79,10 +98,32 @@
         LEFT JOIN product_model pm ON po.product_model_id = pm.id
         LEFT JOIN product p ON p.id = pm.product_id
         LEFT JOIN sales_ledger sl ON po.sales_ledger_id = sl.id
-        <where>
+        left join device_ledger dl ON dl.id = slpa.device_id
+        where ppm.audit_status = 1
             <if test="ew.schedulingUserName != null and ew.schedulingUserName !=''">
                 and slpa.scheduling_user_name = #{ew.schedulingUserName}
             </if>
+            <if test="ew.entryDate != null " >
+                and slpa.scheduling_date >= #{ew.entryDate}
+                and slpa.scheduling_date &lt; DATE_ADD(#{ew.entryDate}, INTERVAL 1 DAY)
+            </if>
+            <if test="ew.entryDateStart != null and ew.entryDateEnd != null" >
+                and slpa.scheduling_date >= #{ew.entryDateStart}
+                and slpa.scheduling_date &lt; date_add(#{ew.entryDateEnd}, INTERVAL 1 DAY)
+            </if>
+    </select>
+    <select id="listMain" resultType="java.lang.Long">
+        SELECT ppm.id FROM production_product_main ppm
+            left join product_work_order pwo on pwo.id = ppm.work_order_id
+                  left join product_order po on po.id = pwo.product_order_id
+                  left join sales_ledger sl on sl.id = po.sales_ledger_id
+        <where>
+            <if test="idList != null and idList.size() > 0">
+                and sl.id in
+                <foreach item="id" collection="idList" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
     </select>
 

--
Gitblit v1.9.3