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 a61cf7b..58b3d1e 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 @@ -13,6 +13,44 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * 包装层级 MES_PACKAGE + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_PACKLEVEL { + + FIRST(1, "第一层"), + SECOND(2, "第二层"), + THIRD(3, "第三层"), + FOURTH(4, "第四层"); + + private int value; + private String description; + + PACKAGE_PACKLEVEL(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; + } + } + + /** * MesIf 交互方式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index 7e6eff9..6ee033d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -49,4 +49,5 @@ public class MesLabelTemplate extends BaseBean { @Transient @ApiParam(value = "模板id对应的模板参数") private List labelTemplateParamList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java new file mode 100644 index 0000000..5c0b2ab --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 产品/包装打印模板model + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +public class SnPrintTemplateModel implements Serializable { + + @ApiParam("产品条码模板") + private MesLabelTemplate prodSnPrintTemplate; + + @ApiParam("包装条码模板集合") + private List packageSnPrintTemplateList; + +}