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/RepairOrder.java | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
index d70ea19..158de49 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
@@ -66,6 +66,26 @@
@ApiModelProperty(value = "浣跨敤閮ㄩ棬ID")
@Dict(dicCode = "id",dictTable ="sys_depart",dicText = "depart_name")
private String departId;
+ /**
+ * 鏁呴殰鍘熷洜
+ */
+ @ApiModelProperty(value = "鏁呴殰鍘熷洜")
+ private String faultReason;
+ /**
+ * 鏁呴殰鐜拌薄
+ */
+ @ApiModelProperty(value = "鏁呴殰鐜拌薄")
+ private String faultPhenomenon;
+ /**
+ * 鏁呴殰鎺掗櫎
+ */
+ @ApiModelProperty(value = "鏁呴殰鎺掗櫎")
+ private String faultRemove;
+ /**
+ * 棰勯槻鎺柦
+ */
+ @ApiModelProperty(value = "棰勯槻鎺柦")
+ private String preventiveMeasure;
/**鏁呴殰鎻忚堪*/
@Excel(name = "鏁呴殰鎻忚堪", width = 15)
@ApiModelProperty(value = "鏁呴殰鎻忚堪")
@@ -125,8 +145,8 @@
private BigDecimal workingHourQuota;
/**宸ュ崟鎵ц鐘舵�侊紙鏁版嵁瀛楀吀锛歳epair_order_status锛�*/
@Excel(name = "宸ュ崟鎵ц鐘舵�侊紙鏁版嵁瀛楀吀锛歳epair_order_status锛�", width = 15)
- @ApiModelProperty(value = "宸ュ崟鎵ц鐘舵�侊紙鏁版嵁瀛楀吀锛歳epair_order_status锛�")
- @Dict(dicCode = "repair_order_status")
+ @ApiModelProperty(value = "宸ュ崟鎵ц鐘舵�侊紙鏁版嵁瀛楀吀锛歵rue_repair_status锛�")
+ @Dict(dicCode = "true_repair_status")
private String status;
/**缁翠繚鏂瑰紡*/
@Excel(name = "缁翠繚鏂瑰紡", width = 15)
@@ -136,23 +156,32 @@
/**澶囩敤瀛楁1*/
@Excel(name = "澶囩敤瀛楁1", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁1")
+ @Dict(dicCode = "repair_status")
private String repairOrderUda1;
/**澶囩敤瀛楁2*/
@Excel(name = "澶囩敤瀛楁2", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁2")
- private String repairOrderUda2;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date repairOrderUda2;
/**澶囩敤瀛楁3*/
@Excel(name = "澶囩敤瀛楁3", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁3")
- private String repairOrderUda3;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date repairOrderUda3;
/**澶囩敤瀛楁4*/
@Excel(name = "澶囩敤瀛楁4", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁4")
- private String repairOrderUda4;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date repairOrderUda4;
/**澶囩敤瀛楁5*/
@Excel(name = "澶囩敤瀛楁5", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁5")
- private String repairOrderUda5;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date repairOrderUda5;
/**鍒涘缓浜�*/
@ApiModelProperty(value = "鍒涘缓浜�")
private String createBy;
@@ -227,6 +256,11 @@
@Dict(dicCode = "repair_order_business_type")
private String businessType;
+ private BigDecimal spareTime;
+
+ private BigDecimal partTime;
+
+
@TableField(exist = false)
private String equipmentNum;
@@ -259,5 +293,25 @@
List<RepairOrderActualWorkHours> actualHours;
@TableField(exist = false)
List<RepairOrderDetail> orderDetails;
+ @TableField(exist = false)
+ private String factoryModelId;
+ @TableField(exist = false)
+ private String equipmentCategoryId;
+ @TableField(exist = false)
+ private String userId;
+ @TableField(exist = false)
+ private String nums;
+ @TableField(exist = false)
+ private String errUda2;
+ @TableField(exist = false)
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date acceptTime;
+ @TableField(exist = false)
+ private String errUda3;
+ @TableField(exist = false)
+ private BigDecimal faultHour;
+
+
}
--
Gitblit v1.9.3