From cf7d913ff24fce658f72cb996d056ccdaf1b96e0 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 17 三月 2025 11:36:50 +0800
Subject: [PATCH] 新增设备类信息管理，修改bug，删除多余结构
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java | 58 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
index 6bb633f..84e5d7a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
@@ -1,24 +1,25 @@
package org.jeecg.modules.dnc.entity;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.jeecg.common.aspect.annotation.Dict;
+import java.io.Serializable;
import java.util.Date;
@Data
@NoArgsConstructor
@TableName(value = "nc_work_step")
@Api(value = "宸ユ")
-public class WorkStep {
+public class WorkStep implements Serializable {
+ private static final long serialVersionUID = 1529244980533421687L;
//宸ユid
- @TableField(value = "step_id")
- private String stepId;
+ @TableId(value = "id")
+ private String id;
//浜у搧id
@TableField(value = "product_id")
private String productId;
@@ -28,6 +29,9 @@
//闆朵欢id
@TableField(value = "parts_id")
private String partsId;
+ //宸ヨ壓瑙勭▼id
+ @TableField(value = "psv_id")
+ private String psvId;
//宸ュ簭id
@TableField(value = "process_id")
private String processId;
@@ -46,20 +50,40 @@
//宸ユ绫诲瀷
@TableField(value = "step_type")
private Integer stepType;
- @JsonIgnore
- @TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
+ //宸ュ簭鎻忚堪
+ @TableField(value = "description")
+ private String description;
+ //鍔犲伐璁惧缂栧彿
+ @TableField(value = "device_no")
+ private String deviceNo;
+ //宸ヨ缂栧彿
+ @TableField(value = "assemble_no")
+ private String assembleNo;
+ //宸ヨ鍚嶇О
+ @TableField(value = "assemble_name")
+ private String assembleName;
+ @TableField(value = "processing_equipment_model")
+ private String processingEquipmentModel;
+ @TableField(value = "processing_equipment_os")
+ private String processingEquipmentOs;
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
- @JsonIgnore
- @TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @TableField(value = "update_time", fill = FieldFill.INSERT)
private Date updateTime;
- @JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
- @JsonIgnore
- @TableField(value = "update_user", select = false, fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String createBy;
+ @TableField(value = "update_by", fill = FieldFill.UPDATE)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
private Integer deleteFlag = 0;
+ //鍒涘缓浜�
+ private transient String createName;
+ //鏇存柊浜�
+ private transient String updateName;
}
--
Gitblit v1.9.3