From 233853e1e6d5865999337ff1cafbe6fb2223f77c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 15 Oct 2020 16:26:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=92=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 7 ++++--- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java | 4 ++++ 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 3720c98..ab52cf1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3416,7 +3416,8 @@ public class MesEnumUtil { REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), SPARE_RETURN_REPAIR(140, "客退备件返修"), - SEIZE_SEAT_ORDER(150, "占位工单"); + SEIZE_SEAT_ORDER(150, "占位工单"), + SAMPLE_ORDER(160, "样件工单"); private int value; private String description; @@ -3581,11 +3582,11 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_ORDER_STATUS { + WAIT_LANDED(5, "待下达"), NORMAL(10, "正常"), ONLINE(20, "已上线"), OFFLINE(30, "已下线"), - CLOSE(40, "已关闭"), - ; + CLOSE(40, "已关闭"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index bcf75a5..6007e48 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2075,8 +2075,7 @@ public class MesPcnEnumUtil { NORMAL(10, "正常"), ONLINE(20, "已上线"), OFFLINE(30, "已下线"), - CLOSE(40, "已关闭"), - ; + CLOSE(40, "已关闭"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 82bfdf1..a885bce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -79,10 +79,18 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + @Column(name = "STOCK_QTY") @ApiParam("排程实时库存") private Integer stockQty; + @Column(name = "MIN_GEN_LOT") + @ApiParam("最小生成批次") + private Integer minGenLot; + @Transient @ApiParam("物料名称") private String partName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 5162f3d..20308b4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -122,6 +122,14 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("特殊标识") private Integer specialFlag; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Transient @ApiParam("起始车号") private String custFlagNoStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index b677ede..cd9ba33 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -55,4 +55,8 @@ public class MesRouteProcessCell extends BaseBean implements Serializable { @ApiParam("工序代码名称") private String processCodeName; + @Transient + @ApiParam("正在生产队列数量") + private Integer genningNum; + }