From 620e9434166b946f8d28162b142e2498e6a487fd Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 25 三月 2026 11:59:40 +0800
Subject: [PATCH] 生产工单按照优先级和工艺路线项目排序

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

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 4ac2dce..36b0204 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

--
Gitblit v1.9.3