From a7ad8c17aa069e723aa0a813cf198d07e67b5fb5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 14 三月 2025 14:19:08 +0800
Subject: [PATCH] 新增刀具、设备类信息管理，新增结构树优化，优化权限分配，新增双控设备结构书 修改flow模块 删除部分废弃yml配置
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 7bbf9de..eb70788 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import lombok.Data;
@@ -31,6 +32,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;
@@ -61,22 +65,28 @@
//宸ヨ鍚嶇О
@TableField(value = "assemble_name")
private String assembleName;
- @JsonIgnore
- @TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
+ @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_by", select = false, fill = FieldFill.INSERT)
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String createBy;
- @JsonIgnore
- @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ @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