From 9f5813763a54f7fde8b472b0da305d635a624e8f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 08 八月 2026 17:55:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

---
 src/main/resources/mapper/production/ProductWorkOrderMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 9fd4794..6b07502 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -61,7 +61,7 @@
         <if test="c.productOrderId != null and c.productOrderId != ''">
             and pwo.product_order_id = #{c.productOrderId}
         </if>
-        order by pwo.work_order_no desc
+        order by po.nps_no desc, pwo.work_order_no desc
     </select>
 
     <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">

--
Gitblit v1.9.3