From 47c5bd416bf37769022e41402add8a41c2d09c96 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 23 三月 2026 09:47:53 +0800
Subject: [PATCH] 1、生产工单搜索加上生产订单号搜索。 2、列表顺序除了按照优先级进行排序，还要根据工艺路线的工序的顺序进行排序，开始的排在前面
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index afd2bde..8398221 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -21,6 +21,7 @@
<select id="pageProductWorkOrder" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
pwo.*,
+ pp.id as processId,
pp.NAME as processName,
pm.model,
pm.unit,
@@ -50,7 +51,43 @@
<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, pp.id
+ </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,
+ ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
+ 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
+ where po.id=#{productOrderId}
+ order by ppri.drag_sort
</select>
<select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
@@ -98,4 +135,4 @@
limit 1
;
</select>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3