From b852254d90e7d1955db31db154193ec8ee84d8b3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 09 九月 2026 10:57:59 +0800
Subject: [PATCH] feat(hrm): 新增员工用工性质、班组归属字段及考勤异常处理优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java
index 5d46e43..094c1cd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java
@@ -23,6 +23,10 @@
@ExcelProperty("璁惧缂栫爜")
private String code;
+ @Schema(description = "鏁伴噰璁惧ID锛堝閮ㄦ暟閲� tbDeviceId锛�", example = "tb_001")
+ @ExcelProperty("鏁伴噰璁惧ID")
+ private String tbDeviceId;
+
@Schema(description = "璁惧鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "CNC 鍔犲伐涓績")
@ExcelProperty("璁惧鍚嶇О")
private String name;
@@ -66,6 +70,25 @@
@ExcelProperty("澶囨敞")
private String remark;
+ @Schema(description = "鐢熶骇鏁堢巼锛堟瘡灏忔椂锛�", example = "10.5")
+ @ExcelProperty("鐢熶骇鏁堢巼(姣忓皬鏃�)")
+ private java.math.BigDecimal productionEfficiency;
+
+ @Schema(description = "浼犻�佸饱甯︼紙2=鍙屽�嶆晥鐜囷級", example = "2")
+ @ExcelProperty("浼犻�佸饱甯�")
+ private Integer conveyorBelt;
+
+ @Schema(description = "宸ヤ綔绔欑紪鍙�", example = "300")
+ private Long workstationId;
+
+ @Schema(description = "宸ヤ綔绔欏悕绉�", example = "涓�鍙峰伐浣滅珯")
+ @ExcelProperty("宸ヤ綔绔�")
+ private String workstationName;
+
+ @Schema(description = "瀵瑰簲鐗╂枡缂栧彿", example = "1000")
+ @ExcelProperty("鐗╂枡缂栧彿")
+ private Long itemId;
+
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
--
Gitblit v1.9.3