From 1afa60623c9933dee5a672600a3e99143a0f80cf Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 8 Jun 2020 18:02:24 +0800 Subject: [PATCH] Finish Task #2090 Cost:16h --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +- .../pojo/mes/bean/MesScatterPartProdCfg.java | 4 + .../pojo/mes/model/ScatterPartProdCfgModel.java | 89 ++++++++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.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 abd8d53..66b958a 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 @@ -2520,7 +2520,8 @@ public class MesPcnEnumUtil { STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), RUNNING_INFO("runningInfo", "执行信息"), STOP_PCS_CTL("stopPcsCtl", "停止监控"), - RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); + RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"), + PROCESS_CONTENT("processContent", "过程组件内容"); private String value; private String description; 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 4e01a47..1f6001b 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 @@ -161,4 +161,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @Column(name = "IS_END_SEQ") @ApiParam("是否截至顺序号") private Integer isEndSeq; + + @Column(name = "MULTIMEDIA_PLUG_QTY") + @ApiParam("多媒体插头数量") + private Double multimediaPlusQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java new file mode 100644 index 0000000..e1cb609 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java @@ -0,0 +1,89 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/6/8 1:22 下午 + * @Modify: + */ +@Data +public class ScatterPartProdCfgModel { + + private Long id; + + private String organizeCode; + + @ApiParam("配置编号") + private String cfgId; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("车型标志值") + private String modelFalgValue; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("等级代码") + private String gradeCode; + + @ApiParam("颜色代码") + private String colorCode; + + @ApiParam("标志位") + private Integer partFlagLocation; + + @ApiParam("标志值") + private String partFlagValue; + + @ApiParam("防错码") + private String pokeYokeFix; + + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @ApiParam("确认扫描次数") + private Integer checkScanCount; + + @ApiParam("组合码发送顺序") + private Integer sendSeq; + + @ApiParam("黄枪规则") + private Integer yellowGunRule; + + @ApiParam("是否截至顺序号") + private Integer isEndSeq; + + @ApiParam("多媒体插头数量") + private Double multimediaPlusQty; + + public ScatterPartProdCfgModel() {} + + public ScatterPartProdCfgModel(Long id, String workCenterCode, String workCellCode, String partNo, String partName + , String gradeCode, String colorCode, String prodCfgTypeCode, String produceCtgyCode, Double multimediaPlusQty) { + this.id = id; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.partNo = partNo; + this.partName = partName; + this.gradeCode = gradeCode; + this.colorCode = colorCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.produceCtgyCode = produceCtgyCode; + this.multimediaPlusQty = multimediaPlusQty; + } +}