From 8885a814634fd9e4ee6485fca2bc1695d20da3d1 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 16 四月 2026 15:33:29 +0800
Subject: [PATCH] feat(production): 添加设备ID和名称到工单信息查询
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 44 ++++++++++++++++++++++++--------------------
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 1 +
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 2 ++
src/main/resources/static/work-order-template.docx | 0
4 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index d3f3e12..da2e3a8 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -45,4 +45,6 @@
private String workOrderType;
private String deviceName;
+
+ private Long deviceId;
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
index 4a68ce8..b0f663d 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -92,6 +92,7 @@
put("actualStartTime", productWorkOrderDto.getActualStartTime());
put("actualEndTime", productWorkOrderDto.getActualEndTime());
put("twoCode", Pictures.ofLocal(codePath).create());
+ put("deviceName", productWorkOrderDto.getDeviceName());
put("images", images.isEmpty()?null:images);
}});
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index f454d24..58559f7 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -52,30 +52,34 @@
</select>
<select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
- pwo.*,
- pp.NAME as processName,
- pm.model,
- pm.unit,
- p.product_name AS productName,
- po.nps_no AS productOrderNpsNo,
- ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
- sum(ppo.scrap_qty) scrapQty
+ pwo.*,
+ pp.NAME as processName,
+ pm.model,
+ pm.unit,
+ p.product_name AS productName,
+ 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
FROM
- product_work_order pwo
- LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
- LEFT JOIN production_product_main ppm ON ppm.work_order_id = pwo.id
- LEFT JOIN production_product_output ppo ON ppo.product_main_id = ppm.id
- LEFT JOIN product_order po ON po.id = pwo.product_order_id
- LEFT JOIN product_process pp ON pp.id = ppri.process_id
- LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
- LEFT JOIN product p ON p.id = pm.product_id
+ product_work_order pwo
+ LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
+ LEFT JOIN production_product_main ppm ON ppm.work_order_id = pwo.id
+ LEFT JOIN production_product_output ppo ON ppo.product_main_id = ppm.id
+ LEFT JOIN product_order po ON po.id = pwo.product_order_id
+ LEFT JOIN product_process pp ON pp.id = ppri.process_id
+ LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
+ 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.NAME ,
- pm.model,
- pm.unit,
- p.product_name,
- po.nps_no
+ pm.model,
+ pm.unit,
+ p.product_name,
+ po.nps_no
</select>
<select id="selectWorkOrderStartStats" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
diff --git a/src/main/resources/static/work-order-template.docx b/src/main/resources/static/work-order-template.docx
index 847a3b6..ab7dd17 100644
--- a/src/main/resources/static/work-order-template.docx
+++ b/src/main/resources/static/work-order-template.docx
Binary files differ
--
Gitblit v1.9.3