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 c443ad0..ffdb270 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 @@ -165,4 +165,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @Column(name = "MULTIMEDIA_PLUG_QTY") @ApiParam("多媒体插头数量") private Double multimediaPlusQty; + + @Column(name = "QUALIFIED_COUNT") + @ApiParam("应收合格数") + private Double qualifiedCount; } 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 index fc9bff7..5a874ab 100644 --- 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 @@ -88,6 +88,9 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("确认扫描次数") private Integer checkScanCount; + @ApiParam("实际确认扫描次数") + private Integer actualCheckScanCount; + @ApiParam("组合码发送顺序") private Integer sendSeq; @@ -103,8 +106,31 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("是否黄枪") private Integer isYellowGun; + @ApiParam("应收合格数") + private Double qualifiedCount; + + @ApiParam("实际合格数") + private Double actualQualifiedCount; + + @ApiParam("工步信息行颜色") + private String color; + + @ApiParam("扭矩显示信息") + private String torqueInfo; + @ApiParam("扭矩颜色") + private String torqueColor; + + @ApiParam("绑定关键件信息") + private String bindPartKeyInfo; + @ApiParam("绑定关键件颜色") + private String bindPartKeyColor; + + @ApiParam("是否大枪") + private Integer isPf; + /** * 大枪查询结果构造方法 + * * @param vinCode * @param prodCfgTypeCode * @param gradeCode @@ -120,7 +146,7 @@ public class TorqueCollectionModel implements Serializable { */ public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq, - Integer yellowGunRule, Integer isEndSeq, String groupCode) { + Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -133,10 +159,13 @@ public class TorqueCollectionModel implements Serializable { this.yellowGunRule = yellowGunRule; this.isEndSeq = isEndSeq; this.groupCode = groupCode; + this.isPf = isPf; + this.qualifiedCount = qualifiedCount; } /** * 小枪结果数据构造方法 + * * @param vinCode * @param prodCfgTypeCode * @param gradeCode