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

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"),
+        MOVE("MOVE", "移库单"),
-        IN_STOCK("IN_STOCK", "IN_STOCK"),
+        IN_STOCK("IN_STOCK", "入库单"),
-        SHIPPING("SHIPPING", "SHIPPING"),
+        SHIPPING("SHIPPING", "发运单"),
-        QC("QC", "QC"),
+        QC("QC", "质检"),
-        CS("CS", "CS");
+        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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java

@@ -115,10 +115,13 @@ public class MesPlanOrder extends BaseBean {
     @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 
+    @Transient
     public List<MesEnumUtil.PLAN_ORDER_TYPE> planTypeEnum;
 
+    @Transient
     public List<MesEnumUtil.PLAN_ORDER_STATUS> planOrderStatusEnum;
 
+    @Transient
     public List<MesEnumUtil.PLAN_ORDER_TYPE> getPlanTypeEnum() {
         return Arrays.asList(MesEnumUtil.PLAN_ORDER_TYPE.values());
     }

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

@@ -0,0 +1,30 @@
+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 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;
+    }
+}

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

@@ -38,7 +38,7 @@ public class WmsASNMaster extends BaseBean {
     @ApiParam("单据类型")
     public String asnType;
 
-    @Column(name = "MASTER_ORDER_STATUS")
+    @Column(name = "ASN_STATUS")
     @ApiParam(value = "状态", example = "0")
     public Integer asnStatus;
 

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

@@ -1,23 +0,0 @@
-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.Column;
-
-/**
- * @Description : 单据Model
- * @Reference :
- * @Author : dragon.xu
- * @CreateDate : 2019-03-07 19:18
- * @Modify:
- **/
-@Data
-@Api("单据Model")
-public class WmsOrderMasterModel extends BaseBean {
-    @Column(name = "ORDER_NO")
-    @ApiParam("订单号")
-    public String orderNo;
-}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -241,6 +241,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
         HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
+        HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
 
         getStringBuilderPack(wmsPart, result);