Merge branch 'dev' into test

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

@@ -2800,7 +2800,7 @@ public class MesEnumUtil {
 
         FASTDFS_SAVE_PATH(10, "SAVE_PATH", ""),
         NGINX_IP(20, "NGINX_HOST", ""),
-        MES_STATION_SOCKET(30, "MES_STATION_SOCKET", ""),
+        MES_STATION_SOCKET(30, "mes_station_socket", ""),
         GATEWAY_IP(40, "GATEWAY_HOST", ""),
         UPDATE_SYNC_TIME(50, "SYNC_DATA_URL", "UPDATE_SYNC_TIME"),
         PCN_PULL(60, "SYNC_DATA_URL", "PCN_PULL"),
@@ -2820,12 +2820,12 @@ public class MesEnumUtil {
 
         private int value;
         private String code;
-        private String cfgKey;
+        private String description;
 
-        CONFIG_TYPE(int value, String code, String cfgKey) {
+        CONFIG_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
-            this.cfgKey = cfgKey;
+            this.description = description;
         }
 
         public int getValue() {
@@ -2836,15 +2836,15 @@ public class MesEnumUtil {
             return code;
         }
 
-        public String getCfgKey() {
-            return cfgKey;
+        public String getDescription() {
+            return description;
         }
 
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
-                    tmp = values()[i].cfgKey;
+                    tmp = values()[i].description;
                 }
             }
             return tmp;

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

@@ -631,13 +631,13 @@ public class WmsEnumUtil {
         VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"),
         KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"),
         KT_SCRAP(330, "KT_SCRAP", "KT报废"),
-        KT_QUARANTINE(330, "KT_QUARANTINE", "KT报废"),
-        KT_BACK_QUARANTINE(340, "KT_BACK_QUARANTINE", "KT反隔离"),
-        KT_DEFINITE_FAIL(350, "KT_DEFINITE_FAIL", "KT不合格"),
-        KT_RETURN(360, "KT_RETURN", "KT退货"),
-        KT_REWORK(370, "KT_REWORK", "KT返工"),
-        KT_MISCALCULATION(380, "KT_MISCALCULATION", "KT误判"),
-        KT_SORTING(390, "KT_SORTING", "KT分选");
+        KT_QUARANTINE(340, "KT_QUARANTINE", "KT隔离"),
+        KT_BACK_QUARANTINE(350, "KT_BACK_QUARANTINE", "KT反隔离"),
+        KT_DEFINITE_FAIL(360, "KT_DEFINITE_FAIL", "KT不合格"),
+        KT_RETURN(370, "KT_RETURN", "KT退货"),
+        KT_REWORK(380, "KT_REWORK", "KT返工"),
+        KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
+        KT_SORTING(400, "KT_SORTING", "KT分选");
 
 
         private int value;
@@ -818,8 +818,8 @@ public class WmsEnumUtil {
         VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"),
         VDA_SN_("VDA_SN_MERGE", "VDA条码合并"),
         VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"),
-        VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询");
-
+        VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"),
+		VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点");
         private String value;
         private String description;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Entity;
+
+/**
+ * @Description : 静态盘点输出model
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-10-31 20:04
+ * @Modify:
+ **/
+@Data
+@Entity
+@Api("静态盘点查询输出model")
+public class WmsStaticCsModel extends BaseBean {
+    public WmsStaticCsModel(String staticStr,String orderNo, String locateNo, String sn, double qty ) {
+        this.orderNo = orderNo;
+        this.locateNo = locateNo;
+        this.sn = sn;
+        this.qty = qty;
+        this.staticStr = staticStr;
+    }
+
+    @ApiParam(value = "订单号")
+    private String orderNo;
+    @ApiParam(value = "库存号")
+    private String locateNo;
+    @ApiParam(value = "条码")
+    private String sn;
+    @ApiParam(value = "数量")
+    private double qty;
+    @ApiParam(value = "状态")
+    private String staticStr;
+
+    public WmsStaticCsModel() {
+
+    }
+}