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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java

@@ -393,6 +393,19 @@ public class HqlPack {
 	}
 
 	/**
+	 * 封装in查询语句
+	 * @param data
+	 * @param columnName
+	 * @param result
+	 */
+	public static void getOrInPack(String data,String columnName, StringBuffer result){
+		if (data!=null&&data.trim().length()>0) {
+			data = getSafeParam(data);
+			result.append(" or model."+columnName+" in ( "+ data+ " )");
+		}
+	}
+
+	/**
 	 * 封装in String查询语句
 	 * @param data
 	 * @param columnName

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

@@ -16,5 +16,5 @@ public class OptionModel {
 
     private String name;
 
-    private Boolean value;
+    private Integer value;
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java

@@ -63,7 +63,7 @@ public class SysMenu extends BaseBean {
     private String menuGrade;
 
     @Column(name="MENU_SORT")
-    @ApiParam(value ="资源排序", example = "1")
+    @ApiParam(value ="资源排序", example = "0")
     private String menuSort;
 
     @Column(name="MENU_URL")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java

@@ -100,4 +100,8 @@ public class SysUser extends BaseBean {
     @Transient
     @ApiParam(value ="用户所有权限信息")
     private List<SysMenu> menuList;
+
+    @Transient
+    @ApiParam(value ="用户所有权限信息树数据")
+    private List<SysMenu> menuListTree;
 }

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

@@ -27,7 +27,7 @@ import java.util.Map;
 public class WmsActionResponseBean<Obj> {
 
     @ApiParam("进度")
-    public Double percent;
+    public String percent;
 
     @ApiParam("当前步骤")
     public Integer currentStep;
@@ -73,7 +73,7 @@ public class WmsActionResponseBean<Obj> {
         this.message = message;
     }
 
-    public WmsActionResponseBean(Double percent, String message, List<String> informations, Obj details, Boolean codeStatus) {
+    public WmsActionResponseBean(String percent, String message, List<String> informations, Obj details, Boolean codeStatus) {
         this.percent = percent;
         this.message = message;
         this.informations = informations;

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.model.wms.OptionModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -22,7 +23,7 @@ public class WmsOperationBean extends BaseBean {
     public String barCode;
 
     @ApiParam("可选项的值")
-    public List<String> options;
+    public List<OptionModel> options;
 
     @ApiParam("设备编号")
     public String fixNo;

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

@@ -181,15 +181,15 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
-        if (StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateEnd())) {
+        getStringBuilderPack(wmsIbCheckPlan, result);
+
+        if(wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) {
             HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false);
         }
-        if (StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateEnd())) {
+        if(wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) {
             HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false);
         }
 
-        getStringBuilderPack(wmsIbCheckPlan, result);
-
         return result.toString();
     }
 
@@ -1159,12 +1159,10 @@ public class WmsHqlPack {
     public static String packHqlWmsActionLog(WmsActionLog wmsActionLog) {
         StringBuffer result = new StringBuffer();
 
-        if (StringUtils.isNotBlank(wmsActionLog.getStartTimeStart()) &&
+        if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) {
-                StringUtils.isNotBlank(wmsActionLog.getStartTimeEnd())) {
             HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(),
                     "startTime", result, true);
-        } else if (StringUtils.isNotBlank(wmsActionLog.getEndTimeStart()) &&
+        } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) {
-                StringUtils.isNotBlank(wmsActionLog.getEndTimeEnd())) {
             HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(),
                     "endTime", result, true);
         }