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 96d78a8..7849af1 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 @@ -3161,6 +3161,7 @@ public class MesEnumUtil { return tmp; } } + /** * 质量标准配置 */ @@ -3168,7 +3169,8 @@ public class MesEnumUtil { public enum QUALITY_STANDARD_TYPE { NG_RATE(10, "不良率"), - PPM(20, "PPM"); + INNER_PPM(20, "PPM"), + ONLINE_PPM(30, "线上PPM"); private int value; private String description; @@ -3233,6 +3235,7 @@ public class MesEnumUtil { return tmp; } } + /** * MesProduceSn实体对应的qcStatus值 条码表条码质量状态 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java new file mode 100644 index 0000000..f66ba69 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/12 4:00 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_WMS_PPM") +@Api("WMS PPM 接口表") +public class IfWmsPpm extends BaseBean { + + @Column(name = "YEAR") + @ApiParam("年") + private String year; + + @Column(name = "MONTH") + @ApiParam("月") + private String month; + + @Column(name = "PPM_VALUE") + @ApiParam("PPM值") + private String ppmValue; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java index c5a3c6e..ed73333 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java @@ -66,6 +66,9 @@ public class ProductBiModel { @ApiParam("x坐标内容") private List xAxis; + @ApiParam("一些携带值 eg:异常类型,异常次数") + private Map carryMap; + @ApiParam("图表显示的数据") private List series; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfWmsPpmRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfWmsPpmRepository.java new file mode 100644 index 0000000..4c96fa6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfWmsPpmRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfWmsPpm; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface IfWmsPpmRepository extends BaseRepository { +}