From ca0565e53494417b3779759f8d3898e07bfd5929 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 14:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb

---
 src/main/resources/mapper/production/ProductWorkOrderMapper.xml |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index ac0348a..2ab8057 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -25,9 +25,10 @@
         pm.model,
         pm.unit,
         p.product_name AS productName,
-        po.nps_no AS productOrderNpsNo
+        po.nps_no AS productOrderNpsNo,
+        ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus
         FROM
-        `product_work_order` pwo
+        product_work_order pwo
         LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
         LEFT JOIN product_order po ON po.id = pwo.product_order_id
         LEFT JOIN product_process pp ON pp.id = ppri.process_id
@@ -49,9 +50,7 @@
         UPDATE product_work_order
         SET
             report_work = #{reportWork},
-            quantity = #{quantity},
-            plan_quantity = plan_quantity - #{deductQuantity},
-            product_main_id = #{productMainId}
+            plan_quantity = plan_quantity - #{deductQuantity}
         WHERE id = #{workOrderId}
     </update>
 

--
Gitblit v1.9.3