From 9563ebeb664944ab0bfc4444d2326e1294e501d4 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 27 Aug 2020 18:49:00 +0800 Subject: [PATCH] normalDistribution --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 56 +++++++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +- .../cn/estsh/i3plus/pojo/mes/model/BarModel.java | 26 ---- .../i3plus/pojo/mes/model/BarRequestModel.java | 134 +++++++++++++++++++++ .../pojo/mes/model/NormalDistributionModel.java | 95 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/RbarModel.java | 32 +++++ .../cn/estsh/i3plus/pojo/mes/model/XbarModel.java | 33 +++++ 7 files changed, 342 insertions(+), 37 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarRequestModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RbarModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XbarModel.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 3a1eefc..c159a3e 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 @@ -3187,8 +3187,8 @@ public class MesEnumUtil { EXEC(10, "执行方法"), COMPLETE(20, "完成方法"), - HNC_ISSUED(30,"队列自动下达"), - LABEL_PROPERTIES(40,"标签属性查询方法"); + HNC_ISSUED(30, "队列自动下达"), + LABEL_PROPERTIES(40, "标签属性查询方法"); private int value; private String description; @@ -5823,9 +5823,9 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PLC_DATA_TYPE { STRING("10", "String", "字符串"), - BOOLEAN("20","Boolean", "布尔"), + BOOLEAN("20", "Boolean", "布尔"), WORD("30", "Word", "整形-Word"), - DWORD("40","Dword", "整形-DWord"), + DWORD("40", "Dword", "整形-DWord"), LONG("50", "Long", "长整形-Long"), SHORT("60", "Short", "UShort"), DOUBLE("70", "Double", "双精度-Double"), @@ -5842,7 +5842,7 @@ public class MesEnumUtil { private String code; private String description; - PLC_DATA_TYPE(String value, String code,String description) { + PLC_DATA_TYPE(String value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -5865,6 +5865,7 @@ public class MesEnumUtil { } return tmp; } + public static String codeOfValue(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -6697,10 +6698,10 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QAD_DATA_OBJECT { - BOM("soapenv#Envelope#SyncBOM", "getBomList", "MesBom","BOM"), - CUSTOMER_PART("soapenv#Envelope#SyncCustomerItem","getCustomerPartList", "MesCustomerPart","客户物料号"), - CUSTOMER("soapenv#Envelope#SyncCustomer","getCustomerList", "MesCustomer","客户信息"), - PART("soapenv#Envelope#SyncItem","getPartList", "MesPart","物料信息"); + BOM("soapenv#Envelope#SyncBOM", "getBomList", "MesBom", "BOM"), + CUSTOMER_PART("soapenv#Envelope#SyncCustomerItem", "getCustomerPartList", "MesCustomerPart", "客户物料号"), + CUSTOMER("soapenv#Envelope#SyncCustomer", "getCustomerList", "MesCustomer", "客户信息"), + PART("soapenv#Envelope#SyncItem", "getPartList", "MesPart", "物料信息"); private String code; private String method; @@ -6983,7 +6984,7 @@ public class MesEnumUtil { } /** - * + * 取值对象类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum EXTRACT_OBJECT_TYPE { @@ -7016,4 +7017,39 @@ public class MesEnumUtil { return tmp; } } + + /** + * 系数类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COEFFICIENT_TYPE { + CONTROL(10, "控制限系数"), + CENTER(20, "中心线系数"); + + private Integer value; + private String description; + + COEFFICIENT_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index d464a7f..2c025ef 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -3554,7 +3554,8 @@ public class MesPcnEnumUtil { JUMP_STEP(10, "JUMP_STEP", "跳过工步"), REDO_PROCESS(20, "REDO_PROCESS", "重做工序"), JUMP_PROCESS(30, "JUMP_PROCESS", "跳过工序"), - NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成"); + NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成"), + CLEAR_CACHE(50, "CLEAR_CACHE", "工步已经清空缓存 无需执行完之后放入RequestBean"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarModel.java deleted file mode 100644 index 327f14d..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarModel.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import lombok.Data; - -/** - * @author Wynne.Lu - * @date 2020/8/24 16:50 - * @desc - */ -@Data -public class BarModel { - - private String workCenterCode; - - private String keyData; - - private String partNo; - - private Integer count; - - private Integer groupCount; - - private String startTime; - - private String endTime; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarRequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarRequestModel.java new file mode 100644 index 0000000..9721df9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarRequestModel.java @@ -0,0 +1,134 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/8/24 16:50 + * @desc + */ +public class BarRequestModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("关键数据代码") + private String keyData; + + @ApiParam("零件号") + private List partNos; + + @ApiParam("单组数量") + private Integer count; + + @ApiParam("组数") + private Integer groupCount; + + @ApiParam("总数") + private Integer totalCount; + + @ApiParam("开始时间") + private String startTime; + + @ApiParam("结束时间") + private String endTime; + + @ApiParam("均值图") + private boolean xbar; + + @ApiParam("极差图") + private boolean rbar; + + @ApiParam("正太分布图") + private boolean normalDistribution; + + public String getWorkCenterCode() { + return workCenterCode; + } + + public void setWorkCenterCode(String workCenterCode) { + this.workCenterCode = workCenterCode; + } + + public String getKeyData() { + return keyData; + } + + public void setKeyData(String keyData) { + this.keyData = keyData; + } + + public List getPartNos() { + return partNos; + } + + public void setPartNos(List partNos) { + this.partNos = partNos; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public Integer getGroupCount() { + return groupCount; + } + + public void setGroupCount(Integer groupCount) { + this.groupCount = groupCount; + } + + public Integer getTotalCount() { + return this.count * this.groupCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public boolean isXbar() { + return xbar; + } + + public void setXbar(boolean xbar) { + this.xbar = xbar; + } + + public boolean isRbar() { + return rbar; + } + + public void setRbar(boolean rbar) { + this.rbar = rbar; + } + + public boolean isNormalDistribution() { + return normalDistribution; + } + + public void setNormalDistribution(boolean normalDistribution) { + this.normalDistribution = normalDistribution; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java new file mode 100644 index 0000000..52beedd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java @@ -0,0 +1,95 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/8/26 14:46 + * @desc + */ +@Data +public class NormalDistributionModel { + + @ApiParam("尺寸上限") + private Double usl; + + @ApiParam("尺寸下限") + private Double lsl; + + @ApiParam("柱状图") + private List bar = new ArrayList<>(); + + @ApiParam("曲线图") + private List line = new ArrayList<>(); + + @ApiParam("平均均值-绿线") + private List xAxis = new ArrayList<>(); + + @ApiParam("数据个数") + private Integer totalCount; + + @ApiParam("平均均值") + private Double xbarbar; + + @ApiParam("平均极差") + private Double rbar; + + @ApiParam("最大值") + private Double maxValue; + + @ApiParam("最小值") + private Double minValue; + + @ApiParam("低于下限数据个数") + private Integer belowLowerLimitCount; + + @ApiParam("高于上限数据个数") + private Integer aboveUpperLimitCount; + + @ApiParam("d2") + private Double d2; + + @ApiParam("n") + private Integer n; + + @ApiParam("高能力指数") + private Double cpu; + + @ApiParam("低能力指数") + private Double cpl; + + @ApiParam("过程能力指数") + private Double cp; + + @ApiParam("过程能力") + private Double cpk; + + @ApiParam("过程比率") + private Double cr; + + @ApiParam("标准偏差n") + private Double stdOffset; + + @ApiParam("标准偏差n-1") + private Double stdOffsetMinusOne; + + @ApiParam("方差n") + private Double variance; + + @ApiParam("方差n-1") + private Double varianceMinusOne; + + @ApiParam("性能指数") + private Double pp; + + @ApiParam("性能比率") + private Double pr; + + @ApiParam("性能指数") + private Double ppk; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RbarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RbarModel.java new file mode 100644 index 0000000..17ed649 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RbarModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/8/25 16:23 + * @desc + */ +@Data +public class RbarModel { + + @ApiParam("控制上限") + private Double ucl; + + @ApiParam("控制下限") + private Double lcl; + + @ApiParam("极差-蓝线 key组号，value值") + private List maxGap = new ArrayList<>(); + + @ApiParam("平均极差-绿线") + private Double rbar; + + @ApiParam("标准差") + private Double stdDev; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XbarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XbarModel.java new file mode 100644 index 0000000..b4b47a7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XbarModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/8/25 16:22 + * @desc + */ +@Data +public class XbarModel { + + @ApiParam("控制上限") + private Double ucl; + + @ApiParam("控制下限") + private Double lcl; + + @ApiParam("均值-蓝线 key组号，value值") + private List xbar = new ArrayList<>(); + + @ApiParam("平均均值-绿线") + private Double xbarbar; + + @ApiParam("标准差") + private Double stdDev; + + +}