From 6df2d854ea7d8b0d8200dd6572f1c3b5aabecc16 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 27 四月 2026 13:36:29 +0800
Subject: [PATCH] feat(productionPrintOrderExcel) 生产工单查询添加排序
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 58559f7..fef7112 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -49,6 +49,7 @@
<if test="c.productOrderId != null and c.productOrderId != ''">
and pwo.product_order_id = #{c.productOrderId}
</if>
+ order by po.id desc,pwo.id asc
</select>
<select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
@@ -60,8 +61,8 @@
po.nps_no AS productOrderNpsNo,
ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
sum(ppo.scrap_qty) scrapQty,
- ppm.device_id,
- ppm.device_name
+ pp.device_id,
+ pp.device_name
FROM
product_work_order pwo
LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -73,8 +74,8 @@
LEFT JOIN product p ON p.id = pm.product_id
WHERE pwo.id = #{id}
GROUP BY pwo.id, pwo.product_process_route_item_id, pwo.create_time, pwo.update_time, pwo.work_order_no, pwo.plan_start_time, pwo.plan_end_time, pwo.actual_start_time, pwo.actual_end_time, pwo.status, pwo.tenant_id, pwo.plan_quantity, pwo.product_order_id, pwo.complete_quantity,
- ppm.device_id,
- ppm.device_name,
+ pp.device_id,
+ pp.device_name,
pp.NAME ,
pm.model,
pm.unit,
@@ -92,12 +93,9 @@
actual_start_time >= #{startDate}
AND actual_start_time <= #{endDate}
</select>
- <select id="selectMax" resultType="com.ruoyi.production.pojo.ProductWorkOrder">
- SELECT SUBSTRING(work_order_no, 3) as work_order_no
+ <select id="selectMax" resultType="java.lang.Integer">
+ SELECT count(1)
FROM product_work_order
- WHERE SUBSTRING(work_order_no, 3) like concat(#{datePrefix},'%')
- order by work_order_no desc
- limit 1
- ;
+ WHERE SUBSTRING(work_order_no, 3) like concat('%',#{datePrefix},'%')
</select>
</mapper>
--
Gitblit v1.9.3