Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -2552,6 +2552,7 @@ public class MesPcnEnumUtil {
         BUTTON("button", "按钮"),
         TABLES("tables", "多个表格"),
         CUSTOM("custom", "定制页面"),
+        CUSTOM_DIALOG("custom_dialog", "定制弹窗"),
         FORM("form", "文本按钮"),
         SPEC_TEXT("spec_text", "工步弹框文本"),
         SHOW_ASSEMB_TABLE("SHOW_ASSEMB_TABLE", "展示组件表格");

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java

@@ -52,4 +52,7 @@ public class StationResultBean<T> implements Serializable {
 
     @ApiParam("多个数据集")
     private List<StationResultBean<T>> stationResultBeans;
+
+    @ApiParam("定制页面名称")
+    private String customPageName;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -63,7 +62,7 @@ public class TorqueCollectionModel implements Serializable {
     private Integer pest8;
 
     @ApiParam("扭矩枪编号")
-    private String torqueNo;
+    private Integer torqueNo;
 
     @ApiParam("PEST号")
     private Integer pestNum;
@@ -101,10 +100,60 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("组合码")
     private String groupCode;
 
+    /**
+     * 大枪查询结果构造方法
+     * @param vinCode
+     * @param prodCfgTypeCode
+     * @param gradeCode
+     * @param colorCode
+     * @param partNo
+     * @param partName
+     * @param torqueNo
+     * @param checkScanCount
+     * @param sendSeq
+     * @param yellowGunRule
+     * @param isEndSeq
+     * @param groupCode
+     */
+    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) {
+        this.vinCode = vinCode;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.gradeCode = gradeCode;
+        this.colorCode = colorCode;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.torqueNo = torqueNo;
+        this.checkScanCount = checkScanCount;
+        this.sendSeq = sendSeq;
+        this.yellowGunRule = yellowGunRule;
+        this.isEndSeq = isEndSeq;
+        this.groupCode = groupCode;
+    }
+
+    /**
+     * 小枪结果数据构造方法
+     * @param vinCode
+     * @param prodCfgTypeCode
+     * @param gradeCode
+     * @param colorCode
+     * @param partNo
+     * @param partName
+     * @param pest1
+     * @param pest2
+     * @param pest3
+     * @param pest4
+     * @param pest5
+     * @param pest6
+     * @param pest7
+     * @param pest8
+     * @param torqueNo
+     */
     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) {
+                                 Integer torqueNo) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
@@ -120,10 +169,5 @@ public class TorqueCollectionModel implements Serializable {
         this.pest7 = pest7;
         this.pest8 = pest8;
         this.torqueNo = torqueNo;
-        this.checkScanCount = checkScanCount;
-        this.sendSeq = sendSeq;
-        this.yellowGunRule = yellowGunRule;
-        this.isEndSeq = isEndSeq;
-        this.groupCode = groupCode;
     }
 }