From 821f90c313e7864305af54ed669314e13b1dd98b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 16:56:49 +0800
Subject: [PATCH] feat: 添加备注字段支持
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 3 ++-
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 1 +
src/main/resources/mapper/basic/ProductModelMapper.xml | 3 ++-
src/main/java/com/ruoyi/basic/dto/ProductAndModelDto.java | 3 +++
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 2 ++
src/main/resources/static/work-order-template.docx | 0
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 3 +++
7 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductAndModelDto.java b/src/main/java/com/ruoyi/basic/dto/ProductAndModelDto.java
index 18cffe3..0095282 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductAndModelDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductAndModelDto.java
@@ -74,4 +74,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8",shape = JsonFormat.Shape.STRING)
private LocalDateTime updateTime;
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 035dd4a..cd3d69f 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -55,6 +55,9 @@
@Excel(name = "鍗曚綅")
private String unit;
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
/**
* 鐢熶骇鐐掓満
*/
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index b4b013c..06c7b41 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 drawingNumber;
+
+ private String remark;
}
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..5f2cb8e 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("remark", productWorkOrderDto.getRemark());
put("images", images.isEmpty()?null:images);
}});
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 47d5cd9..a94f6b4 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -117,7 +117,8 @@
pr.id as routeId,
pr.process_route_name as routeName,
pm.create_time as createTime,
- pm.update_time as updateTime
+ pm.update_time as updateTime,
+ pm.remark as remark
from product_model pm
left join product p on p.id = pm.product_id
left join process_route pr on pr.id = pm.route_id
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 48aa75b..555498e 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -60,7 +60,8 @@
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
+ sum(ppo.scrap_qty) scrapQty,
+ pm.remark
FROM
product_work_order pwo
LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
diff --git a/src/main/resources/static/work-order-template.docx b/src/main/resources/static/work-order-template.docx
index 21a63dc..f9321ed 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