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

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

@@ -586,11 +586,11 @@ public class WmsEnumUtil {
         ASN("ASN", "ASN"),
         PO("PO", "PO"),
         SO("SO", "SO"),
-        MOVE("MOVE", "MOVE"),
-        IN_STOCK("IN_STOCK", "IN_STOCK"),
-        SHIPPING("SHIPPING", "SHIPPING"),
-        QC("QC", "QC"),
-        CS("CS", "CS");
+        MOVE("MOVE", "移库单"),
+        IN_STOCK("IN_STOCK", "入库单"),
+        SHIPPING("SHIPPING", "发运单"),
+        QC("QC", "质检"),
+        CS("CS", "盘点");
         private String value;
         private String description;
 
@@ -619,6 +619,16 @@ public class WmsEnumUtil {
             }
             return null;
         }
+
+        public static String getDes(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+/**
+ * @Description : 单据Model
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-03-07 19:18
+ * @Modify:
+ **/
+@Data
+@Api("单据Model")
+public class WmsOrderMasterModel extends BaseBean {
+    @ApiParam("状态")
+    public Integer orderStatus;
+
+    @ApiParam("不同状态的小计")
+    public Long statusQty;
+
+    public WmsOrderMasterModel() {
+    }
+    public WmsOrderMasterModel(Integer orderStatus, Long statusQty) {
+        this.orderStatus = orderStatus;
+        this.statusQty =statusQty;
+    }
+}