Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java

@@ -3,8 +3,6 @@ package cn.estsh.i3plus.pojo.base.bean;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import io.swagger.annotations.ApiParam;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.util.List;
 import java.util.Map;
@@ -108,31 +106,4 @@ public class BaseResultBean<Obj> {
 
         return rs;
     }
-
-    public BaseResultBean setResultList(List<Obj> resultList) {
-        this.resultList = resultList;
-        return this;
-    }
-
-    public BaseResultBean setResultObject(Obj resultObject) {
-        this.resultObject = resultObject;
-        return this;
-    }
-
-    public BaseResultBean setResultMap(Map<String, Object> resultMap) {
-        this.resultMap = resultMap;
-        return this;
-    }
-
-    public BaseResultBean setPager(Pager pager) {
-        this.pager = pager;
-        return this;
-    }
-
-    public BaseResultBean setListPager(ListPager<Obj> listPager) {
-        this.listPager = listPager;
-        this.setPager(listPager.getObjectPager());
-        this.setResultList(listPager.getObjectList());
-        return this;
-    }
 }

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

@@ -26,8 +26,11 @@ import java.util.Map;
 @Api("返回前端数据实体")
 public class WmsActionResponseBean<Obj> {
 
+    @ApiParam("回显BARCODE值")
+    public Map<String, Obj> barCode;
+
     @ApiParam("进度")
-    public Double percent;
+    public String percent;
 
     @ApiParam("当前步骤")
     public Integer currentStep;
@@ -59,7 +62,7 @@ public class WmsActionResponseBean<Obj> {
      * 就把detailsData的内容以List的格式显示到 列表提示区域
      */
     @ApiParam(value = "是否需要选择单号")
-    public Boolean toSelected;
+    public Boolean toSelected = false;
 
     /**
      * 与 toSelected 属性配合使用，
@@ -73,7 +76,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/WmsLocate.java

@@ -36,9 +36,12 @@ public class WmsLocate extends BaseBean {
     @ApiParam(value ="库位名称")
     private String locateName;
 
+    /**
+     * 1=收货库,10=基础库,20=机动库,30=组合库,40=线边库,50=NC库
+     */
     @Column(name="LOCATE_TYPE")
     @ApiParam(value ="库位类型")
-    private String locateType;
+    private Integer locateType;
 
     @Column(name="WH_NO")
     @ApiParam(value ="仓库代码")

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

@@ -1,11 +1,13 @@
 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;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : PDA传输到后台的实体bean对象
@@ -16,13 +18,13 @@ import java.util.List;
  **/
 @Data
 @Api("接受前端数据实体")
-public class WmsOperationBean extends BaseBean {
+public class WmsOperationBean<Obj> extends BaseBean {
 
     @ApiParam("扫描内容")
     public String barCode;
 
     @ApiParam("可选项的值")
-    public List<String> options;
+    public List<Obj> 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();
     }
 
@@ -224,7 +224,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result);
         HqlPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result);
-        HqlPack.getStringEqualPack(wmsLocate.getLocateType(), "locateType", result);
+        HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
         HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
         HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
         HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result);
@@ -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);
         }