From b8e470621dd5d513f87542c10c4d5e624b29438e Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Thu, 5 Dec 2024 08:54:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=E3=80=91=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessRouteTaskAssemblyEntity.java | 10 +++++++++ .../pojo/entity/ProcessRouteTaskEntity.java | 12 +++++++++++ .../ProcessRouteTaskProcessesEntity.java | 14 +++++++++---- .../pojo/query/ProcessRouteTaskQuery.java | 3 +++ .../pojo/vo/ProcessRouteTaskAssemblyVO.java | 14 +++++++++++++ .../pojo/vo/ProcessRouteTaskProcessesVO.java | 21 ++++++++++++++++++- .../pojo/vo/ProcessRouteTaskVO.java | 10 +++++++++ .../pojo/vo/ProcessWorkCenterVO.java | 2 +- 8 files changed, 80 insertions(+), 6 deletions(-) diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskAssemblyEntity.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskAssemblyEntity.java index 758d6446..989ab3b7 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskAssemblyEntity.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskAssemblyEntity.java @@ -106,5 +106,15 @@ public class ProcessRouteTaskAssemblyEntity implements Serializable { @TableField(value = "updated_time",fill = FieldFill.INSERT_UPDATE) private LocalDateTime updatedTime; + /** + * 创建人姓名 + */ + @TableField(value = "created_by_name") + private String createdByName; + /** + * 更新人姓名 + */ + @TableField(value = "updated_by_name") + private String updatedByName; } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskEntity.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskEntity.java index 26a4fd5f..ca94545a 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskEntity.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskEntity.java @@ -73,6 +73,12 @@ public class ProcessRouteTaskEntity implements Serializable { @TableField(value = "created_by",fill = FieldFill.INSERT) private String createdBy; + /** + * 创建人姓名 + */ + @TableField(value = "created_by_name") + private String createdByName; + // 创建时间 @TableField(value = "created_time",fill = FieldFill.INSERT) private LocalDateTime createdTime; @@ -81,6 +87,12 @@ public class ProcessRouteTaskEntity implements Serializable { @TableField(value = "updated_by",fill = FieldFill.INSERT_UPDATE) private String updatedBy; + /** + * 更新人姓名 + */ + @TableField(value = "updated_by_name") + private String updatedByName; + // 更新时间 @TableField(value = "updated_time",fill = FieldFill.INSERT_UPDATE) private LocalDateTime updatedTime; diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskProcessesEntity.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskProcessesEntity.java index 8acc00b3..40878427 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskProcessesEntity.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskProcessesEntity.java @@ -38,10 +38,6 @@ public class ProcessRouteTaskProcessesEntity implements Serializable { @TableField(value = "work_center") private String workCenter; - // 工厂编码 - @TableField(value = "factory") - private String factory; - // 控制码 @TableField(value = "control_code") private String controlCode; @@ -142,5 +138,15 @@ public class ProcessRouteTaskProcessesEntity implements Serializable { @TableField(value = "updated_time",fill = FieldFill.INSERT_UPDATE) private LocalDateTime updatedTime; + /** + * 创建人姓名 + */ + @TableField(value = "created_by_name") + private String createdByName; + /** + * 更新人姓名 + */ + @TableField(value = "updated_by_name") + private String updatedByName; } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/query/ProcessRouteTaskQuery.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/query/ProcessRouteTaskQuery.java index cd0cea51..a4254bd2 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/query/ProcessRouteTaskQuery.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/query/ProcessRouteTaskQuery.java @@ -26,9 +26,12 @@ public class ProcessRouteTaskQuery { private List materialNoList; private String createdBy; + private String createdByName; private String updatedBy; + private String updatedByName; + private String factory; private Integer status; diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskAssemblyVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskAssemblyVO.java index e173d393..052770cc 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskAssemblyVO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskAssemblyVO.java @@ -83,5 +83,19 @@ public class ProcessRouteTaskAssemblyVO implements Serializable { // 更新时间 private LocalDateTime updatedTime; + /** + * 创建人姓名 + */ + private String createdByName; + /** + * 更新人姓名 + */ + private String updatedByName; + + // 物料描述 + private String materialDesc; + + // BOM表头物料描述 + private String parentMaterialDesc; } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskProcessesVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskProcessesVO.java index bab155ad..2ea61226 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskProcessesVO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskProcessesVO.java @@ -29,9 +29,20 @@ public class ProcessRouteTaskProcessesVO implements Serializable { // 工序 private String processe; - // 工作中心 + // 工作中心 start private String workCenter; + //名称 + private String workCenterName; + + //标准文本码 + private String standardTextCode; + + //标准文本码描述 + private String standardTextCodeDescription; + + // 工作中心 end + // 工厂编码 private String factory; @@ -110,5 +121,13 @@ public class ProcessRouteTaskProcessesVO implements Serializable { // 更新时间 private LocalDateTime updatedTime; + /** + * 创建人姓名 + */ + private String createdByName; + /** + * 更新人姓名 + */ + private String updatedByName; } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java index 6fed3dd8..365b2c22 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java @@ -60,6 +60,11 @@ public class ProcessRouteTaskVO extends BaseMaterialVO implements Serializable { // 创建人 private String createdBy; + /** + * 创建人姓名 + */ + private String createdByName; + // 创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT-8") private LocalDateTime createdTime; @@ -71,6 +76,11 @@ public class ProcessRouteTaskVO extends BaseMaterialVO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT-8") private LocalDateTime updatedTime; + /** + * 更新人姓名 + */ + private String updatedByName; + // 处理状态：1=修改中、2=暂存中、3=已完成 private Integer handleState; diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessWorkCenterVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessWorkCenterVO.java index c6047272..27f0b941 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessWorkCenterVO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessWorkCenterVO.java @@ -98,7 +98,7 @@ public class ProcessWorkCenterVO implements Serializable { private Date updateTime; // 虚拟工作中心 - private Date workingType; + private String workingType; }