From 9b6109daafb49ca14daf6d77964579ef5dc8ec0f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 16 五月 2026 11:10:20 +0800
Subject: [PATCH] fix:设备台账顺序更改
---
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 8e5f86d..60aa635 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -21,11 +21,13 @@
<select id="pageProductWorkOrder" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
pwo.*,
+ po.batch_no as batchNo,
pp.id as processId,
pp.NAME as processName,
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,
@@ -56,7 +58,7 @@
<if test="c.productOrderNpsNo != null and c.productOrderNpsNo != ''">
and po.nps_no like concat('%',#{c.productOrderNpsNo},'%')
</if>
- order by pwo.priority, pwo.id desc, ppri.drag_sort
+ 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