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

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

@@ -592,4 +592,5 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
 }

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

@@ -0,0 +1,76 @@
+package cn.estsh.i3plus.pojo.base.enumutil;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * @Description : Model Pojo 枚举
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2018-11-21 15:50
+ * @Modify:
+ **/
+public class ModelEnumUtil {
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMMON_TREE_TYPE{
+
+        TYPE_ORGANIZE(1,"组织","SysOrganize"),
+        TYPE_DEPARTMENT(2,"部门","SysDepartment"),
+        ;
+
+        private int value;
+        private String name;
+        private String description;
+
+        COMMON_TREE_TYPE() {
+        }
+
+        COMMON_TREE_TYPE(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].name;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * @Description : 复杂Tree
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2018-11-21 15:50
+ * @Modify:
+ **/
+@Data
+public class CommonTreeModel {
+
+    private BaseBean bean;
+
+    private Integer beanType;
+
+    private List<CommonTreeModel> childList = new ArrayList<>();
+}

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

@@ -68,4 +68,5 @@ public class SysOrganize extends BaseBean {
 
     @ApiParam(value ="子集列表")
     private transient List<SysOrganize> childList;
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -123,6 +123,7 @@ public class CoreHqlPack {
 
         // 查询参数封装
         HqlPack.getNumEqualPack(department.getParentId(),"parentId",result);
+        HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result);
         HqlPack.getStringLikerPack(department.getName(),"name",result);
         HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result);
 
@@ -344,6 +345,7 @@ public class CoreHqlPack {
         StringBuffer result = new StringBuffer();
 
         // And
+        HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result);
         HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
         HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
         HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);

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

@@ -678,7 +678,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         // 来源单据类型
-        HqlPack.getStringLikerPack(wmsSnPrint.getRefType(), "refType", result);
+        HqlPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result);
         // 来源单据号
         HqlPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result);
         // 打印机