Merge remote-tracking branch 'origin/master'

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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1231,7 +1231,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_INFO_TYPE {
-        FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验,"), SHIPMENTS(40, "出货检验,");
+        FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验"), SHIPMENTS(40, "出货检验");
 
         private int value;
         private String description;
@@ -1267,9 +1267,9 @@ public class WmsEnumUtil {
     public enum QC_INFO_STATUS {
         CREATE(1, "新建"),
         FINISH(5, "待处理"),
-        FAIL(10, "已完成,"),
-        CLOSE(90, "已关闭,"),
-        CANCEL(91, "已取消,");
+        FAIL(10, "已完成"),
+        CLOSE(90, "已关闭"),
+        CANCEL(91, "已取消");
 
         private int value;
         private String description;
@@ -1769,4 +1769,37 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 成功标志枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RC_OK_VALUE {
+
+        IS_TRUE(10, true, "成功"),
+        IS_FALSE(20, false, "失败");
+
+        private int value;
+        private boolean codeValue;
+        private String description;
+
+        RC_OK_VALUE(int value, boolean codeValue, String description) {
+            this.value = value;
+            this.codeValue = codeValue;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public boolean getCodeValue() {
+            return codeValue;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+
 }

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

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

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

@@ -54,4 +54,8 @@ public class WmsActionStepCall extends BaseBean {
     @Column(name="AM_TYPE")
     @ApiParam(value = "组件类型", example = "0")
     public Integer amType;
+
+    @Column(name="OK_VALUE")
+    @ApiParam(value = "成功标志", example = "10")
+    public Integer okValue;
 }

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);
 
@@ -579,9 +581,9 @@ public class WmsHqlPack {
     public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) {
         StringBuffer result = new StringBuffer();
 
-        HqlPack.getStringEqualPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
-        HqlPack.getStringEqualPack(wmsTaskInfo.getUserNo(), "userNo", result);
-        HqlPack.getStringEqualPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result);
         HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result);