From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java | 132 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 132 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java
new file mode 100644
index 0000000..b4202d8
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java
@@ -0,0 +1,132 @@
+package org.jeecg.modules.eam.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+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.io.Serializable;
+import java.util.Date;
+/**
+ * @Description: 璁惧鍊熷嚭褰掕繕
+ * @Author: jeecg-boot
+ * @Date: 2025-05-13
+ * @Version: V1.0
+ */
+@Data
+@TableName("eam_equipment_lean_out")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="eam_equipment_lean_out瀵硅薄", description="璁惧鍊熷嚭褰掕繕")
+public class EamEquipmentLeanOut implements Serializable {
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private Integer delFlag;
+ /**璁惧ID*/
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**鍗曟嵁鍙�*/
+ @Excel(name = "鍗曟嵁鍙�", width = 15)
+ @ApiModelProperty(value = "鍗曟嵁鍙�")
+ private String code;
+ /**鍊熷叆閮ㄩ棬*/
+ @Excel(name = "鍊熷叆閮ㄩ棬", width = 15, dictTable = "mdc_production", dicText = "production_name", dicCode = "id")
+ @ApiModelProperty(value = "鍊熷叆閮ㄩ棬")
+ @Dict(dicCode = "mdc_production, production_name, id")
+ private String leanDepartId;
+ /**鍊熷叆璐ｄ换浜�*/
+ @Excel(name = "鍊熷叆璐ｄ换浜�", width = 15)
+ @ApiModelProperty(value = "鍊熷叆璐ｄ换浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String leanPerson;
+ /**鍊熺敤鍘熷洜*/
+ @ApiModelProperty(value = "鍊熺敤鍘熷洜")
+ private String leanReason;
+ /**瀹℃壒绫诲瀷*/
+ @ApiModelProperty(value = "瀹℃壒绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
+ private String approvalDealType;
+ /**鍊熷嚭鐘舵��*/
+ @Excel(name = "鍊熷嚭鐘舵��", width = 15)
+ @ApiModelProperty(value = "鍊熷嚭鐘舵��")
+ @Dict(dicCode = "equipment_lean_out_status")
+ private String leanStatus;
+ /**鍊熷嚭寮�濮嬫椂闂�*/
+ @ApiModelProperty(value = "鍊熷嚭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date leanStartTime;
+ /**鍊熷嚭褰掕繕鏃堕棿*/
+ @ApiModelProperty(value = "褰掕繕鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date leanEndTime;
+ /**瀹℃牳浜�*/
+ @Excel(name = "瀹℃牳浜�", width = 15)
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String approvalUser;
+ /**瀹℃牳鎰忚*/
+ @Excel(name = "瀹℃牳鎰忚", width = 15)
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ private String approvalComment;
+ /**瀹℃牳鏃堕棿*/
+ @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date approvalTime;
+ /**纭浜�*/
+ @Excel(name = "纭浜�", width = 15)
+ @ApiModelProperty(value = "纭浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String confirmUser;
+ /**纭鎰忚*/
+ @Excel(name = "纭鎰忚", width = 15)
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /**纭鏃堕棿*/
+ @ApiModelProperty(value = "纭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
+ /**澶囨敞*/
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+ /**澶囨敞*/
+ @Excel(name = "褰掕繕澶囨敞", width = 15)
+ @ApiModelProperty(value = "褰掕繕澶囨敞")
+ private String returnComment;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+}
--
Gitblit v1.9.3