From 84b131de4a1deb526066fc0f7e7514ac43838bf8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 08 八月 2026 16:16:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 9c3bf3d..456bf82 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -18,6 +18,7 @@
pwo.status as workOrderStatus,
u.nick_name as nickName,
p.product_name as productName,
+ pp.name as process,
pm.model as productModelName,
ppo.quantity,
ppo.scrap_qty,
@@ -26,6 +27,8 @@
from
production_product_main ppm
left join product_work_order pwo on pwo.id = ppm.work_order_id
+ left join product_process_route_item ppri on ppri.id = pwo.product_process_route_item_id
+ left join product_process pp on pp.id = ppri.process_id
left join product_order po on po.id = pwo.product_order_id
left join production_product_output ppo on ppm.id = ppo.product_main_id
left join product_model pm on pm.id = ppo.product_model_id
@@ -46,7 +49,7 @@
and ppm.status = #{c.status}
</if>
</where>
- order by ppm.id
+ order by ppm.id desc
</select>
<select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
--
Gitblit v1.9.3