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 93b15bb..85a5f7f 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 @@ -3190,8 +3190,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; @@ -5826,9 +5826,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"), @@ -5845,7 +5845,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; @@ -5868,6 +5868,7 @@ public class MesEnumUtil { } return tmp; } + public static String codeOfValue(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -6700,10 +6701,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; @@ -6984,4 +6985,74 @@ public class MesEnumUtil { return tmp; } } + + /** + * 取值对象类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXTRACT_OBJECT_TYPE { + MODEL(10, "实体对象（单表）"), + PRODUCT_DATA(20, "动态对象（生产数据表）"); + + private Integer value; + private String description; + + EXTRACT_OBJECT_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; + } + } + + /** + * 系数类型 + */ + @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 810c728..0d0d4ac 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 @@ -2596,7 +2596,6 @@ public class MesPcnEnumUtil { ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"), ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"), TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"); - //TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"); private String value; private String description; @@ -3560,7 +3559,7 @@ public class MesPcnEnumUtil { JUMP_PROCESS(30, "JUMP_PROCESS", "跳过工序"), NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成"), CLEAR_CACHE(50, "CLEAR_CACHE", "工步已清空缓存，执行完工步之后无需放入StationRequestBean"); - + private int value; private String code; private String description; @@ -4889,6 +4888,53 @@ public class MesPcnEnumUtil { } } + /** + * 产品特性 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_TRAIT { + NORMAL(10, "正常件"), + FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"), + FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"), + FICTIVE(40, "虚拟件"); + + private int value; + private String description; + + PART_TRAIT(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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STEP_DISPLAY_CLASS { WHITE(10, "white"), diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index a6a0d68..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 397a28c..d1dcee7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -97,7 +96,6 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") - @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index dce964b..a22dd03 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -148,6 +148,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; + @Transient + @ApiParam("明细总数") + private Integer detailTotal = 0; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java new file mode 100644 index 0000000..4c896fc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java @@ -0,0 +1,52 @@ +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/8/24 17:47 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SPC_CONTROL_COEFFICIENT") +@Api("MES_SPC控制图系数") +public class MesSpcControlCoefficient extends BaseBean implements Serializable { + private static final long serialVersionUID = -2790965693171941915L; + + @Column(name = "SINGLE_GROUP_QTY") + @ApiParam("子组容量") + private Integer singleGroupQty; + + @Column(name = "COEFFICIENT_TYPE") + @ApiParam("系数类型") + private String coefficientType; + + @Column(name = "COEFFICIENT_CODE") + @ApiParam("系数代码") + private String coefficientCode; + + @Column(name = "COEFFICIENT_DESC") + @ApiParam("系数描述") + private String coefficientDesc; + + @Column(name = "COEFFICIENT_VALUE") + @ApiParam("系数值") + private Double coefficientValue; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java new file mode 100644 index 0000000..774a869 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java @@ -0,0 +1,70 @@ +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/8/24 17:47 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SPC_KEY_DATA") +@Api("MES_SPC关键数据") +public class MesSpcKeyData extends BaseBean implements Serializable { + private static final long serialVersionUID = 2255345691671062029L; + + @Column(name = "KD_CODE") + @ApiParam("关键数据代码") + private String kdCode; + + @Column(name = "KD_NAME") + @ApiParam("关键数据名称") + private String kdName; + + @Column(name = "NOMINAL_VALUE") + @ApiParam("公称值") + private Double nominalValue; + + @Column(name = "SPEC_USL") + @ApiParam("规格上限") + private Double specUsl; + + @Column(name = "SPEC_LSL") + @ApiParam("规格下限") + private Double specLsl; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "OBJECT_TYPE") + @ApiParam("取值对象类型") + private Integer objectType; + + @Column(name = "OBJECT_CODE") + @ApiParam("取值对象") + private String objectCode; + + @Column(name = "FIELD_CODE") + @ApiParam("取值字段") + private String fieldCode; + + @Column(name = "KD_CONDITION") + @ApiParam("取值条件") + private String kdCondition; +} 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..953350a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java @@ -0,0 +1,98 @@ +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 totalDataSum; + + @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/PaintOnLineModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java index 9ab41c8..4b7addd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java @@ -49,4 +49,7 @@ public class PaintOnLineModel { @ApiParam("过程条码") private String serialNumber; + + @ApiParam("是否虚拟件") + private Integer isFictive = 2; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index c16f45c..0fe8aeb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -100,6 +100,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("分组序号") private String groupSeq; + @ApiParam("客户产线代码") + private String custProdLineCode; + public QueueOrderModel() { } @@ -185,7 +188,7 @@ public class QueueOrderModel implements Serializable { // getPrintSnQueueOrderModel public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo, - String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber) { + String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber, String custProdLineCode) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; @@ -201,6 +204,7 @@ public class QueueOrderModel implements Serializable { this.queueSeq = queueSeq; this.groupSeq = groupSeq; this.serialNumber = serialNumber; + this.custProdLineCode = custProdLineCode; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, 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/TorqueGatherModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java index 05e431f..c27679b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java @@ -27,4 +27,7 @@ public class TorqueGatherModel { @ApiParam("是否合格") private String isQualified; + + @ApiParam("颜色") + private String color; } 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; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcControlCoefficientRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcControlCoefficientRepository.java new file mode 100644 index 0000000..a29a30d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcControlCoefficientRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesSpcControlCoefficient; +import org.springframework.stereotype.Repository; + +/** + * @Description : if不良信息接口 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 16:49 + * @Modify: + **/ +@Repository +public interface MesSpcControlCoefficientRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcKeyDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcKeyDataRepository.java new file mode 100644 index 0000000..8b8a4e4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcKeyDataRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesSpcKeyData; +import org.springframework.stereotype.Repository; + +/** + * @Description : if不良信息接口 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 16:49 + * @Modify: + **/ +@Repository +public interface MesSpcKeyDataRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineRepository.java new file mode 100644 index 0000000..2f3a3a1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachine; + +/** + * @Description : + * @Author : simon.song + * @CreateDate : 2020-09-01 + **/ +public interface MesStateMachineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index c7981a7..41955cb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -78,12 +78,15 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "跳转后端请求") public String actionUrl; + @ApiParam(value = "作业人员") + public String userNo; + public WmsTaskInfoModel() { } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo, - String createDatetime, String srcZoneNo, String createUser, String organizeCode) { + String createDatetime, String srcZoneNo, String createUser, String organizeCode,String userNo) { this.orderNo = orderNo; this.taskStatus = taskStatus; this.opTypeName = opTypeName; @@ -98,6 +101,7 @@ public class WmsTaskInfoModel implements Serializable { this.srcZoneNo = srcZoneNo; this.createUser = createUser; this.organizeCode = organizeCode; + this.userNo = userNo; } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 9aaee96..d30ca85 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -225,6 +225,8 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "COST_CENTER") @ApiParam(value = "成本中心") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_COST_CENTER", listColumnName = "name", explicitColumnName = "dictionaryValue") private String costCenter; @Column(name = "REMAKE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsShipModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsShipModel.java new file mode 100644 index 0000000..caed630 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsShipModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 委外扣减库存 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-08-31 9:44 + * @Modify: + **/ +@Data +@Api("委外扣减库存模型") +public class WmsShipModel extends BaseBean { + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam("物料编码") + private String shipPartNo; + + @ApiParam("物料名称") + public String shipPartName; + + @ApiParam("简称及版本") + private String rcPartNo; + + @ApiParam("项目名称") + private String prodCfgTypeName; + + @ApiParam("单位") + public String unit; + + @ApiParam("委外发运数量") + public Double shipQty; + + @ApiParam("发运存储区代码") + public String shipZoneNo; + + @ApiParam("ASN收货数量") + private Double rcQty; + + @ApiParam("ASN收货存储区代码") + public String rcZoneNo; + + @ApiParam("委外库存数量") + private Double shipStockQty; + + @ApiParam("委外发运时间") + private String shipTime; + + @ApiParam(value="发运时间，查询起始日期") + public String shipTimeStart; + + @ApiParam(value = "发运时间，查询结束日期") + public String shipTimeEnd; +}