From b2daf9fd9c79d05ab9796400bc66d5fee81efef4 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 12 Dec 2019 09:38:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?task=20`1300`=20=201=09BI=20=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 127 +++++++++++++++++++-- .../pojo/mes/bean/MesQualityStandardCfg.java | 52 +++++++++ .../i3plus/pojo/mes/model/ProductBiModel.java | 18 ++- .../pojo/mes/model/ProductBiSeriesModel.java | 1 - .../MesQualityStandardCfgRepository.java | 14 +++ 5 files changed, 196 insertions(+), 16 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardCfgRepository.java 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 d389317..b36cc75 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,40 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CALENDAR_TYPE { + DAY(10, "日"), + WEEK(20, "周"), + MONTH(30, "月"), + YEAR(40, "年"); + + private int value; + private String description; + + CALENDAR_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) public enum TRUE_OR_FALSE { TRUE(1, "是"), FALSE(2, "否"); @@ -1368,16 +1402,16 @@ public class MesEnumUtil { MES_OBJECT_CFG(230, "对象结构"), MES_WC_CHECK(240, "开线检查"), MES_QC_CHECK_STANDARD(250, "质量检测标准"), - MES_FAULT_CAUSE(260,"设备故障原因"), - MES_FAULT_METHOD(270,"设备故障处理措施"), - MES_FAULT_PHENOMENON(280,"设备故障现象"), - MES_DEFECT(290,"缺陷"), - MES_DEFECT_CAUSE(300,"缺陷原因"), - MES_SCRAP(310,"报废原因"), - MES_REPAIR(320,"质量数据处理措施"), - MES_EQU_TASK_PLAN(330,"设备作业周期计划"), - MES_PART_OJBECT(340,"物料对象"), - MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"); + MES_FAULT_CAUSE(260, "设备故障原因"), + MES_FAULT_METHOD(270, "设备故障处理措施"), + MES_FAULT_PHENOMENON(280, "设备故障现象"), + MES_DEFECT(290, "缺陷"), + MES_DEFECT_CAUSE(300, "缺陷原因"), + MES_SCRAP(310, "报废原因"), + MES_REPAIR(320, "质量数据处理措施"), + MES_EQU_TASK_PLAN(330, "设备作业周期计划"), + MES_PART_OJBECT(340, "物料对象"), + MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"); private int value; private String description; @@ -3079,6 +3113,79 @@ public class MesEnumUtil { } /** + * 质量标准配置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUALITY_STANDARD_TYPE { + + NG_RATE(10, "不良率"), + PPM(20, "PPM"); + + private int value; + private String description; + + QUALITY_STANDARD_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) + public enum QUALITY_OBJECT_TYPE { + + ORGANIZE(10, "工厂"), + WORK_CENTER_CODE(20, "产线"), + PRODUCT(30, "产品"); + + private int value; + private String description; + + QUALITY_OBJECT_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; + } + } + + /** * MesProduceSn实体对应的qcStatus值 条码表条码质量状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java new file mode 100644 index 0000000..0180221 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :质量标准配置 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUALITY_STANDARD_CFG") +@Api("质量标准配置") +public class MesQualityStandardCfg extends BaseBean { + + @Column(name = "STANDARD_TYPE") + @ApiParam("标准类型") + private Integer standardType; + + @Column(name = "OBJECT_TYPE") + @ApiParam("对象类型") + private Integer objectType; + + @Column(name = "OBJECT_KEY_VALUE") + @ApiParam("对象键值") + private String objectKeyValue; + + @Column(name = "OBJECT_KEY") + @ApiParam("对象键") + private String objectKey; + +} 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 0104edc..c5a3c6e 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 @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; +import java.util.Map; /** * @Description : 用于产线运行情况数据 @@ -39,7 +40,7 @@ public class ProductBiModel { private double outputQty; @ApiParam(value = "完成率") - private double CompleteRate; + private double completeRate; @ApiParam(value = "合格数量") private double passQty; @@ -53,6 +54,9 @@ public class ProductBiModel { @ApiParam(value = "不良率") private double ngRate; + @ApiParam(value = "警戒值") + private double sentinelValue; + @ApiParam("客户代码") private String customerCode; @@ -65,12 +69,16 @@ public class ProductBiModel { @ApiParam("图表显示的数据") private List series; + @ApiParam("列名") + private Map colMap; + + @Deprecated public double getCompleteRate() { - if(this.planQty != 0) { - this.CompleteRate = outputQty / planQty; + if (this.planQty != 0) { + this.completeRate = outputQty / planQty; } else { - this.CompleteRate = 0; + this.completeRate = 0; } - return this.CompleteRate; + return this.completeRate; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java index d7b15f8..17d1089 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.mes.model; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardCfgRepository.java new file mode 100644 index 0000000..cfe91d2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardCfgRepository.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.MesQualityStandardCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesQualityStandardCfgRepository extends BaseRepository { +} From ef34a13313126e8156ef725873c8e083061014e3 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 12 Dec 2019 09:47:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?task=20`1300`=20=202=09BI=20=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 95 +++++++++++++++++++--- 1 file changed, 83 insertions(+), 12 deletions(-) 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 375c0d3..96d78a8 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 @@ -1450,18 +1450,18 @@ public class MesEnumUtil { MES_OBJECT_CFG(230, "对象结构"), MES_WC_CHECK(240, "开线检查"), MES_QC_CHECK_STANDARD(250, "质量检测标准"), - MES_FAULT_CAUSE(260,"设备故障原因"), - MES_FAULT_METHOD(270,"设备故障处理措施"), - MES_FAULT_PHENOMENON(280,"设备故障现象"), - MES_DEFECT(290,"缺陷"), - MES_DEFECT_CAUSE(300,"缺陷原因"), - MES_SCRAP(310,"报废原因"), - MES_REPAIR(320,"质量数据处理措施"), - MES_EQU_TASK_PLAN(330,"设备作业周期计划"), - MES_PART_OJBECT(340,"物料对象"), - MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"), - MES_DATASOURCE(360,"DB地址清单"), - MES_EQU_TASK_NOTIFY_CFG(370,"设备通知配置"); + MES_FAULT_CAUSE(260, "设备故障原因"), + MES_FAULT_METHOD(270, "设备故障处理措施"), + MES_FAULT_PHENOMENON(280, "设备故障现象"), + MES_DEFECT(290, "缺陷"), + MES_DEFECT_CAUSE(300, "缺陷原因"), + MES_SCRAP(310, "报废原因"), + MES_REPAIR(320, "质量数据处理措施"), + MES_EQU_TASK_PLAN(330, "设备作业周期计划"), + MES_PART_OJBECT(340, "物料对象"), + MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), + MES_DATASOURCE(360, "DB地址清单"), + MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"); private int value; private String description; @@ -3161,8 +3161,79 @@ public class MesEnumUtil { return tmp; } } + /** + * 质量标准配置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUALITY_STANDARD_TYPE { + + NG_RATE(10, "不良率"), + PPM(20, "PPM"); + + private int value; + private String description; + + QUALITY_STANDARD_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) + public enum QUALITY_OBJECT_TYPE { + + ORGANIZE(10, "工厂"), + WORK_CENTER_CODE(20, "产线"), + PRODUCT(30, "产品"); + + private int value; + private String description; + + QUALITY_OBJECT_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; + } + } + /** * MesProduceSn实体对应的qcStatus值 条码表条码质量状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT)