From a610cbd7e6b7631254f15c832afce6e747b3581d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 02 四月 2026 14:36:02 +0800
Subject: [PATCH] 生产报表相关接口

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

diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index f3784fd..417f029 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -26,7 +26,9 @@
         pp.qualified_rate as processQualifiedRate,
         pm.model,
         pm.unit,
+        pm.material_code as materialCode,
         p.product_name AS productName,
+        p.id AS productId,
         po.nps_no AS productOrderNpsNo,
         ppri.drag_sort,
         ppri.product_route_id,
@@ -55,7 +57,7 @@
             <if test="c.productOrderNpsNo != null and c.productOrderNpsNo != ''">
                 and po.nps_no like concat('%',#{c.productOrderNpsNo},'%')
             </if>
-        order by pwo.priority, pp.id
+        order by pwo.priority asc, po.id desc, ppri.drag_sort asc
     </select>
 
     <select id="getByProductOrderId" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">

--
Gitblit v1.9.3