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/ProductWorkOrderMapper.xml | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index d105ba1..e59e3a4 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -23,6 +23,7 @@
pwo.*,
pp.id as processId,
pp.NAME as processName,
+ pp.qualified_rate as processQualifiedRate,
pm.model,
pm.unit,
p.product_name AS productName,
@@ -51,7 +52,10 @@
<if test="c.productOrderId != null and c.productOrderId != ''">
and pwo.product_order_id = #{c.productOrderId}
</if>
- order by pwo.priority
+ <if test="c.productOrderNpsNo != null and c.productOrderNpsNo != ''">
+ and po.nps_no like concat('%',#{c.productOrderNpsNo},'%')
+ </if>
+ order by pwo.priority, ppri.drag_sort
</select>
<select id="getByProductOrderId" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
@@ -66,10 +70,7 @@
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 '鐢熶骇涓�'
@@ -86,8 +87,6 @@
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>
--
Gitblit v1.9.3