From 7e3c4b0752700ce04be836bf65aea0d86a5922b3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 20 三月 2026 13:41:58 +0800
Subject: [PATCH] 返回状态信息
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 14b883e..d105ba1 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -21,11 +21,14 @@
<select id="pageProductWorkOrder" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
pwo.*,
+ pp.id as processId,
pp.NAME as processName,
pm.model,
pm.unit,
p.product_name AS productName,
po.nps_no AS productOrderNpsNo,
+ ppri.drag_sort,
+ ppri.product_route_id,
ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
CASE
WHEN pwo.work_order_no LIKE 'FG%' THEN '杩斿伐杩斾慨'
@@ -48,6 +51,45 @@
<if test="c.productOrderId != null and c.productOrderId != ''">
and pwo.product_order_id = #{c.productOrderId}
</if>
+ order by pwo.priority
+ </select>
+
+ <select id="getByProductOrderId" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
+ SELECT
+ pwo.*,
+ pp.id as processId,
+ pp.NAME as processName,
+ pp.no as processNo,
+ pm.model,
+ pm.unit,
+ p.product_name AS productName,
+ po.nps_no AS productOrderNpsNo,
+ ppri.drag_sort,
+ ppri.product_route_id,
+ sum(ppo.scrap_qty) scrapQty,
+ ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
+ ROUND(sum(ppo.scrap_qty) / pwo.complete_quantity * 100, 2) AS scrapRate,
+ (pwo.complete_quantity - sum(ppo.scrap_qty)) AS completeQty,
+ CASE
+ WHEN pwo.complete_quantity >= pwo.plan_quantity THEN '宸茬敓浜�'
+ WHEN pwo.complete_quantity > 0 AND pwo.complete_quantity < pwo.plan_quantity THEN '鐢熶骇涓�'
+ ELSE '寰呯敓浜�'
+ END AS statusText,
+ CASE
+ WHEN pwo.work_order_no LIKE 'FG%' THEN '杩斿伐杩斾慨'
+ ELSE '姝ｅ父'
+ END AS work_order_type
+ FROM
+ 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
+ LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
+ LEFT JOIN product p ON p.id = pm.product_id
+ LEFT JOIN production_product_main ppm ON ppm.work_order_id = pwo.id
+ LEFT JOIN production_product_output ppo ON ppo.product_main_id = ppm.id
+ where po.id=#{productOrderId}
+ order by ppri.drag_sort
</select>
<select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
@@ -95,4 +137,4 @@
limit 1
;
</select>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3