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 |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 15a210f..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">

--
Gitblit v1.9.3