From 5cabba0016c61d51204c7e28bf0613b1cd335327 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 25 三月 2026 15:05:34 +0800
Subject: [PATCH] 工序不合格处理为隔离后，后续工序不继续报工
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 4ac2dce..c2dc1d8 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,8 +67,8 @@
ppo.quantity,
ppo.scrap_qty,
ppo.other_data,
- pm.unit,
- sl.sales_contract_no salesContractNo
+ (ppo.quantity - ppo.scrap_qty) as qualifiedQty,
+ pm.unit
from
production_product_main ppm
left join product_work_order pwo on pwo.id = ppm.work_order_id
@@ -147,4 +150,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