From 7f11e541f239d8c816bcefb32aae6b9efa31e28e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:49:15 +0800
Subject: [PATCH] 生产线点检
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
index 1d08152..dc284b0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
@@ -16,6 +16,7 @@
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -94,27 +95,28 @@
* 澶囩敤瀛楁1
*/
@ApiModelProperty(value = "澶囩敤瀛楁1")
- private String err_uda1;
+ @Dict(dicCode = "is_product")
+ private String errUda1;
/**
* 澶囩敤瀛楁2
*/
@ApiModelProperty(value = "澶囩敤瀛楁2")
- private String err_uda2;
+ private String errUda2;
/**
* 澶囩敤瀛楁3
*/
@ApiModelProperty(value = "澶囩敤瀛楁3")
- private String err_uda3;
+ private String errUda3;
/**
* 澶囩敤瀛楁4
*/
@ApiModelProperty(value = "澶囩敤瀛楁4")
- private String err_uda4;
+ private String errUda4;
/**
* 澶囩敤瀛楁5
*/
@ApiModelProperty(value = "澶囩敤瀛楁5")
- private String err_uda5;
+ private String errUda5;
/**
* 鐘舵��
*/
@@ -159,7 +161,6 @@
*/
@TableField(exist = false)
private String equipmentName;
-
/**
* 璁惧鍨嬪彿
*/
@@ -171,10 +172,25 @@
*/
@TableField(exist = false)
private String equipmentSpecification;
-
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date acceptTime;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date finishTime;
+ private BigDecimal faultHour;
/**
* 闄勪欢涓婁紶鍒楄〃
*/
@TableField(exist = false)
private List<SysUpload> sysUploadList;
+ @TableField(exist = false)
+ private String teamId;
+ @TableField(exist = false)
+ private String partNumber;
+ @TableField(exist = false)
+ private Integer quantity;
+ @TableField(exist = false)
+ private String batchNo;
+
}
--
Gitblit v1.9.3