From 97f84227acd789843541382a9625fe81d279c443 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 16 一月 2026 10:42:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index cd5d97e..309e1c6 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
@@ -39,6 +40,11 @@
</if>
</where>
</select>
+ <select id="selectProductWorkOrderDtoList" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
+ select *
+ from product_work_order pwo
+ left join product_order po on po.id = pwo.product_order_id
+ </select>
<update id="updatePlanQuantity" parameterType="java.util.Map">
UPDATE product_work_order
--
Gitblit v1.9.3