Merge remote-tracking branch 'origin/master'

# Conflicts:
#	modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java

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

@@ -26,9 +26,9 @@ public class CommonEnumUtil {
         SURFACE(98,"i3surface","对外服务"),
         CENTER(99,"icloud-server","注册中心");
 
-        public int value;
-        public String code;
-        public String description;
+        private int value;
+        private String code;
+        private String description;
 
         private SOFT_TYPE(int value, String code, String description) {
             this.value = value;

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+/**
+ * @Description : 抽点接收数据model
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-12-04 10:31
+ * @Modify:
+ **/
+@Data
+public class CheckPointModel {
+
+    /**
+     * 单据类型
+     */
+    private String orderType;
+
+    /**
+     *条码类型
+     */
+    private String snType;
+
+    /**
+     *条码
+     */
+    private String sn;
+
+    /**
+     *订单号
+     */
+    private String orderNo;
+
+    /**
+     *工厂代码
+     */
+    private String organizeCode;
+
+    /**
+     *实际抽点数量【从前端输入获取】
+     */
+    private Double actQty;
+
+}

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

@@ -126,6 +126,9 @@ public class  SysUserInfo extends BaseBean {
     private List<SysPosition> positionList;
 
     @Transient
+    @ApiParam("用户的岗位ID信息")
+    private List<String> positionIdList;
+
     @ApiParam(value ="用户所有组织信息")
     private List<SysOrganize> organizeList;
 

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

@@ -85,10 +85,12 @@ public class WmsActionLog extends BaseBean {
     public String orderNo;
 
     @Column(name="START_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "开始作业时间")
     public String startTime;
 
     @Column(name="END_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "结束作业时间")
     public String endTime;
 

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

@@ -385,11 +385,13 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //仓库代码
-        HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result);
+        HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result);
         //库存地代码
-        HqlPack.getStringEqualPack(wmsZones.getAreaNo(), "areaNo", result);
+        HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result);
         //存储区代码
-        HqlPack.getStringEqualPack(wmsZones.getZoneNo(), "zoneNo", result);
+        HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result);
+        //存储区名称
+        HqlPack.getStringLikerPack(wmsZones.getZoneName(),"zoneName", result);
 
         getStringBuilderPack(wmsZones, result);