diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index f5d5503..5ae21a4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.*; import cn.estsh.i3plus.pojo.aps.holders.EResource; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; @@ -84,17 +83,17 @@ public class Resource extends BaseCode { @Column(name="EFFICIENCY_EFFECT") @ApiParam(value ="效率影响类型") - @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class) + @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer EfficiencyEffect; @Column(name="TIME_ROUND") @ApiParam(value ="时间圆整影响") - @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class) + @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer timeRound; @Column(name="TIME_TAIL_ROUND") @ApiParam(value ="时间尾数影响") - @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class) + @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer timeTailRound; @Column(name="LOCK_TYPE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java deleted file mode 100644 index f1da6b4..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :资源效率影响的计划类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-10-17 - * @Modify: - **/ -public enum EFFICIENCY_EFFECT { - PREV_SET(1), // 前设置 - PRODUCE(2), // 生产 - POST_SET(4); // 后设置 - - private int _value; - - EFFICIENCY_EFFECT(int value){ - _value = value; - } - - public int value() { - return this._value; - } -} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index b84ac79..11d5fe1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -324,6 +324,32 @@ public class ApsEnumUtil { } /** + * 资源效率影响类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EFFICIENCY_EFFECT { + PREV_SET(1, "前设置"), // 前设置 + PRODUCE(2, "生产"), // 生产 + POST_SET(4, "后设置"); // 后设置 + + private int value; + private String description; + + EFFICIENCY_EFFECT(int value, String description){ + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 预置的资源选择规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index a4862cb..2d2f84a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1053,7 +1053,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_QC_STATUS { - NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "ISOLATED", "报废"); + NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java index 5b3c105..53b974e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -51,6 +51,9 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("客户名称") private String customerName; + @ApiParam("客户零件号") + private String customerPartNo; + @ApiParam("客户物料名称") private String customerPartName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 6fe4ca3..59ebe07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -37,6 +37,10 @@ public class IfDismantleRecord extends BaseBean { @ApiParam("产线") private String workCenterCode; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + @Column(name = "PARENT_PART_NO") @ApiParam("产品物料编码") private String parentPartNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java index 6ab949d..65b038b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -19,8 +20,8 @@ import java.math.BigDecimal; @Data @NoArgsConstructor @AllArgsConstructor -@Api("动作函数关系model") -public class IfRawPartDataModel implements Serializable { +@Api("原材料信息model") +public class IfRawPartDataModel extends BaseBean { @ApiParam("id") private Long id;