From e992aa74b2a75653f007ab12a83cfc28aee7d7a6 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 28 四月 2026 17:33:03 +0800
Subject: [PATCH] fix: 报工台账导出修改

---
 src/main/resources/mapper/production/ProductionProductMainMapper.xml |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 133cfaf..ff9f34e 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -71,6 +71,14 @@
         left join sales_ledger sl on sl.id = po.sales_ledger_id
         left join sys_user u on u.user_id = ppm.user_id
         <where>
+            and ppm.status = 1
+            and ifnull(ppo.quantity, 0) > 0
+            <if test="c.workOrderIds != null and c.workOrderIds.size() > 0">
+                and ppm.work_order_id in
+                <foreach collection="c.workOrderIds" item="workOrderId" open="(" separator="," close=")">
+                    #{workOrderId}
+                </foreach>
+            </if>
             <if test="c.nickName != null and c.nickName != ''">
                 and u.nick_name like concat('%',#{c.nickName},'%')
             </if>
@@ -139,6 +147,14 @@
         left join sales_ledger sl on sl.id = po.sales_ledger_id
         left join sys_user u on u.user_id = ppm.user_id
         <where>
+            and ppm.status = 1
+            and ifnull(ppo.quantity, 0) > 0
+            <if test="c.workOrderIds != null and c.workOrderIds.size() > 0">
+                and ppm.work_order_id in
+                <foreach collection="c.workOrderIds" item="workOrderId" open="(" separator="," close=")">
+                    #{workOrderId}
+                </foreach>
+            </if>
             <if test="c.workOrderId != null">
                 and ppm.work_order_id = #{c.workOrderId}
             </if>

--
Gitblit v1.9.3