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/dynamic/DynamicEntity.java

@@ -1,7 +1,21 @@
 package cn.estsh.i3plus.pojo.base.dynamic;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : 基础动态对象，包含方法、参数等
@@ -10,24 +24,46 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
  * @CreateDate : 2019-01-24 15:56
  * @Modify:
  **/
-public class DynamicEntity extends BaseBean {
+public class DynamicEntity extends BaseBean implements Serializable {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(DynamicEntity.class);
 
+    public String tableName;
+    /*private String uri;
     private String method;
-    private String uri;
     private Object[] args;
     private Object result;
     private String operator;
-    private String appName;
+    private String appName;*/
+
+    public List<String> propertyList;
+
+    public DynamicEntity(){
+        try {
+            this.setPropertyList(new ArrayList<>());
+            initDynamic();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public DynamicEntity(String tableName){
+        this.tableName = tableName;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
 
     /**
      * 获取当前对象
      *
-     * @param method
-     * @param uri
-     * @param args
-     * @param result
      * @return
-     */
+     *//*
     public DynamicEntity get(String method, String uri, Object[] args, Object result, String operator, String appName) {
         setMethod(method);
         setUri(uri);
@@ -84,10 +120,160 @@ public class DynamicEntity extends BaseBean {
 
     public void setAppName(String appName) {
         this.appName = appName;
+    }*/
+
+    /**
+     * 初始化属性，以便动态加载
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
+     * @throws NoSuchMethodException
+     */
+    public void initDynamic() {
+        Field[] fields = this.getClass().getDeclaredFields();
+
+        Method setMethod = null;
+        String setMethodName,propName;
+        Object fieldVal = null;
+
+        for(Field f : fields) {
+            propName = f.getName().replace("$cglib_prop_", "");
+            if(!"LOGGER".equals(propName) && !"propertyList".equals(propName)) {
+                this.getPropertyList().add(propName); //添加到属性list中
+
+                setMethodName = "set" + propName.substring(0,1).toUpperCase() + propName.substring(1);
+
+                f.setAccessible(true);
+                try {
+                    fieldVal = f.get(this);
+                } catch (IllegalAccessException e) {
+                    fieldVal = null;
+                }
+
+                if(fieldVal == null) {
+                    if (f.getType() == Integer.class) {
+                        fieldVal = 0;
+                    } else if (f.getType() == Long.class) {
+                        fieldVal = 0L;
+                    } else if (f.getType() == Float.class) {
+                        fieldVal = 0.0f;
+                    } else if (f.getType() == Double.class) {
+                        fieldVal = 0.0d;
+                    } else {
+                        fieldVal = "";
+                    }
+                }
+
+                try {
+                    setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{f.getType()});
+                    setMethod.invoke(this, fieldVal);
+                } catch (NoSuchMethodException e) {
+                    LOGGER.error("没有方法：{}", setMethodName, e);
+                } catch (IllegalAccessException e) {
+                    LOGGER.error("入参出错：{}:{}:{}", f, f.getType(), fieldVal, e);
+                } catch (InvocationTargetException e) {
+                    LOGGER.error("方法返回出错：{}", setMethodName, e);
+                }
+            }
+        }
     }
 
     @Override
     public String toString() {
-        return ReflectionToStringBuilder.toString(this);
+        String result = "{";
+
+        Object fieldVal = null;
+        Field[] fields = this.getClass().getDeclaredFields();
+        String fieldName;
+        for(Field f : fields) {
+            fieldName = f.getName().replace("$cglib_prop_", "");
+            if(!"LOGGER".equals(fieldName) && !"propertyList".equals(fieldName)) {
+                f.setAccessible(true);
+                fieldVal = new Object();
+                try {
+                    fieldVal = f.get(this);
+                } catch (IllegalAccessException e) {
+                    fieldVal = null;
+                }
+
+                if (fieldVal == null) {
+                    if (f.getType() == Integer.class || f.getType() == Long.class) {
+                        fieldVal = 0;
+                    } else if (f.getType() == Float.class || f.getType() == Double.class) {
+                        fieldVal = 0.0;
+                    } else {
+                        fieldVal = "";
+                    }
+                }
+
+                result += "\"" + fieldName + "\":\"" + fieldVal + "\",";
+            }
+        }
+        if(fields.length > 0) {
+            result = result.substring(0,result.length()-1);
+        }
+
+        result += "}";
+
+        return result;
+    }
+
+    /**
+     * 根据属性名，设置属性值
+     * @param propName
+     * @param val
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
+     * @throws NoSuchMethodException
+     */
+    public void setDynProperty(String propName,Object val){
+         //初始化set方法
+        String setMethodName = "set" + propName.substring(0, 1).toUpperCase() + propName.substring(1);
+            //获取方法
+        Method setMethod = null;
+        try {
+            setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
+            setMethod.invoke(this, val);
+        } catch (NoSuchMethodException e) {
+            LOGGER.error("没有方法：{}",setMethodName,e);
+        } catch (IllegalAccessException e) {
+            LOGGER.error("入参出错：{}:{}",val,val.getClass(),e);
+        } catch (InvocationTargetException e) {
+            LOGGER.error("方法返回出错：{}",setMethodName,e);
+        }
+    }
+
+    /**
+     * 获取属性值
+     * @param propName
+     * @return
+     * @throws NoSuchMethodException
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
+     */
+    public Object getDynProperty(String propName){
+        //初始化set方法
+        String setMethodName = "get" + propName.substring(0,1).toUpperCase() + propName.substring(1);
+
+        try {
+            //获取方法
+            Method getMethod = this.getClass().getDeclaredMethod(setMethodName);
+            //实现方法
+            return getMethod.invoke(this);
+        } catch (NoSuchMethodException e) {
+            LOGGER.error("没有方法：{}:{}",setMethodName,propName,e);
+        } catch (IllegalAccessException e) {
+            LOGGER.error("没有方法：{}:{}",setMethodName,propName,e);
+        } catch (InvocationTargetException e) {
+            LOGGER.error("方法返回出错：{}",setMethodName,e);
+        }
+        return null;
+    }
+
+    public List<String> getPropertyList() {
+        return propertyList;
+    }
+
+    public void setPropertyList(List<String> propertyList) {
+        this.propertyList = propertyList;
     }
 }

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

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @Modify:
  **/
 public class WmsEnumUtil {
+
     /**
      * 拆分规则
      */
@@ -1846,6 +1847,16 @@ public class WmsEnumUtil {
             return code;
         }
 
+        public static String valueOf(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 String getDescription() {
             return description;
         }
@@ -1882,5 +1893,55 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 库存交易记录生成标记
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRANS_QUAN_GENERAL_TAG {
+        MINUS(-1, "MINUS", "一条：负"), ZERO(0, "ZERO", "一条：0"), PLUS(1, "PLUS", "一条：正"), TWO(2, "TWO", "两条：一正一负");
+
+        private String code;
+        private String description;
+        int value;
+
+        TRANS_QUAN_GENERAL_TAG(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static TRANS_QUAN_GENERAL_TAG codeOf(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.form.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 数据对象
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2019-02-27 10:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="bf_data_object")
+@Api(value="数据对象表",description = "用来存储动态对象的相关属性")
+public class BfDataObject extends BaseBean {
+
+    @Column(name="NAME")
+    @ApiParam(value ="中文名称")
+    private String objectName;
+
+    @Column(name="TABLE_NAME")
+    @ApiParam(value ="表名")
+    private String tableName;
+
+    @Column(name="is_view")
+    @ApiParam(value ="是否视图",access = "判断是否是视图，如果不是视图，则是表名")
+    //EnunmUtil.TRUE_OR_FALSE
+    private int isView;
+}

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.form.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 数据对象
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2019-02-27 10:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="bf_data_object_property")
+@Api(value="数据对象属性表",description = "数据对象的属性明细表")
+public class BfDataObjectProperty extends BaseBean {
+
+    @Column(name="DATA_OBJECT_ID")
+    @ApiParam(value ="数据对象ID" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    //外键关联数据对象主键
+    private Long dataObjectId;
+
+    @Column(name="PROP_NAME")
+    @ApiParam(value ="属性中文名称")
+    private String propName;
+
+    @Column(name="PROP_OBJECT_NAME")
+    @ApiParam(value ="对象中的属性名")
+    //在动态对象中的属性名
+    private String propObjectName;
+
+    @Column(name="PROP_COLUMN_NAME")
+    @ApiParam(value ="属性字段名")
+    //属性在数据库中的字段名
+    private String propColumnName;
+
+}

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectRefer.java

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.form.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 数据对象
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2019-02-27 10:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="bf_data_object")
+@Api(value="数据对象表",description = "用来存储动态对象的相关属性")
+public class BfDataObjectRefer extends BaseBean {
+
+    @Column(name="NAME")
+    @ApiParam(value ="中文名称")
+    private String objectName;
+
+    @Column(name="TABLE_NAME")
+    @ApiParam(value ="表名")
+    private String tableName;
+
+    @Column(name="is_view")
+    @ApiParam(value ="是否视图",access = "判断是否是视图，如果不是视图，则是表名")
+    //EnunmUtil.TRUE_OR_FALSE
+    private int isView;
+}

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

@@ -101,8 +101,4 @@ public class WmsDocMovementMaster extends BaseBean {
     @Column(name = "PRIORITY")
     @ApiParam(value = "优先级", example = "1")
     public Integer priority;
-
-    @Transient
-    @ApiParam(value = "移库单明细集合")
-    private List<WmsDocMovementDetails> wmsDocMovementDetailsList;
 }

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

@@ -1338,24 +1338,13 @@ public class WmsHqlPack {
 
     /**
      *  根据用户角色id列表查询数据权限信息
-     * @param roleIds
      * @return
      */
-    public static String packHqlWmsDataAuth(List<String> roleIds) {
-        StringBuffer result = new StringBuffer();
-        String data = String.join(",", roleIds);
-        HqlPack.getInPack(data,"roleCode",result);
-        getStringBuilderPack(new WmsDataAuth(), result);
-        return result.toString();
-    }
-
-    /**
-     *  根据用户角色id列表查询数据权限信息
-     * @return
-     */
-    public static String packHqlWmsDataAuth(WmsDataAuth dataAuth) {
+    public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringEqualPack(dataAuth.getDataObj() ,"dataObj", result);
+        String data = String.join(",", roleIds);
+        HqlPack.getInPackString(data, "roleCode", result);
         getStringBuilderPack(new WmsDataAuth(), result);
         return result.toString();
     }