From 0388c36c411ec438f4590f8a60c19646d7f67d69 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 17 Jun 2020 14:51:48 +0800 Subject: [PATCH] mes --- .../estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 ++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 20 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 8 ++++++++ 3 files changed, 32 insertions(+), 2 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 7fc29e9..cc97315 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 @@ -3248,7 +3248,8 @@ public class MesEnumUtil { BH_ORDER(40, "B&H工单"), JIT_ORDER(50, "JIT工单"), STOCK_ORDER(60, "库存工单"), - REPAIR(70, "返修插单"); + REPAIR(70, "返修插单"), + FICTIVE(80, "虚拟工单"); private int value; private String description; @@ -4897,7 +4898,8 @@ public class MesEnumUtil { public enum PART_TRAIT { NORMAL(10, "正常件"), FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"), - FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"); + FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"), + FICTIVE(40, "虚拟件"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index b65531b..e2b4a01 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -96,6 +96,26 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("物料特性") private Integer partTrait; + @Column(name = "COLOR_CODE") + @ApiParam("颜色代码") + private String colorCode; + + @Column(name = "SHELVES_AMOUNT") + @ApiParam("挂架数") + private Integer shelvesAmount; + + @Column(name = "QUANTITY_PER_RACK") + @ApiParam("挂架可放零件数") + private Integer quantityPerRack; + + @Column(name = "PAINT_TANK_CODE") + @ApiParam("供漆罐代码") + private String paintTankCode; + + @Column(name = "PRE_PART_NO") + @ApiParam("打磨件物料号") + private String prePartNo; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index f244016..d09d54d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -173,6 +173,14 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("预留字段5") private String reserved5; + @Column(name = "RESERVED6") + @ApiParam("预留字段6") + private String reserved6; + + @Column(name = "RESERVED7") + @ApiParam("预留字段7") + private String reserved7; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1")