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 6ed4888..498cdfb 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 @@ -1809,8 +1809,10 @@ public class MesPcnEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单"); -// JIT_ORDER(50, "JIT工单"); + BH_ORDER(40, "B&H工单"), + JIT_ORDER(50, "JIT工单"), + STOCK_ORDER(60, "库存工单"), + REPAIR(70,"返修插单"); private int value; private String description; @@ -2005,7 +2007,8 @@ public class MesPcnEnumUtil { public enum QUEUE_ORDER_DETAIL_STATUS { NORMAL(10, "正常"), - CLOSE(20, "关闭"); + CLOSE(20, "关闭"), + FINISH(30, "完成"); private int value; private String description; @@ -3639,4 +3642,40 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 生产队列 队列类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_QUEUE_TYPE { + PRODUCT_QUEUE(10, "生产队列"), + PRELOAD_QUEUE(20, "预装队列"); + + private int value; + private String description; + + QUEUE_ORDER_QUEUE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartStockScheduleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartStockScheduleModel.java new file mode 100644 index 0000000..efc1571 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartStockScheduleModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/5/18 5:10 下午 + * @Modify: + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PartStockScheduleModel { + + private String partNo; + + private Integer boxQty; + + private Double qty; +}