From 9dcf20387a41fc71501a5243ee25b74c806b464f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 26 三月 2026 15:48:56 +0800
Subject: [PATCH] 生产详情返回报废数量,重新计算合格数量等值

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

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 875c2a1..1b11d4c 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -19,9 +19,12 @@
         u.nick_name as nickName,
         p.product_name as productName,
         pp.name as process,
+        pp.qualified_rate as processQualifiedRate,
         pm.model as productModelName,
         ppo.quantity,
         ppo.scrap_qty,
+        (ppo.quantity - ppo.scrap_qty) as qualifiedQty,
+        case when ppo.quantity > 0 then round((ppo.quantity - ppo.scrap_qty) / ppo.quantity * 100, 2) else 0 end as actualQualifiedRate,
         ppo.other_data,
         pm.unit,
         sl.sales_contract_no salesContractNo
@@ -64,7 +67,6 @@
         ppo.quantity,
         ppo.scrap_qty,
         ppo.other_data,
-        (ppo.quantity - ppo.scrap_qty) as qualifiedQty,
         pm.unit
         from
         production_product_main ppm
@@ -147,4 +149,13 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="checkPreviousProcessReported" resultType="java.lang.Boolean">
+        SELECT CASE WHEN COUNT(*) > 0 THEN TRUE ELSE FALSE END
+        FROM production_product_main ppm
+        JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
+        JOIN product_process_route_item ppri ON pwo.product_process_route_item_id = ppri.id
+        WHERE ppri.product_route_id = #{productRouteId}
+        AND ppri.drag_sort = #{currentDragSort} - 1
+    </select>
 </mapper>

--
Gitblit v1.9.3