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

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

@@ -1965,7 +1965,8 @@ public class MesEnumUtil {
         ENCODE_RULE_MAP(470, "mesEncodeRuleMapExcelService", "编码规则映射导入"),
         SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"),
         MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"),
-        MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系");
+        MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"),
+        BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入");
 
         private int value;
         private String service;
@@ -6740,6 +6741,15 @@ public class MesEnumUtil {
             return tmp;
         }
 
+        public static QAD_DATA_OBJECT getByObjectCode(String objectCode) {
+            for (QAD_DATA_OBJECT qadDataObject : values()) {
+                if (qadDataObject.getObjectCode().equals(objectCode)) {
+                    return qadDataObject;
+                }
+            }
+            return null;
+        }
+
         public static QAD_DATA_OBJECT getByCode(String code) {
             for (QAD_DATA_OBJECT qadDataObject : values()) {
                 if (qadDataObject.getCode().equals(code)) {

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

@@ -3763,8 +3763,9 @@ public class MesPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum VERIFY_MODE {
-        PART_NO("10", "按物料号匹配"),
+        PART_NO_BY_BOM("10", "按物料号匹配By-Bom"),
-        WORK_CENTER_CODE("20", "按产线匹配");
+        WORK_CENTER_CODE_BY_BOM("20", "按产线匹配By-Bom"),
+        WORK_CENTER_CODE_BY_SCATTER("30", "按产线匹配By-Scatter");
 
         private String value;
         private String description;

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

@@ -86,37 +86,37 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
     @ApiParam("防错码长度")
     private Integer pokeYokeLength;
 
-    @Column(name = "PEST1")
+    @Column(name = "PSET1")
-    @ApiParam("PEST编码1")
+    @ApiParam("PSET1")
-    private String pest1;
+    private String pset1;
 
-    @Column(name = "PEST2")
+    @Column(name = "PSET2")
-    @ApiParam("PEST编码2")
+    @ApiParam("PSET2")
-    private String pest2;
+    private String pset2;
 
-    @Column(name = "PEST3")
+    @Column(name = "PSET3")
-    @ApiParam("PEST编码3")
+    @ApiParam("PSET3")
-    private String pest3;
+    private String pset3;
 
-    @Column(name = "PEST4")
+    @Column(name = "PSET4")
-    @ApiParam("PEST编码4")
+    @ApiParam("PSET4")
-    private String pest4;
+    private String pset4;
 
-    @Column(name = "PEST5")
+    @Column(name = "PSET5")
-    @ApiParam("PEST编码5")
+    @ApiParam("PSET5")
-    private String pest5;
+    private String pset5;
 
-    @Column(name = "PEST6")
+    @Column(name = "PSET6")
-    @ApiParam("PEST编码6")
+    @ApiParam("PSET6")
-    private String pest6;
+    private String pset6;
 
-    @Column(name = "PEST7")
+    @Column(name = "PSET7")
-    @ApiParam("PEST编码7")
+    @ApiParam("PSET7")
-    private String pest7;
+    private String pset7;
 
-    @Column(name = "PEST8")
+    @Column(name = "PSET8")
-    @ApiParam("PEST编码8")
+    @ApiParam("PSET8")
-    private String pest8;
+    private String pset8;
 
     @Column(name = "TORQUE_NO")
     @ApiParam("扭矩枪编号")
@@ -169,4 +169,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
     @Column(name = "QUALIFIED_COUNT")
     @ApiParam("应收合格数")
     private Double qualifiedCount;
+
+    @Column(name = "IS_CHECK")
+    @ApiParam("是否复核校验")
+    private Integer isCheck;
 }

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/15 1:35 下午
+ * @Modify:
+ */
+@Data
+public class SoapModel {
+
+    private String soapJson;
+
+    private List<Map<String, Object>> soapList;
+}

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

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/7/15 21:43
+ * @desc
+ */
+@Data
+@AllArgsConstructor
+public class PsetModel {
+
+    private String psetName;
+
+    private Integer psetNum;
+
+    private Integer psetCount;
+
+    private boolean torqueStatus;
+}

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

@@ -5,6 +5,10 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : MES扭矩采集模型
@@ -38,37 +42,37 @@ public class TorqueCollectionModel implements Serializable {
     private String partName;
 
     @ApiParam("PEST编码1")
-    private Integer pest1;
+    private Integer pset1;
 
     @ApiParam("PEST编码2")
-    private Integer pest2;
+    private Integer pset2;
 
     @ApiParam("PEST编码3")
-    private Integer pest3;
+    private Integer pset3;
 
     @ApiParam("PEST编码4")
-    private Integer pest4;
+    private Integer pset4;
 
     @ApiParam("PEST编码5")
-    private Integer pest5;
+    private Integer pset5;
 
     @ApiParam("PEST编码6")
-    private Integer pest6;
+    private Integer pset6;
 
     @ApiParam("PEST编码7")
-    private Integer pest7;
+    private Integer pset7;
 
     @ApiParam("PEST编码8")
-    private Integer pest8;
+    private Integer pset8;
 
     @ApiParam("扭矩枪编号")
     private Integer torqueNo;
 
     @ApiParam("PEST号")
-    private Integer pestNum;
+    private Integer psetNum;
 
     @ApiParam("PEST数量")
-    private Integer pestCount;
+    private Integer psetCount;
 
     /**
      * 1-未采集， 2-已采集, 3-无需打扭矩
@@ -131,6 +135,11 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("是否大枪")
     private Integer isPf;
 
+    @ApiParam("psets总数")
+    private Integer psetSum;
+
+    private Map<String, PsetModel> psets = new LinkedHashMap<>();
+
     /**
      * 大枪查询结果构造方法
      *
@@ -175,34 +184,49 @@ public class TorqueCollectionModel implements Serializable {
      * @param colorCode
      * @param partNo
      * @param partName
-     * @param pest1
+     * @param pset1
-     * @param pest2
+     * @param pset2
-     * @param pest3
+     * @param pset3
-     * @param pest4
+     * @param pset4
-     * @param pest5
+     * @param pset5
-     * @param pest6
+     * @param pset6
-     * @param pest7
+     * @param pset7
-     * @param pest8
+     * @param pset8
      * @param torqueNo
      */
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode,
-                                 String colorCode, String partNo, String partName, Integer pest1, Integer pest2,
+                                 String colorCode, String partNo, String partName, Integer pset1, Integer pset2,
-                                 Integer pest3, Integer pest4, Integer pest5, Integer pest6, Integer pest7, Integer pest8,
+                                 Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8,
-                                 Integer torqueNo) {
+                                 Integer torqueNo, Integer sendSeq, Integer checkScanCount) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
         this.colorCode = colorCode;
         this.partNo = partNo;
         this.partName = partName;
-        this.pest1 = pest1;
+        this.pset1 = pset1;
-        this.pest2 = pest2;
+        this.pset2 = pset2;
-        this.pest3 = pest3;
+        this.pset3 = pset3;
-        this.pest4 = pest4;
+        this.pset4 = pset4;
-        this.pest5 = pest5;
+        this.pset5 = pset5;
-        this.pest6 = pest6;
+        this.pset6 = pset6;
-        this.pest7 = pest7;
+        this.pset7 = pset7;
-        this.pest8 = pest8;
+        this.pset8 = pset8;
         this.torqueNo = torqueNo;
+        this.sendSeq = sendSeq;
+        this.checkScanCount = checkScanCount;
+        assemblePsets();
     }
+
+    private void assemblePsets() {
+        psets.put("pset1", new PsetModel("pset1", 1, this.pset1, false));
+        psets.put("pset2", new PsetModel("pset2", 2, this.pset2, false));
+        psets.put("pset3", new PsetModel("pset3", 3, this.pset3, false));
+        psets.put("pset4", new PsetModel("pset4", 4, this.pset4, false));
+        psets.put("pset5", new PsetModel("pset5", 5, this.pset5, false));
+        psets.put("pset6", new PsetModel("pset6", 6, this.pset6, false));
+        psets.put("pset7", new PsetModel("pset7", 7, this.pset7, false));
+        psets.put("pset8", new PsetModel("pset8", 8, this.pset8, false));
+    }
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

@@ -81,6 +81,7 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("备注")
     public String remark;
 
+
     @Column(name = "LOT_NO")
     @ApiParam("批次编号")
     public String lotNo;
@@ -168,9 +169,9 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("供应商编号")
     private String vendorNo;
 
-    @Column(name = "SRC_SN")
+    @Column(name = "SERIAl_SN")
-    @ApiParam("原条码")
+    @ApiParam("产品条码")
-    public String srcSn;
+    public String serialSn;
 
     @Transient
     @ApiParam("业务类型编码")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java

@@ -40,8 +40,8 @@ public class WmsRfidOperateRecord extends BaseBean {
 
     @Column(name="OPERATE_TYPE")
     @ApiParam("操作类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.RFID_OPERATE_TYPE.class)
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "PACKAGE_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "RFID_OPERATE_TYPE")
     public Integer operateType;
 
     @Column(name="SRC_LOCATE")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -799,5 +799,15 @@ public class WmsStockSn extends BaseBean {
         this.color = color;
     }
 
+    public WmsStockSn(String packageNo, Double qty, String qualityDate, String lotNo, String dateCode, String leftCode, String fixLotNo) {
+        this.packageNo = packageNo;
+        this.qty = qty;
+        this.qualityDate = qualityDate;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.leftCode = leftCode;
+        this.fixLotNo = fixLotNo;
+    }
+
 
 }