From 44f313abc482327a034a5e2d7ec0dc13f35931e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 26 May 2020 19:38:16 +0800 Subject: [PATCH] =?UTF-8?q?Task1917=E3=80=811916:=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E4=BB=B6=E7=BB=91=E5=AE=9A=E3=80=81=E6=89=AD?= =?UTF-8?q?=E7=9F=A9=E4=BA=8C=E5=90=88=E4=B8=80(PF)=E3=80=81=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E4=BB=B6=E7=BB=91=E5=AE=9A=E3=80=81=E6=89=AD=E7=9F=A9?= =?UTF-8?q?=E4=BA=8C=E5=90=88=E4=B8=80(DL)=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 35 ++++++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 12 ++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 12 ++ .../pojo/mes/bean/MesScatterPartProdCfg.java | 15 +++ .../pojo/model/mes/TorqueCollectionModel.java | 129 +++++++++++++++++++++ 5 files changed, 203 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java 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 71cc67b..290487e 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 @@ -3680,4 +3680,39 @@ public class MesPcnEnumUtil { } } + /** + * 扭矩采集 黄枪规则(10-继续采集扭矩，20-发送下一个组合码) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum YELLOW_GUN_RULE { + COLLECT_TORQUE(10, "继续采集扭矩"), + SEND_NEXT_GROUP_CODE(20, "发送下一个组合码"); + + private int value; + private String description; + + YELLOW_GUN_RULE(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; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 9280efe..57687ae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -100,6 +100,18 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("客户JIT队列编号") private String jitActualNo; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; + + @Column(name = "GRADE_CODE") + @ApiParam("等级代码") + private String gradeCode; + @Transient @ApiParam("起始车号") private String custFlagNoStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 1fe5536..c5220c3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -88,6 +88,18 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("料架是否已打印") private Integer isGroupPrinted; + @Column(name = "PRODUCE_COLOR") + @ApiParam("产品颜色") + private String produceColor; + + @Column(name = "OPTION_CODE") + @ApiParam("选项代码") + private String optionCode; + + @Column(name = "ASSY_NO") + @ApiParam("组件编号") + private String assyNo; + @Transient @ApiParam("队列序号") private Double queueSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index 48a037a..4e01a47 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -146,4 +146,19 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @ApiParam("产品位置代码") private String produceCtgyCode; + @Column(name = "CHECK_SCAN_COUNT") + @ApiParam("确认扫描次数") + private Integer checkScanCount; + + @Column(name = "SEND_SEQ") + @ApiParam("组合码发送顺序") + private Integer sendSeq; + + @Column(name = "YELLOW_GUN_RULE") + @ApiParam("黄枪规则") + private Integer yellowGunRule; + + @Column(name = "IS_END_SEQ") + @ApiParam("是否截至顺序号") + private Integer isEndSeq; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java new file mode 100644 index 0000000..8af170e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -0,0 +1,129 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import java.io.Serializable; + +/** + * @Description : MES扭矩采集模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-22 11:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class TorqueCollectionModel implements Serializable { + + private static final long serialVersionUID = -6376845639746448495L; + + @ApiParam("Vin") + private String vinCode; + + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("等级代码") + private String gradeCode; + + @ApiParam("颜色代码") + private String colorCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("PEST编码1") + private Integer pest1; + + @ApiParam("PEST编码2") + private Integer pest2; + + @ApiParam("PEST编码3") + private Integer pest3; + + @ApiParam("PEST编码4") + private Integer pest4; + + @ApiParam("PEST编码5") + private Integer pest5; + + @ApiParam("PEST编码6") + private Integer pest6; + + @ApiParam("PEST编码7") + private Integer pest7; + + @ApiParam("PEST编码8") + private Integer pest8; + + @ApiParam("扭矩枪编号") + private String torqueNo; + + @ApiParam("PEST号") + private Integer pestNum; + + @ApiParam("PEST数量") + private Integer pestCount; + + /** + * 1-未采集， 2-已采集, 3-无需打扭矩 + */ + @ApiParam("扭矩采集状态") + private Integer torqueStatus; + + /** + * 1-未绑定，2-已绑定 + */ + @ApiParam("关键件绑定状态") + private Integer bindKeyPartStatus; + + @ApiParam("扭矩值") + private Integer torqueValue; + + @ApiParam("确认扫描次数") + private Integer checkScanCount; + + @ApiParam("组合码发送顺序") + private Integer sendSeq; + + @ApiParam("黄枪规则") + private Integer yellowGunRule; + + @ApiParam("是否截至顺序号") + private Integer isEndSeq; + + @ApiParam("组合码") + private String groupCode; + + public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, + String colorCode, String partNo, String partName, Integer pest1, Integer pest2, + Integer pest3, Integer pest4, Integer pest5, Integer pest6, Integer pest7, Integer pest8, + String torqueNo, Integer checkScanCount, Integer sendSeq, Integer yellowGunRule, Integer isEndSeq, String groupCode) { + this.vinCode = vinCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.gradeCode = gradeCode; + this.colorCode = colorCode; + this.partNo = partNo; + this.partName = partName; + this.pest1 = pest1; + this.pest2 = pest2; + this.pest3 = pest3; + this.pest4 = pest4; + this.pest5 = pest5; + this.pest6 = pest6; + this.pest7 = pest7; + this.pest8 = pest8; + this.torqueNo = torqueNo; + this.checkScanCount = checkScanCount; + this.sendSeq = sendSeq; + this.yellowGunRule = yellowGunRule; + this.isEndSeq = isEndSeq; + this.groupCode = groupCode; + } +}