Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -3718,4 +3718,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;
+        }
+    }
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java

@@ -88,14 +88,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("料架是否已打印")
     private Integer isGroupPrinted = 2;
 
-    @Transient
-    @ApiParam("队列序号")
-    private Double queueSeq;
-
-    @Column(name = "FINSIH_QTY")
-    @ApiParam("已生产数量")
-    private Double finsihQty;
-
     @Column(name = "PRODUCE_COLOR")
     @ApiParam("产品颜色")
     private String produceColor;
@@ -109,6 +101,14 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     private String assyNo;
 
     @Transient
+    @ApiParam("队列序号")
+    private Double queueSeq;
+
+    @Column(name = "FINSIH_QTY")
+    @ApiParam("已生产数量")
+    private Double finsihQty;
+
+    @Transient
     @ApiParam("Vin")
     private String vinCode;
 

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;
 }

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;
+    }
+}