diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 3f2bef5..571dd6c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -74,6 +74,10 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("目标合格率") private Double targetPassRate; + @Column(name = "STAND_TAKT") + @ApiParam("标准节拍") + private Integer standTakt; + @Transient @ApiParam(value = "子集列表") private List childTreeList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java new file mode 100644 index 0000000..166c188 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/9/2 5:00 下午 + * @Modify: + */ +@Data +public class AssistModuleModel { + + @ApiParam("标准节拍") + private Integer standTakt; + + @ApiParam("x坐标内容") + private List xAxis; + + @ApiParam("y坐标内容") + private List yAxis; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index c130f5b..7cbd75b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -88,6 +88,9 @@ public class GenSerialNoModel { @ApiParam("零件号后4位") private String partNoAfterFour; + @ApiParam("客户工厂代码") + private String custProdLineCode; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode;