【2016 BH-回传检测结果至MES系统】

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

@@ -7397,4 +7397,78 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+    /**
+     * BH同步标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_SUMMARY_IS_SYNC {
+        INIT(10, "INIT", "初始化"),
+        WAIT_SYNC(20, "WAIT_SYNC", "待同步"),
+        FINISH_SYNC(30, "FINISH_SYNC", "已同步");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BH_SUMMARY_IS_SYNC(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BH_SUMMARY_IS_SYNC codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

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

@@ -100,6 +100,10 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @ApiParam("发运时间")
     private String deliveryDate;
 
+    @Column(name = "CUST_DELIVERY_LOCATION")
+    @ApiParam("客户发往地")
+    private String custDeliveryLocation;
+
     @ApiParam(value = "检测结果")
     @Transient
     private String reulstStatus;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java

@@ -99,7 +99,7 @@ public class MesInterfaceDataMapper extends BaseBean {
 
     /**
      * 接口分组名称
-     * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS
+     * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS,WMS2MES
      */
     @Column(name = "GROUP_NAME")
     public String groupName;

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

@@ -79,6 +79,10 @@ public class WmsTestResultSummary extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer pickResult;
 
+    @Column(name = "IS_SYNC", nullable = false)
+    @ApiParam("是否同步")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_SUMMARY_IS_SYNC.class, refForeignKey = "value", value = "description")
+    public Integer isSync = WmsEnumUtil.BH_SUMMARY_IS_SYNC.INIT.getValue();
 
     @Transient
     @ApiParam("BH类型")
@@ -128,7 +132,7 @@ public class WmsTestResultSummary extends BaseBean {
         this.bhType = bhType;
     }
 
-    public WmsTestResultSummary() {
+    public WmsTestResultSummary() { }
 
     }
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -104,7 +104,7 @@ public class WmsInterfaceDataMapper extends BaseBean {
 
     /**
      * 接口分组名称
-     * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS
+     * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS,WMS2MES
      */
     @Column(name = "GROUP_NAME")
     public String groupName;