From 9de1d40d3a61ce166c63a2c07d02d89bf8bdabd0 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期五, 07 三月 2025 16:16:18 +0800 Subject: [PATCH] art: 选择设备查询逻辑修改, 点检工单新增时产线逻辑修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java index 5ac21d5..1a5af69 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java @@ -1,9 +1,11 @@ package org.jeecg.modules.eam.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @@ -29,8 +31,14 @@ @Excel(name = "浣跨敤閮ㄩ棬") private String useId; + @Excel(name = "涓績") + private String workCenterId; + @Excel(name = "宸ュ尯") private String factoryModelId; + + @Excel(name = "宸ユ") + private String areaId; @Excel(name = "缁存姢閮ㄩ棬") private String manageId; @@ -122,5 +130,10 @@ @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyyMMdd") private Date nextTechnologyStatusQualificationTime; + @Excel(name = "涓変繚鏃ユ湡", format = "yyyy-MM-dd") + private java.util.Date thirdMaintenanceTime; + + @Excel(name = "鎶�鏈姸鎬侀壌瀹氭棩鏈�", format = "yyyy-MM-dd") + private java.util.Date technologyStatusQualificationTime; } -- Gitblit v1.9.3