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 f7e1f81..e692e07 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 @@ -11,6 +11,41 @@ import com.fasterxml.jackson.annotation.JsonFormat; **/ public class MesEnumUtil { + /** + * 作业程序组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_MODULE_TYPE { + MONITOR_MODULE(10, "监听组件"), + REVEAL_MODULE(10, "展示组件"), + BUTTON_MODULE(30, "按钮组件"); + + private int value; + private String description; + + WORK_MODULE_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; + } + } /** * 排序方式 @@ -3470,7 +3505,6 @@ public class MesEnumUtil { public enum QUALITY_OBJECT_TYPE { ORGANIZE(10, "工厂"), - WORK_CENTER_CODE(20, "产线"), PRODUCT(30, "产品"); private int value; 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 23b4120..af0c84d 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 @@ -13,6 +13,42 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 作业程序组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_MODULE_TYPE { + MONITOR_MODULE(10, "监听组件"), + REVEAL_MODULE(10, "展示组件"), + BUTTON_MODULE(30, "按钮组件"); + + private int value; + private String description; + + WORK_MODULE_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; + } + } + + /** * 监听任务明细-采集数据方式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -2023,7 +2059,7 @@ public class MesPcnEnumUtil { } /** - * MesPartCategory实体对应的categoryType值 条码表条码质量状态 + * MesPartCategory实体对应的categoryType值 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PART_CATEGORY_TYPE { @@ -2323,8 +2359,7 @@ public class MesPcnEnumUtil { PACKAGE_SCAN(35, "打包扫描"), INSTOCKED(40, "入库"), SHIPING(50, "发运"), - CLOSE(90, "关闭"), - ; + CLOSE(90, "关闭"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartDismantleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartDismantleModel.java new file mode 100644 index 0000000..86d0dd4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartDismantleModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class PartDismantleModel { + + @ApiParam("子物料编码") + private String itemPartNo; + + @ApiParam("子物料名称") + private String itemPartName; + + @ApiParam("拆解数") + private BigDecimal dismantleQty; + + @ApiParam("合格数") + private BigDecimal okQty; + + @ApiParam("缺失数") + private BigDecimal missQty; + + @ApiParam("报废数") + private BigDecimal scrapQty; + +}