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

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", "按物料号匹配"),
-        WORK_CENTER_CODE("20", "按产线匹配");
+        PART_NO_BY_BOM("10", "按物料号匹配By-Bom"),
+        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

@@ -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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

@@ -11,7 +11,12 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description : 库存移动单条码信息
@@ -163,6 +168,10 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("供应商编号")
     private String vendorNo;
 
+    @Column(name = "SRC_SN")
+    @ApiParam("原条码")
+    public String srcSn;
+
     @Transient
     @ApiParam("业务类型编码")
     @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")

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)
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "PACKAGE_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.RFID_OPERATE_TYPE.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "RFID_OPERATE_TYPE")
     public Integer operateType;
 
     @Column(name="SRC_LOCATE")