rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【工艺路线】字段修改

This commit is contained in:
10001392 2024-12-05 08:54:04 +08:00
parent 65db1a15d4
commit b8e470621d
8 changed files with 80 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskAssemblyEntity.java
View File

@ -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;
}

12
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskEntity.java
View File

@ -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;

14
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskProcessesEntity.java
View File

@ -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;
}

3
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/query/ProcessRouteTaskQuery.java
View File

@ -26,9 +26,12 @@ public class ProcessRouteTaskQuery {
private List<String> materialNoList;
private String createdBy;
private String createdByName;
private String updatedBy;
private String updatedByName;
private String factory;
private Integer status;

14
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskAssemblyVO.java
View File

@ -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;
}

21
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskProcessesVO.java
View File

@ -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;
}

10
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java
View File

@ -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;

2
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessWorkCenterVO.java
View File

@ -98,7 +98,7 @@ public class ProcessWorkCenterVO implements Serializable {
private Date updateTime;
// 虚拟工作中心
private Date workingType;
private String workingType;
}