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-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java | 89 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 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 new file mode 100644 index 0000000..84e5d7a --- /dev/null +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java @@ -0,0 +1,89 @@ +package org.jeecg.modules.dnc.entity; + +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 implements Serializable { + private static final long serialVersionUID = 1529244980533421687L; + //宸ユid + @TableId(value = "id") + private String id; + //浜у搧id + @TableField(value = "product_id") + private String productId; + //閮ㄤ欢id + @TableField(value = "component_id") + private String componentId; + //闆朵欢id + @TableField(value = "parts_id") + private String partsId; + //宸ヨ壓瑙勭▼id + @TableField(value = "psv_id") + private String psvId; + //宸ュ簭id + @TableField(value = "process_id") + private String processId; + //宸ユ鍚嶇О + @TableField(value = "step_name") + private String stepName; + //宸ユ鍙� + @TableField(value = "step_code") + private String stepCode; + //宸ヨ壓缂栧彿 + @TableField(value = "craft_no") + private String craftNo; + //宸ヨ壓瑙勭▼鐗堟湰 + @TableField(value = "craft_version") + private String craftVersion; + //宸ユ绫诲瀷 + @TableField(value = "step_type") + private Integer stepType; + //宸ュ簭鎻忚堪 + @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; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @TableField(value = "update_time", fill = FieldFill.INSERT) + private Date updateTime; + @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