From df1f128feb96f999f6b2fcbcae8eae72f584dbe5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 04 六月 2026 15:55:24 +0800
Subject: [PATCH] 过程检、成品检报告需展示客户名称(生产订单对应带出来的),检测单位固定是 天津阳光彩印股份有限公司

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

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 842b872..df33e70 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -22,6 +22,7 @@
         pm.model as productModelName,
         ppo.quantity,
         ppo.scrap_qty,
+        ppo.add_qty,
         pm.unit,
         sl.sales_contract_no salesContractNo
         from
@@ -36,8 +37,8 @@
         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>
-            <if test="c.nickName != null and c.nickName != ''">
-                and u.nick_name like concat('%',#{c.nickName},'%')
+            <if test="c.teamNames != null and c.teamNames != ''">
+                and ppm.team_names like concat('%',#{c.teamNames},'%')
             </if>
             <if test="c.workOrderNo != null and c.workOrderNo != ''">
                 and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
@@ -83,7 +84,10 @@
         IFNULL(
         TIMESTAMPDIFF(MINUTE, ppm.start_time, ppm.end_time),
         0
-        ) AS work_minutes
+        ) 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.product_main_id = ppm.id
@@ -130,4 +134,4 @@
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>
\ No newline at end of file

--
Gitblit v1.9.3