Finish Task #2399 Cost:6h

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

@@ -6741,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

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