用户信息拆分 合并代码处理

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

@@ -8,8 +8,10 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import org.hibernate.annotations.GenericGenerator;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.persistence.*;
+import javax.xml.bind.annotation.XmlType;
 import java.io.Serializable;
 
 /**
@@ -54,7 +56,13 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="is_valid")
     @ApiParam(value = "有效性",example = "1")
-    public Integer isValid;    //EnumUtil.isValid;
+    //启用停用
+    public Integer isValid;    //CommonEnumUtil.IS_VAILD;
+
+    @Column(name="is_deleted")
+    @ApiParam(value = "是否已删除",example = "2")
+    //逻辑删除，软删除
+    public Integer isDeleted;    //CommonEnumUtil.TRUE_OR_FALSE
 
     @Column(name="create_user",updatable = false)
     @ApiParam(value = "创建用户")
@@ -73,25 +81,25 @@ public abstract class BaseBean implements Serializable {
     public String modifyDatetime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="创建日期查询用，查询起始日期",example = "2000-01-01 01:00:00")
+    @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
     public transient String createDateTimeStart;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="创建日期查询用，查询结束日期",example = "2000-01-01 01:00:00")
+    @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public transient String createDateTimeEnd;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="修改日期查询用，查询起始日期",example = "用于前台查询")
+    @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
     public transient String modifyDateTimeStart;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value = "修改日期查询用，查询结束日期",example = "用于前台查询")
+    @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public transient String modifyDateTimeEnd;
 
     @ApiParam(value = "排序属性")
     public transient String orderByParam = "";
 
-    @ApiParam(value = "排序属性",example = "1")
+    @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
     public transient int ascOrDesc = 1;
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.base.tool;
+package cn.estsh.i3plus.pojo.base.codemaker;
 
 /**
  * @Description : 使用SnowFlake，生成分布式ID

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

@@ -550,6 +550,7 @@ public class CommonEnumUtil {
         }
     }
 
+
     /**
      * 性别
      */

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

@@ -10,10 +10,248 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @Modify:
  **/
 public class WmsEnumUtil {
+    /**
+     * PO订单明细信息 是否免费
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_FREE {
+        CHARGING(0, "计费"), GRATIS(1, "免费");
+
+        private int value;
+        private String description;
+
+        private IS_FREE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * PO订单明细信息 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_DETAILS_STATUS {
+        NORMAL(10, "N", "正常"),
+        ANCEL(20, "C", "行取消");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ORDER_DETAILS_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            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 static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * PO主表信息 单据来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PO_ORDER_SRC {
+        MNU(1, "MNU", "手工"),
+        ERP(2, "ERP", "ERP接口");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private PO_ORDER_SRC(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            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 static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+    /**
+     * PO主表信息 单据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PO_ORDER_TYPE {
+        REG(1, "REG", "原物料采购"),
+        SUB(10, "SUB", "委外采购"),
+        TAR(20, "TAR", "多角贸易采购"),
+        TAP(30, "TAP", "多角代采购");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private PO_ORDER_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            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 static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * PO主表信息 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_STATUS {
+        CREATE(0, "新建"),
+        RECEIPT(10, "收货中"),
+        RECEIPT_FINISH(20, "收货完成"),
+        WAREHOUSING(30, "入库中"),
+        WAREHOUSING_FINISH(40, "入库完成"),
+        CLOSED(90, "已关闭"),
+        CANCELLED(91, "已取消");
+
+        private int value;
+        private String description;
+
+        private ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        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;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 
     /**
      * 交易状态
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRANS_STATUS {
         CREATE(1, "创建"), FINISH(2, "完成"),FAIL(3,"失败");
 
@@ -110,4 +348,124 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * ASN单据类型
+     */
+    public enum ASN_ORDER_TYPE{
+
+        REG("REG","原物料采购"),SUB("SUB","委外采购"),TAR("TAR","多角贸易采购"),TAP("TAP","多角代采购");
+
+        private String value;
+        private String description;
+
+        ASN_ORDER_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * ASN明细表状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ASN_MASTER_ORDER_STATUS {
+        NORMAL(1, "N", "正常"),
+        CANCEL(2, "C", "行取消"),
+        RECEIPTED(3, "R", "已收货");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ASN_MASTER_ORDER_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            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 static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 是否已删除
+     */
+    public enum IS_DELETED {
+        DELETED(1, "已删除"), INDELETED(2, "未删除");
+
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        IS_DELETED(int value, String description) {
+            this.value = value;
+            this.description = 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;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java

@@ -36,13 +36,13 @@ public interface BaseMongoRepository<T, ID extends Serializable> extends MongoRe
 
     List<T> findByBson(Bson bson,String orderByParam, int ascOrDesc);
 
-    long findByBsonCount(Bson bson);
+    int findByBsonCount(Bson bson);
 
     List<T> findByBsonPager(Bson bson,Pager pager);
 
     List<T> findByBsonPager(Bson bson,Pager pager,String orderByParam, int ascOrDesc);
 
-    long listCount();
+    int listCount();
 
     List<T> listPager(Pager pager);
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -151,7 +151,7 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
 
     public int listCount();
 
-    public long findByPropertyCount(String propertyName, Object value);
+    public int findByPropertyCount(String propertyName, Object value);
 
     public int findByPropertyCount(String[] propertyNames, Object[] values);
 
@@ -229,7 +229,7 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     public int deleteWeaklyByProperties(String[] propNames, Object[] objValues,String username);
 
     /**
-     * 更新有效无效状态
+     * 更新启用禁用
      * @return count
      */
     public int updateValidStatusById(ID id,int status,String username);
@@ -237,4 +237,19 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     public int updateValidStatusByProperty(String propName, Object propValue,int status,String username);
     public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status,String username);
     public int updateValidStatusByProperties(String[] propNames, Object[] objValues,int status,String username);
+
+    public boolean isExitByProperty(String propertyName, Object value);
+
+    public boolean isExitByProperty(String[] propertyNames, Object[] values);
+
+    public boolean isExitByHqlWhere(String hqlWhere,String[] propertyNames, Object[] values);
+
+    public boolean isExitByHqlWhere(String hqlWhere);
+
+    public boolean isExitByHql(String hql);
+
+    public boolean isExitByHql(String hql,String[] paramName,Object[] paramValue);
+
+    public boolean isExitBySql(String sql);
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java

@@ -3,7 +3,7 @@ package cn.estsh.i3plus.pojo.base.jpa.daoimpl;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
-import cn.estsh.i3plus.pojo.base.tool.SnowflakeIdMaker;
+import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
 import com.alibaba.fastjson.JSONObject;
 import com.mongodb.Block;
 import com.mongodb.client.FindIterable;
@@ -22,7 +22,6 @@ import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.mongodb.repository.support.SimpleMongoRepository;
-import springfox.documentation.spring.web.json.Json;
 
 import javax.persistence.Id;
 import java.io.Serializable;
@@ -52,13 +51,13 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
     private final Class<T> entityClass;
     private SnowflakeIdMaker snowflakeIdMaker;
 
-    public BaseMongoRepositoryImpl(MongoEntityInformation<T, ID> metadata, MongoOperations mongoOperations) {
+    public BaseMongoRepositoryImpl(MongoEntityInformation<T, ID> metadata, MongoOperations mongoOperations,SnowflakeIdMaker snowflakeIdMaker) {
         super(metadata, mongoOperations);
         this.entityInformation = metadata;
         this.mongoOperations = mongoOperations;
         this.entityClass = this.entityInformation.getJavaType();
         mongoContext = mongoOperations.getConverter().getMappingContext();
-        snowflakeIdMaker = new SnowflakeIdMaker();
+        this.snowflakeIdMaker = snowflakeIdMaker;
     }
 
     /**
@@ -216,11 +215,11 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
     }
 
     @Override
-    public long findByBsonCount(Bson bson) {
+    public int findByBsonCount(Bson bson) {
         if(bson == null){
-            return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count();
+            return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count();
         }else {
-            return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(bson);
+            return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(bson);
         }
     }
 
@@ -274,8 +273,8 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
     }
 
     @Override
-    public long listCount() {
+    public int listCount() {
-        return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count();
+        return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count();
     }
 
     @Override

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -3,7 +3,7 @@ package cn.estsh.i3plus.pojo.base.jpa.daoimpl;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.base.tool.SnowflakeIdMaker;
+import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
@@ -406,11 +406,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     @Override
-    public long findByPropertyCount(String propertyName, Object value) {
+    public int findByPropertyCount(String propertyName, Object value) {
         String queryString = "select count(distinct model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName;
-        return entityManager.createQuery(queryString, Long.class)
+        Long count = entityManager.createQuery(queryString, Long.class)
                 .setParameter(propertyName, value)
                 .getSingleResult();
+        return count == null ? 0 : count.intValue();
     }
 
     @Override
@@ -880,10 +881,10 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username) {
         if(propValues != null && propValues.length > 0){
             String hql = "update " + persistentClass.getName()
-                    + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime  where model."
+                    + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime  where model."
                     + propName + " in(:"+propName+") ";
             Query query = entityManager.createQuery(hql);
-            query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue());
+            query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
             query.setParameter("modifyUser",username);
             query.setParameter("modifyDatetime",getNowTime(true));
             query.setParameter(propName, Arrays.asList(propValues));
@@ -902,12 +903,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int deleteWeaklyByProperties(String[] propName, Object[] propValue,String username) {
         if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) {
             StringBuffer sb = new StringBuffer("update " + persistentClass.getName()
-                    + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 ");
+                    + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 ");
             appendQL(sb,propName,propValue);
             Query query = entityManager.createQuery(sb.toString());
             query.setParameter("modifyUser",username);
             query.setParameter("modifyDatetime",getNowTime(true));
-            query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue());
+            query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
 
             setParameter(query,propName,propValue);
 
@@ -933,7 +934,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     /**
-     * 批量弱删除
+     * 批量禁用
      * @return
      */
     @Override
@@ -955,7 +956,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     /**
-     * 批量弱删除
+     * 批量禁用
      * @return
      */
     @Override
@@ -976,4 +977,40 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             throw new IllegalArgumentException("修改状态失败："+propName+":" + propValue);
         }
     }
+
+    @Override
+    public boolean isExitByProperty(String propertyName, Object value) {
+        //大于0，存在
+        return findByPropertyCount(propertyName,value) > 0;
+    }
+
+    @Override
+    public boolean isExitByProperty(String[] propertyNames, Object[] values) {
+        return findByPropertyCount(propertyNames, values) > 0;
+    }
+
+    @Override
+    public boolean isExitByHqlWhere(String hqlWhere, String[] propertyNames, Object[] values) {
+        return findByHqlWhereCount(hqlWhere,propertyNames,values) > 0;
+    }
+
+    @Override
+    public boolean isExitByHqlWhere(String hqlWhere) {
+        return findByHqlWhereCount(hqlWhere) > 0;
+    }
+
+    @Override
+    public boolean isExitByHql(String hql) {
+        return findByHqlCount(hql) > 0;
+    }
+
+    @Override
+    public boolean isExitByHql(String hql, String[] paramName, Object[] paramValue) {
+        return findByHqlCount(hql) > 0;
+    }
+
+    @Override
+    public boolean isExitBySql(String sql) {
+        return findBySqlCount(sql) > 0;
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.base.jpa.factory;
 
 import cn.estsh.i3plus.pojo.base.jpa.daoimpl.BaseMongoRepositoryImpl;
+import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
@@ -24,6 +26,9 @@ import java.io.Serializable;
 public class BaseMongoRepositoryFactoryBean<R extends MongoRepository<T, I>, T, I extends Serializable> extends MongoRepositoryFactoryBean<R, T, I> {
     public static final Logger LOGGER = LoggerFactory.getLogger(BaseMongoRepositoryFactoryBean.class);
 
+    @Autowired
+    public SnowflakeIdMaker snowflakeIdMaker;
+
     public BaseMongoRepositoryFactoryBean(Class<? extends R> repositoryInterface) {
         super(repositoryInterface);
     }
@@ -32,18 +37,19 @@ public class BaseMongoRepositoryFactoryBean<R extends MongoRepository<T, I>, T,
     protected RepositoryFactorySupport getFactoryInstance(MongoOperations operations) {
         //LOGGER.info("【初始mongo持久仓】");
         //生成持久mongo仓库实例
-        return new BaseMongoRepositoryFactory(operations);
+        return new BaseMongoRepositoryFactory(operations,snowflakeIdMaker);
     }
 
     //创建一个内部类，该类不用在外部访问
     private static class BaseMongoRepositoryFactory<T, I extends Serializable> extends MongoRepositoryFactory {
-
         private final MongoOperations mongoOperations;
         //private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+        private final SnowflakeIdMaker snowflakeIdMaker;
 
-        public BaseMongoRepositoryFactory(MongoOperations mongoOperations) {
+        public BaseMongoRepositoryFactory(MongoOperations mongoOperations,SnowflakeIdMaker snowflakeIdMaker) {
             super(mongoOperations);
             this.mongoOperations = mongoOperations;
+            this.snowflakeIdMaker = snowflakeIdMaker;
             //this.mappingContext = mongoOperations.getConverter().getMappingContext();
         }
 
@@ -51,7 +57,7 @@ public class BaseMongoRepositoryFactoryBean<R extends MongoRepository<T, I>, T,
         @Override
         protected Object getTargetRepository(RepositoryInformation information) {
             MongoEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
-            return new BaseMongoRepositoryImpl(entityInformation, mongoOperations);
+            return new BaseMongoRepositoryImpl(entityInformation, mongoOperations,snowflakeIdMaker);
         }
 
         //设置具体的实现类的class

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java

@@ -14,6 +14,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.regex.Pattern;
 
 /**
  * @Description :
@@ -118,12 +119,10 @@ public class BsonPackTool {
      * @param isShowTime 是否包含时分秒
      */
     public static Bson timeBuilder( String startDate,String endDate, String columnName, Bson bson, boolean isShowTime) {
-        startDate = getSafeParam(startDate);
-        endDate = getSafeParam(endDate);
-
         if (startDate == null || startDate.trim().length() == 0) {
             startDate = "1900-01-01";
         } else {
+            startDate = getSafeParam(startDate);
             startDate = startDate.trim();
         }
         if (isShowTime && startDate.trim().length()<=11) {
@@ -132,6 +131,7 @@ public class BsonPackTool {
         if (endDate == null || endDate.trim().length() == 0) {
             endDate = "2100-01-01";
         } else {
+            endDate = getSafeParam(endDate);
             endDate = endDate.trim();
         }
         if (isShowTime&& endDate.trim().length()<=11) {
@@ -158,18 +158,19 @@ public class BsonPackTool {
      * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间）
      * @param columnName HQL里对应的时间字段
      * @param bson 封装的bson
-     * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有
+     * @param showToday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有
      * @param isShowTime 是否包含时分秒
      */
-    public static Bson timeBuilder( String date, String columnName, Bson bson, Boolean showTaday,boolean isShowTime) {
+    public static Bson timeBuilder( String date, String columnName, Bson bson, Boolean showToday,boolean isShowTime) {
+        if(date != null && date.trim().length() > 0){
             date = getSafeParam(date);
 
             String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
-        if(date != null && date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))){
+            if(date.length() == 1 || ",".equals(date)){
                 //只有一个逗号
                 date = "";
             }
-        if(date != null && date.trim().length() > 0){
+
             String[] time = date.split(",");
             if(time.length == 1){
                 //只有开始日期，没有结束日期
@@ -213,7 +214,7 @@ public class BsonPackTool {
                     );
                 }
             } else {
-                if (showTaday) {
+                if (showToday) {
                     if (isShowTime) {
                         if(bson == null) {
                             bson = Filters.and(
@@ -264,7 +265,7 @@ public class BsonPackTool {
             }else{
                 bson = Filters.and(
                         bson,
-                        Filters.regex(columnName, str) //like
+                        Filters.regex(columnName, str)//like
                 );
             }
         }
@@ -373,7 +374,6 @@ public class BsonPackTool {
      */
     public static Bson getNumEqualPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) > 0){
-            data = getSafeParam(data);
             if(bson == null) {
                 bson = Filters.and(
                         Filters.eq(columnName, data)
@@ -395,8 +395,6 @@ public class BsonPackTool {
      */
     public static Bson getNumEqualPackForZero(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) >= 0){
-            data = getSafeParam(data);
-
             if(bson == null) {
                 bson = Filters.and(
                         Filters.eq(columnName, data)
@@ -418,7 +416,6 @@ public class BsonPackTool {
      */
     public static Bson getNumWithZeroEqualPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) >= 0){
-            data = getSafeParam(data);
             if(bson == null) {
                 bson = Filters.and(
                         Filters.eq(columnName, data)
@@ -440,7 +437,6 @@ public class BsonPackTool {
      */
     public static Bson getNumBiggerPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) > 0){
-            data = getSafeParam(data);
             if(bson == null) {
                 bson = Filters.and(
                         Filters.gt(columnName, data)
@@ -462,7 +458,6 @@ public class BsonPackTool {
      */
     public static Bson getNumSmallerPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) > 0){
-            data = getSafeParam(data);
             if(bson == null) {
                 bson = Filters.and(
                         Filters.lt(columnName, data)
@@ -484,7 +479,6 @@ public class BsonPackTool {
      */
     public static Bson getDoubleBiggerPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Double.parseDouble(data.toString()) > 0){
-            data = getSafeParam(data);
             if(bson == null) {
                 bson = Filters.and(
                         Filters.gt(columnName, data)
@@ -506,7 +500,6 @@ public class BsonPackTool {
      */
     public static Bson getDoubleSmallerPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Double.parseDouble(data.toString()) > 0){
-            data = getSafeParam(data);
             if(bson == null) {
                 bson = Filters.and(
                         Filters.lt(columnName, data)
@@ -528,7 +521,6 @@ public class BsonPackTool {
      */
     public static Bson getNumEqualPack(Object data,String columnName, Bson bson,Integer expvalue) {
         if(data!=null&&Long.parseLong(data.toString()) > (long)expvalue){
-            data = getSafeParam(data);
             if(bson == null) {
                 bson = Filters.and(
                         Filters.eq(columnName, data)
@@ -550,7 +542,6 @@ public class BsonPackTool {
      */
     public static Bson getNumEqualPackDouble(Object data,String columnName, Bson bson) {
         if(data!=null&&Double.parseDouble(data.toString()) > 0){
-            data = getSafeParam(data);
             if(bson == null) {
                 bson = Filters.and(
                         Filters.eq(columnName, data)
@@ -572,7 +563,6 @@ public class BsonPackTool {
      */
     public static Bson getNumEqualPackDouble(Object data,String columnName, Bson bson,Integer expvalue) {
         if(data!=null&&Double.parseDouble(data.toString()) > (double)expvalue){
-            data = getSafeParam(data);
             if(bson == null) {
                 bson = Filters.and(
                         Filters.eq(columnName, data)
@@ -594,7 +584,6 @@ public class BsonPackTool {
      */
     public static Bson getNumNOEqualPack(Object data,String columnName, Bson bson) {
         if(data!=null){
-            data = getSafeParam(data);
             if(bson == null) {
                 bson = Filters.and(
                         Filters.ne(columnName, data)

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.util.List;
  **/
 @Data
 @Entity
-@Table(name="DEPARTMENT")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="DEPARTMENT")
 @Api(value="部门",description = "部门")
 public class Department extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -21,9 +22,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="ENTERPRISE")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="ENTERPRISE")
 @Api(value="企业信息",description = "企业信息")
 public class Enterprise extends BaseBean {
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="ENTERPRISE_CONFIG")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="ENTERPRISE_CONFIG")
 @Api(value="企业配置信息",description = "企业配置信息")
 public class EnterpriseConfig extends BaseBean {
 

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

@@ -3,6 +3,7 @@ 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;
 
@@ -21,6 +22,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="factory_store")
 @Api("工厂仓库")
 public class FactoryStore extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -21,9 +22,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="LOG_OPERATE")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="LOG_OPERATE")
 @Api(value="操作日志表",description = "操作日志表")
 public class LogOperate extends BaseBean {
 

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

@@ -1,9 +1,12 @@
 package cn.estsh.i3plus.pojo.platform.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;
 
@@ -21,9 +24,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="LOG_SYSTEM")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="LOG_SYSTEM")
 @Api(value="系统日志表",description = "系统日志表")
 public class LogSystem extends BaseBean {
 
@@ -47,7 +51,7 @@ public class LogSystem extends BaseBean {
 
     @Column(name="HTTP_METHOD")
     @ApiParam(value ="http请求方法" , access ="http请求方法")
-    private String httpMethod;;
+    private String httpMethod;
 
     @Column(name="LOG_CLASS")
     @ApiParam(value ="触发类路径" , access ="触发类路径")
@@ -58,7 +62,7 @@ public class LogSystem extends BaseBean {
     private String logMethod;
 
     @Column(name="ARGS_COUNT")
-    @ApiParam(value ="入参数量" , access ="入参数量")
+    @ApiParam(value ="入参数量" , access ="入参数量", example = "0")
     private Integer argsCount;
 
     @Column(name="LOG_ARGS")
@@ -80,5 +84,6 @@ public class LogSystem extends BaseBean {
 
     @Column(name="EXECUTE_TIME")
     @ApiParam(value ="执行耗时")
-    private long executeTime;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long executeTime;
 }

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

@@ -4,6 +4,7 @@ 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;
 
@@ -21,9 +22,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="LOG_USER_LOGIN")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="LOG_USER_LOGIN")
 @Api(value="用户登录记录",description = "用户登录记录")
 public class LogUserLogin extends BaseBean {
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -24,9 +25,10 @@ import java.util.List;
  **/
 @Data
 @Entity
-@Table(name="ORGANIZE")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="ORGANIZE")
 @Api(value="组织",description = "组织")
 public class Organize extends BaseBean {
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.util.List;
  **/
 @Data
 @Entity
-@Table(name="POSITION")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="POSITION")
 @Api(value="岗位",description = "岗位")
 public class Position extends BaseBean {
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="REF_ROLE_MENU")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="REF_ROLE_MENU")
 @Api(value="关系-角色菜单",description = "关系-角色菜单")
 public class RefRoleMenu extends BaseBean {
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="REF_USER_DEPARTMENT")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="REF_USER_DEPARTMENT")
 @Api(value="关系-用户部门",description = "关系-用户部门")
 public class RefUserDepartment extends BaseBean {
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="REF_USER_POSITION")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="REF_USER_POSITION")
 @Api(value="关系-用户岗位",description = "关系-用户岗位")
 public class RefUserPosition extends BaseBean {
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="REF_USER_ROLE")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="REF_USER_ROLE")
 @Api(value="关系-用户角色",description = "关系-用户角色")
 public class RefUserRole extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -21,9 +22,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="SYS_CONFIG")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_CONFIG")
 @Api(value="系统配置",description = "系统配置")
 public class SysConfig extends BaseBean {
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="SYS_DICTIONARY")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_DICTIONARY")
 @Api(value="系统字典",description = "系统字典")
 public class SysDictionary extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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 javax.persistence.Column;
 import javax.persistence.Entity;
@@ -17,8 +18,9 @@ import javax.persistence.Table;
  * @Modify:
  **/
 @Entity
-@Table(name="sys_employee")
 @Data
+@EqualsAndHashCode(callSuper = true)
+@Table(name="sys_employee")
 @Api(value="用户登陆表",description = "用户登陆系统账户。")
 public class SysEmployee extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -20,9 +21,10 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name="SYS_EXCEPTION")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_EXCEPTION")
 @Api(value="系统异常表",description = "记录系统出现的异常")
 public class SysException extends BaseBean {
  

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="SYS_FILE")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_FILE")
 @Api(value="文件",description = "文件")
 public class SysFile extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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 javax.persistence.Column;
 import javax.persistence.Entity;
@@ -18,6 +19,7 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
+@EqualsAndHashCode(callSuper = true)
 @Table(name="sys_locale_language")
 @Api(value="系统语言表",description = "对系统语言进行匹配。")
 public class SysLocaleLanguage extends BaseBean {

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -20,8 +21,9 @@ import javax.persistence.Table;
  * @Modify:
  **/
 @Entity
-@Table(name="sys_locale_resource")
 @Data
+@EqualsAndHashCode(callSuper = true)
+@Table(name="sys_locale_resource")
 @Api(value="系统资源",description = "对按钮、功能、信息提示等进行转换。")
 public class SysLocaleResource  extends BaseBean {
 
@@ -50,9 +52,4 @@ public class SysLocaleResource  extends BaseBean {
     @ApiParam(value = "是否系统参数",example = "2")
     //系统自带需要有初始化表，只能修改value，无法删除。
     private Integer isSystem;
-
-    @Column(name="is_default")
-    @ApiParam(value = "是否默认",example = "2")
-    //CommonEnumUtil.TRUE_OR_FALSE，新增resources时如果
-    private Integer isDefault;
 }

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

@@ -6,6 +6,7 @@ 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;
 
@@ -26,6 +27,7 @@ import java.util.List;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="SYS_MENU")
 @Api(value="系统功能",description = "系统功能")
 public class SysMenu extends BaseBean {

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="SYS_MESSAGE")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_MESSAGE")
 @Api(value="系统消息",description = "系统消息")
 public class SysMessage extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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 javax.persistence.Column;
 import javax.persistence.Entity;
@@ -17,8 +18,9 @@ import javax.persistence.Table;
  * @Modify:
  **/
 @Entity
-@Table(name="sys_method")
 @Data
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_METHOD")
 @Api(value="功能权限表",description = "功能权限包含模块、功能及按钮等权限。")
 public class SysMethod extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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 javax.persistence.Column;
 import javax.persistence.Entity;
@@ -17,8 +18,9 @@ import javax.persistence.Table;
  * @Modify:
  **/
 @Entity
-@Table(name="SYS_METHOD_ROLE")
 @Data
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_METHOD_ROLE")
 @Api(value="角色权限表",description = "关联角色和权限。")
 public class SysMethodRole extends BaseBean {
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -24,6 +25,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="SYS_ROLE")
 @Api(value="用户角色表",description = "用户权限角色。")
 public class SysRole extends BaseBean {

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

@@ -7,6 +7,7 @@ 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;
 
@@ -26,6 +27,7 @@ import java.util.List;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="sys_user")
 @Api(value="用户登陆表",description = "用户登陆系统账户。")
 public class SysUser extends BaseBean {

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

@@ -7,6 +7,7 @@ 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;
 
@@ -25,9 +26,10 @@ import java.util.List;
  **/
 @Data
 @Entity
-@Table(name="SYS_USER_INFO")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_USER_INFO")
 @Api(value="用户详细",description = "用户详细")
 public class SysUserInfo extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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 javax.persistence.Column;
 import javax.persistence.Entity;
@@ -17,8 +18,9 @@ import javax.persistence.Table;
  * @Modify:
  **/
 @Entity
-@Table(name="sys_user_role")
 @Data
+@EqualsAndHashCode(callSuper = true)
+@Table(name="sys_user_role")
 @Api(value="用户角色表",description = "关联用户和角色。")
 public class SysUserRole extends BaseBean {
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="TASK_TIME")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="TASK_TIME")
 @Api(value="定时任务",description = "定时任务")
 public class TaskTime extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -21,9 +22,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="Task_TIME_EXPRESSION")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="TASK_TIME_EXPRESSION")
 @Api(value="系统时间表达式",description = "系统时间表达式")
 public class TaskTimeExpression extends BaseBean {
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="TASK_TIME_RECORDING")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="TASK_TIME_RECORDING")
 @Api(value="定时任务执行记录",description = "定时任务执行记录")
 public class TaskTimeRecording extends BaseBean {
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -23,9 +24,10 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="TOOL")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="TOOL")
 @Api(value="硬件设备表",description = "硬件设备表")
 public class Tool extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -24,6 +25,7 @@ import java.text.DecimalFormat;
 @Table(name="TOOL_TYPE")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="设备类型",description = "设备类型")
 public class ToolType extends BaseBean {
 

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.platform.sqlpack;
+
+import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
+import cn.estsh.i3plus.pojo.platform.bean.LogOperate;
+import cn.estsh.i3plus.pojo.platform.bean.LogSystem;
+import com.mongodb.BasicDBObject;
+import com.mongodb.client.model.Filters;
+import org.bson.conversions.Bson;
+
+import java.util.regex.Pattern;
+
+/**
+ * @Description : Bson对象封装
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-11-08 13:15
+ * @Modify:
+ **/
+public class CoreBsonPack {
+
+    /**
+     * 日志复杂查询
+     * @param logSystem
+     * @return
+     */
+    public static Bson packBsonByLogSystem(LogSystem logSystem){
+        Bson bson = new BasicDBObject();
+
+        bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(),"logLevel",bson);
+        bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(),"logModuleId",bson);
+        bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(),"createDatetime",bson,false,false);
+        bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(),"remoteIp",bson);
+        bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(),"requestUrl",bson);
+        bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(),"logMethod",bson);
+
+        return bson;
+    }
+
+    public static Bson packBsonByLogOperate(LogOperate logOperate){
+        Bson bson = new BasicDBObject();
+
+        bson = BsonPackTool.getNumEqualPack(logOperate.getOperateTypeId(),"operateTypeId",bson);
+        bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModuleId(),"operateModuleId",bson);
+        bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(),"createDatetime",bson,false,false);
+        bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(),"createUser",bson);
+
+        return bson;
+    }
+}

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

@@ -24,12 +24,14 @@ public class CoreHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询日期
-        HqlPack.timeBuilder(sysLocaleResource.getCreateDateTimeStart(),sysLocaleResource.getCreateDateTimeEnd(),
+//        HqlPack.timeBuilder(sysLocaleResource.getCreateDateTimeStart(),sysLocaleResource.getCreateDateTimeEnd(),
-                "createDateTime", result, false);
+//                "createDateTime", result, false);
         //数字类型封装
         HqlPack.getNumEqualPack(sysLocaleResource.getResourceType(),"resourceType",result);
         //字符串类型封装
         HqlPack.getStringEqualPack(sysLocaleResource.getLanguageCode(),"languageCode",result);
+        //字符串类型封装
+        HqlPack.getStringLikerPack(sysLocaleResource.getResourceKey(),"resourceKey",result);
 
         return result.toString();
     }
@@ -43,12 +45,12 @@ public class CoreHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询日期
-        HqlPack.timeBuilder(lang.getCreateDateTimeStart(),lang.getCreateDateTimeEnd(),
+//        HqlPack.timeBuilder(lang.getCreateDateTimeStart(),lang.getCreateDateTimeEnd(),
-                "createDateTime", result, false);
+//                "createDateTime", result, false);
-        //数字类型封装
-        HqlPack.getNumEqualPack(lang.getLanguageCode(),"languageCode",result);
         //字符串类型封装
-        HqlPack.getStringEqualPack(lang.getLanguageName(),"languageName",result);
+        HqlPack.getStringLikerPack(lang.getLanguageCode(),"languageCode",result);
+        //字符串类型封装
+        HqlPack.getStringLikerPack(lang.getLanguageName(),"languageName",result);
 
         return result.toString();
     }
@@ -303,6 +305,11 @@ public class CoreHqlPack {
         return  result.toString();
     }
 
+    /**
+     * 查询字典代码是否重复
+     * @param sysDictionary
+     * @return
+     */
     public static String packHqlSysDictionaryCode(SysDictionary sysDictionary){
         StringBuffer result = new StringBuffer();
 
@@ -334,4 +341,32 @@ public class CoreHqlPack {
         return  result.toString();
     }
 
+    /**
+     * 查询语言代码是否重复
+     * @param sysLocaleLanguage
+     * @return
+     */
+    public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage sysLocaleLanguage){
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringEqualPack(sysLocaleLanguage.getLanguageCode(),"languageCode",result);
+        HqlPack.getNumNOEqualPack(sysLocaleLanguage.getId(),"id",result);
+
+        return result.toString();
+    }
+
+    /**
+     * 检查系统资源是否重复
+     * @param sysLocaleResource
+     * @return
+     */
+    public static String packHqlSysLocaleResourceKey(SysLocaleResource sysLocaleResource){
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringEqualPack(sysLocaleResource.getLanguageCode(),"languageCode",result);
+        HqlPack.getStringEqualPack(sysLocaleResource.getResourceKey(),"resourceKey",result);
+        HqlPack.getNumNOEqualPack(sysLocaleResource.getId(),"id",result);
+
+        return result.toString();
+    }
 }

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

@@ -4,6 +4,7 @@ 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;
 
@@ -23,6 +24,7 @@ import javax.persistence.Table;
 @Table(name="BAS_CUSTOMER")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="客户信息表",description = "客户信息表")
 public class BasCustomer extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="BAS_VENDOR")
 @Api("供应商")
 public class BasVendor extends BaseBean{
@@ -50,7 +52,7 @@ public class BasVendor extends BaseBean{
     @ApiParam("邮箱")
     private String vendorEmail;
 
-    @Column(name="IS_ASN")
+    @Column(name = "IS_ASN")
-    @ApiParam("是否发ASN")
+    @ApiParam(value = "是否发ASN", example = "0")
     private Integer isAsn;
 }

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_WAREHOUSE")
 @Api("工厂仓库信息")
 public class WareHouse extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_ASN_MASTER")
 @Api("ASN主表信息")
 public class WmsASNMaster extends BaseBean {
@@ -34,17 +36,17 @@ public class WmsASNMaster extends BaseBean {
      * 单据类型:REG=原物料采购,
      * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购
      */
-    @Column(name="TYPE")
+    @Column(name="ASN_TYPE")
     @ApiParam("单据类型")
-    public String type;
+    public String asnType;
 
     /**
      * 状态:0=新建,10=收货中,20=收货完成,
      * 30=入库中,40=入库完成,90=已关闭,91=已取消
      */
-    @Column(name="STATUS")
+    @Column(name="ASN_STATUS")
     @ApiParam(value = "状态", example = "0")
-    public Integer status;
+    public Integer asnStatus;
 
     @Column(name="VENDOR_NO")
     @ApiParam("供应商编号")

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_ASN_DETAILS")
 @Api("ASN订单明细信息")
 public class WmsASNMasterDetails extends BaseBean {
@@ -65,13 +67,13 @@ public class WmsASNMasterDetails extends BaseBean {
     /**
      * 状态:N=正常,C=行取消,R=已收货
      */
-    @Column(name="STATUS")
+    @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
-    public Integer status;
+    public Integer itemStatus;
 
     @Column(name="PACKAGE")
     @ApiParam("包装名称")
-    public String pageAge;
+    public String packAge;
 
     /**
      * 是否免费:0=计费,1=免费

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

@@ -4,6 +4,7 @@ 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;
 
@@ -23,6 +24,7 @@ import javax.persistence.Table;
 @Table(name="WMS_AREA_OWNER")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="责任区域分配信息",description = "责任区域分配信息")
 public class WmsAreaOwner extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -23,6 +24,7 @@ import javax.persistence.Table;
 @Table(name="WMS_BUTTON")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="元数据按钮信息表",description = "元数据按钮信息表")
 public class WmsButton extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_CS_FACTTRANS")
 @Api("盘点实盘信息")
 public class WmsCSFactTrans extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_CS_LOCATE")
 @Api("盘点库位信息")
 public class WmsCSLocate extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_CS_DETAILS")
 @Api("盘点单冻结信息")
 public class WmsCSOrderDetails extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_CS_ORDER")
 @Api("盘点单主表信息")
 public class WmsCSOrderMaster extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_CS_PART")
 @Api("盘点区物料信息")
 public class WmsCSPart extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_CS_ZONE")
 @Api("盘点存储区信息")
 public class WmsCSZone extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_IB_CHECK_FACT")
 @Api("抽点记录信息")
 public class WmsCheckFactRecord extends BaseBean {
@@ -61,4 +63,7 @@ public class WmsCheckFactRecord extends BaseBean {
     @Column(name="CHECK_QTY")
     @ApiParam(value = "抽点数量", example = "0")
     public Double checkQty;
+
+    @ApiParam(value ="供应商全称")
+    private transient String vendorDesc;
 }

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

@@ -0,0 +1,119 @@
+package cn.estsh.i3plus.pojo.wms.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 : dragon.xu
+ * @CreateDate : 2018-11-13 16:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_DOC_MOVEMENT_DETAILS")
+@Api("移库单详情表")
+public class WmsDocMovementDetails extends BaseBean {
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "单号")
+    private String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam(value = "行号", example = "1")
+    private Integer item;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @Column(name = "UNIT")
+    @ApiParam(value = "单位")
+    private String unit;
+
+    @Column(name = "SRC_WH")
+    @ApiParam(value = "发出库仓库")
+    private String srcWh;
+
+
+    @Column(name = "DEST_WH")
+    @ApiParam(value = "接收库仓库")
+    private String destWh;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "需求数量", example = "1")
+    private Double qty;
+
+    @Column(name = "PRINT_QTY")
+    @ApiParam(value = "条码打印数量", example = "1")
+    private Double printQty;
+
+    @Column(name = "FACT_QTY")
+    @ApiParam(value = "操作完成数量", example = "1")
+    private Double factQty;
+
+    @Column(name = "ZDATE")
+    @ApiParam(value = "计划日期")
+    private String zdate;
+
+    @Column(name = "ZTIME")
+    @ApiParam(value = "计划时间")
+    private String ztime;
+
+    @Column(name = "SRC_NO")
+    @ApiParam(value = "源单号")
+    private String srcNo;
+    /**
+     * 状态:N=正常,C=行取消
+     */
+    @Column(name = "ITEM_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    private Integer itemStatus;
+
+    /**
+     * 是否免费:0=计费,1=免费
+     */
+    @Column(name = "IS_FREE")
+    @ApiParam(value = "是否免费", example = "1")
+    public Integer isFree;
+
+    @Column(name = "REMARK")
+    @ApiParam(value = "操作原因")
+    private String remark;
+
+    @Column(name = "PICK_QTY")
+    @ApiParam(value = "已配数量", example = "1")
+    private Double pickQty;
+
+    @Column(name = "OUT_QTY")
+    @ApiParam(value = "已提交数量", example = "1")
+    private Double outQty;
+
+    @Column(name = "INLINE_QTY")
+    @ApiParam(value = "已上线数量", example = "1")
+    private Double inlineQty;
+
+    @Column(name = "REJECT_QTY")
+    @ApiParam(value = "退料数量", example = "1")
+    private Double rejectQty;
+
+    @Column(name = "REJECT_POST_QTY")
+    @ApiParam(value = "退料提交数量", example = "1")
+    private Double rejectPostQty;
+}

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

@@ -0,0 +1,102 @@
+package cn.estsh.i3plus.pojo.wms.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 : dragon.xu
+ * @CreateDate : 2018-11-13 16:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_DOC_MOVEMENT_MASTER")
+@Api("移库单表")
+public class WmsDocMovementMaster extends BaseBean {
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "移库单单号")
+    private String orderNo;
+    /**
+     * 移动类型:IN=入库,OUT=出库,MOVE=移库
+     */
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    public String moveType;
+    /**
+     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
+     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
+     * MI=移库入库,MO=移库出库,SO=发运
+     */
+    @Column(name = "BUSI_TYPE")
+    @ApiParam(value = "业务类型", example = "1")
+    public Integer busiType;
+
+    /**
+     * 状态:0=新建,10=处理中
+     * ,20=已完成,90=已关闭,91=已取消
+     */
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer orderStatus;
+
+    @Column(name = "CUSTOMER_NO")
+    @ApiParam(value = "客户编号")
+    private String customerNo;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @Column(name = "VERSION")
+    @ApiParam(value = "版本", example = "1")
+    private Integer version;
+
+    /**
+     * 单据类型::1=工单配料
+     */
+    @Column(name = "REF_TYPE")
+    @ApiParam(value = "关联单据类型")
+    private String refType;
+
+    @Column(name = "REF_NO")
+    @ApiParam(value = "关联单据")
+    private String refNo;
+
+    @Column(name = "ERP_SRC_NO")
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
+    /**
+     * 单据类型::1=工单配料
+     */
+    @Column(name = "ORDER_TYPE")
+    @ApiParam(value = "单据类型")
+    private String orderType;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "数量", example = "1")
+    private Double qty;
+
+}

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_FG_INSTOCK")
 @Api("产品入库信息")
 public class WmsFGInStock extends BaseBean {
@@ -55,16 +57,19 @@ public class WmsFGInStock extends BaseBean {
     public String sn;
 
     /**
-     * 状态:0=新建,10=已处理,20=处理出错
+     * 状态：1=新建,10=已处理,20=处理出错
      */
-    @Column(name="STATUS")
+    @Column(name="ORDER_STATUS")
-    @ApiParam(value = "状态", example = "0")
+    @ApiParam(value = "状态", example = "1")
-    public Integer status;
+    public Integer orderStatus;
 
     @Column(name="REMARK")
     @ApiParam("备注")
     public String reMark;
 
+    /**
+     * 来源：MNU=手工,MES=MES接口
+     */
     @Column(name="SRC")
     @ApiParam("单据来源")
     public String src;
@@ -89,7 +94,7 @@ public class WmsFGInStock extends BaseBean {
     @ApiParam("特殊发货标志")
     public String shippingFlag;
 
-    @Column(name="LOT_NO")
+    @Column(name="MFG_LOG_NO")
     @ApiParam("生产批次")
-    public String lotNo;
+    public String mfgLogNo;
 }

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name = "WMS_FIELD")
 @Api("元数据字段表")
 public class WmsField extends BaseBean{

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import io.swagger.models.auth.In;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -24,6 +25,7 @@ import javax.persistence.Table;
 @Table(name="WMS_IB_CHECK_PLAN")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="抽点比例表",description = "抽点比例表")
 public class WmsIbCheckPlan extends BaseBean{
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -23,6 +24,7 @@ import javax.persistence.Table;
 @Table(name="WMS_LOCATE")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="库位表",description = "库位表")
 public class WmsLocate extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -23,6 +24,7 @@ import javax.persistence.Table;
 @Table(name="WMS_LOCATE_PART")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="库位物料表",description = "库位物料表")
 public class WmsLocatePart extends BaseBean{
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_MOVE_DETAILS")
 @Api("库存移动单明细信息")
 public class WmsMoveDetails extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_MOVE_MASTER")
 @Api("库存移动单主表信息")
 public class WmsMoveMaster extends BaseBean {

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

@@ -1,118 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-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 : silliter.yuan
- * @CreateDate : 2018-11-06 15:58
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@Table(name="WMS_DOC_MOVEMENT_DETAILS")
-@Api("库存移动单明细信息")
-public class WmsMoveMentDetails extends BaseBean {
-
-    @Column(name="ORDER_NO")
-    @ApiParam("单号")
-    public String orderNo;
-
-    @Column(name="ITEM")
-    @ApiParam("行号")
-    public String item;
-
-    @Column(name="PART_NO")
-    @ApiParam("物料编码")
-    public String partNo;
-
-    @Column(name="PART_NAME_RDD")
-    @ApiParam("物料名称")
-    public String partNameRdd;
-
-    @Column(name="QTY")
-    @ApiParam(value = "需求数量", example = "0")
-    public Double qty;
-
-    @Column(name="UNIT")
-    @ApiParam("单位")
-    public String unit;
-
-    @Column(name="SRC_WH")
-    @ApiParam("发出库仓库")
-    public String srcWh;
-
-    @Column(name="DEST_WH")
-    @ApiParam("接收库仓库")
-    public String destWh;
-
-    @Column(name="PRINT_QTY")
-    @ApiParam("条码打印数量")
-    public String printQty;
-
-    @Column(name="FACT_QTY")
-    @ApiParam("操作完成数量")
-    public String factQty;
-
-    @Column(name="ZDATE")
-    @ApiParam("计划交货日期")
-    public String zDate;
-
-    @Column(name="ZTIME")
-    @ApiParam("计划交货时间")
-    public String zTime;
-
-    @Column(name="SRC_NO")
-    @ApiParam("源单号")
-    public String srcNo;
-
-    /**
-     * 状态:N=正常,C=行取消
-     */
-    @Column(name="STATUS")
-    @ApiParam(value = "状态", example = "1")
-    public Integer status;
-
-    @Column(name="REMARK")
-    @ApiParam("备注")
-    public String reMark;
-
-    /**
-     * 是否免费:0=计费,1=免费
-     */
-    @Column(name="IS_FREE")
-    @ApiParam(value = "是否免费", example = "1")
-    public Integer isFree;
-
-    @Column(name="PICK_QTY")
-    @ApiParam(value = "已配数量", example = "0")
-    public Double pickQty;
-
-    @Column(name="OUT_QTY")
-    @ApiParam(value = "已提交数量", example = "0")
-    public Double outQty;
-
-    @Column(name="INLINE_QTY")
-    @ApiParam(value = "已上线数量", example = "0")
-    public Double inLineQty;
-
-    @Column(name="REJECT_QTY")
-    @ApiParam(value = "退料数量", example = "0")
-    public Double rejectQty;
-
-    @Column(name="REJECT_POST_QTY")
-    @ApiParam(value = "退料提交数量", example = "0")
-    public Double rejectPostQty;
-}

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

@@ -1,99 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-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 : silliter.yuan
- * @CreateDate : 2018-11-06 15:58
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@Table(name="WMS_DOC_MOVEMENT_MASTER")
-@Api("库存移动单主表信息")
-public class WmsMoveMentMaster extends BaseBean {
-
-    @Column(name="ORDER_NO")
-    @ApiParam("单号")
-    public String orderNo;
-
-    /**
-     * 移动类型:IN=入库,OUT=出库,MOVE=移库
-     */
-    @Column(name="MOVE_TYPE")
-    @ApiParam("移动类型")
-    public String moveType;
-
-    /**
-     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
-     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
-     * MI=移库入库,MO=移库出库,SO=发运
-     */
-    @Column(name="TYPE")
-    @ApiParam("业务类型")
-    public String type;
-
-    /**
-     * 状态:0=新建,10=处理中
-     * ,20=已完成,90=已关闭,91=已取消
-     */
-    @Column(name="STATUS")
-    @ApiParam(value = "状态", example = "0")
-    public Integer status;
-
-    @Column(name="CUSTOMER_NO")
-    @ApiParam("客户编号")
-    public String customerNo;
-
-    @Column(name="VENDOR_NO")
-    @ApiParam("供应商编号")
-    public String vendorNo;
-
-    @Column(name="VERSION")
-    @ApiParam("版本")
-    public String version;
-
-    @Column(name="SRC")
-    @ApiParam("单据来源")
-    public String src;
-
-    @Column(name="SRC_NO")
-    @ApiParam("关联单据")
-    public String srcNo;
-
-    @Column(name="ERP_ORDERNO")
-    @ApiParam("ERP单号")
-    public String erpOrderNo;
-
-    /**
-     * 单据类型:WO=工单配料
-     */
-    @Column(name="ORDER_TYPE")
-    @ApiParam("单据类型")
-    public String orderType;
-
-    @Column(name="PART_NO")
-    @ApiParam("物料编码")
-    public String partNo;
-
-    @Column(name="PART_NAME_RDD")
-    @ApiParam("物料名称")
-    public String partNameRdd;
-
-    @Column(name="QTY")
-    @ApiParam(value = "需求数量", example = "0")
-    public Double qty;
-}

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_MOVE_SN")
 @Api("库存移动单条码信息")
 public class WmsMoveSn extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -23,6 +24,7 @@ import java.util.List;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name = "WMS_OBJECT")
 @Api("元数据信息表")
 public class WmsObject extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_OP_TYPE")
 @Api("作业类型")
 public class WmsOpType extends BaseBean{
@@ -34,8 +36,8 @@ public class WmsOpType extends BaseBean{
     @ApiParam("类型名称")
     private String opTypeName;
 
-    @Column(name="SEQ")
+    @Column(name = "SEQ")
-    @ApiParam("序号")
+    @ApiParam(value = "序号", example = "0")
     private Integer seq;
 
     @Column(name="PROG_CODE")

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_PO_MASTER")
 @Api("PO主表信息")
 public class WmsPOMaster extends BaseBean {
@@ -31,20 +33,20 @@ public class WmsPOMaster extends BaseBean {
     public String orderNo;
 
     /**
-     * 单据类型:REG=原物料采购,
+     * 单据类型:
-     * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购
+     * 1 REG=原物料采购,10 SUB=委外采购,20 TAR=多角贸易采购,30 TAP=多角代采购
      */
-    @Column(name="TYPE")
+    @Column(name="PO_TYPE")
     @ApiParam("单据类型")
-    public String type;
+    public String poType;
 
     /**
-     * 状态:0=新建,10=收货中,20=收货完成,
+     * 状态:1=新建,10=收货中,20=收货完成,
      * 30=入库中,40=入库完成,90=已关闭,91=已取消
      */
-    @Column(name="STATUS")
+    @Column(name="PO_STATUS")
-    @ApiParam(value = "状态", example = "0")
+    @ApiParam(value = "状态", example = "1")
-    public Integer status;
+    public Integer poStatus;
 
     @Column(name="VENDOR_NO")
     @ApiParam("供应商编号")
@@ -54,6 +56,9 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("版本")
     public String version;
 
+    /**
+     * 单据来源：1 MNU=手工,2 ERP=ERP接口
+     */
     @Column(name="SRC")
     @ApiParam("单据来源")
     public String src;

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_PO_DETAILS")
 @Api("PO订单明细信息")
 public class WmsPOMasterDetails extends BaseBean {
@@ -47,20 +49,20 @@ public class WmsPOMasterDetails extends BaseBean {
     public Double qty;
 
     @Column(name="PRINT_QTY")
-    @ApiParam("条码打印数量")
+    @ApiParam(value = "条码打印数量", example = "0")
-    public String printQty;
+    public Double printQty;
 
     @Column(name="RC_QTY")
-    @ApiParam("收货数量")
+    @ApiParam(value = "收货数量", example = "0")
-    public String rcQty;
+    public Double rcQty;
 
     @Column(name="PASS_QTY")
-    @ApiParam("质检合格数量")
+    @ApiParam(value = "质检合格数量", example = "0")
-    public String passQty;
+    public Double passQty;
 
     @Column(name="NG_QTY")
-    @ApiParam("质检不合格数量")
+    @ApiParam(value = "质检不合格数量", example = "0")
-    public String ngQty;
+    public Double ngQty;
 
     @Column(name="UNIT")
     @ApiParam("单位")
@@ -79,11 +81,11 @@ public class WmsPOMasterDetails extends BaseBean {
     public String whNo;
 
     /**
-     * 状态:N=正常,C=行取消
+     * 状态:10 N=正常,20 C=行取消
      */
-    @Column(name="STATUS")
+    @Column(name="ITEM_STATUS")
     @ApiParam("状态")
-    public String status;
+    public String itemStatus;
 
     @Column(name="SNP")
     @ApiParam("标准包装")

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_PACKAGE")
 @Api("物理包装信息")
 public class WmsPackage extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name = "WMS_PART")
 @Api("物料表")
 public class WmsPart extends BaseBean {

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

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 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;
 
@@ -23,6 +24,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_QC_DETAILS")
 @Api("质检单明细信息")
 public class WmsQCDetails extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_QC_MASTER")
 @Api("质检单主表信息")
 public class WmsQCMaster extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_QC_TRANS")
 @Api("质检单操作明细信息")
 public class WmsQCTrans extends BaseBean {

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.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 : dragon.xu
+ * @CreateDate : 2018-11-08 17:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_ROUTING_ASSIGN")
+@Api("物流路线分配表")
+public class WmsRoutingAssign extends BaseBean {
+
+    @Column(name = "WH_NO")
+    @ApiParam(value = "仓库代码")
+    private String whNo;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区编号")
+    private String zoneNo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位编号")
+    private String locateNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    private String vendorNo;
+
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "路线编码")
+    private String routingCode;
+}

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.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 : dragon.xu
+ * @CreateDate : 2018-11-08 17:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_ROUTING_DETAIL")
+@Api("物流路线明细表")
+public class WmsRoutingDetail extends BaseBean {
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "路线编码")
+    private String routingCode;
+
+    @Column(name = "OP_STEP")
+    @ApiParam(value = "作业步骤")
+    private String opStep;
+
+    @Column(name = "OK_SEQ")
+    @ApiParam(value = "成功跳转序号", example = "1")
+    private Integer okSeq;
+
+    @Column(name = "NG_SEQ")
+    @ApiParam(value = "失败跳转序号", example = "1")
+    private Integer ngSeq;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "序号", example = "1")
+    private Integer seq;
+
+    @Column(name = "PARENT_SEQ")
+    @ApiParam(value = "上级步骤序号", example = "1")
+    private Integer parentSeq;
+
+}

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

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.wms.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 : dragon.xu
+ * @CreateDate : 2018-11-08 17:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_ROUTING_MASTER")
+@Api("物流路线主表")
+public class WmsRoutingMaster extends BaseBean {
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "路线编码")
+    private String routingCode;
+
+    @Column(name = "ROUTING_NAME")
+    @ApiParam(value = "路线名称")
+    private String routingName;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "序号", example = "1")
+    private Integer seq;
+}

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -24,6 +25,7 @@ import javax.persistence.Table;
 @Table(name="WMS_SHIPPING_FLAG")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="客户发往地信息表",description = "客户发往地信息表")
 public class WmsShippingFlag extends BaseBean {
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_SHIPPING")
 @Api("产品发运信息")
 public class WmsShopping extends BaseBean {
@@ -51,11 +53,11 @@ public class WmsShopping extends BaseBean {
     public String sn;
 
     /**
-     * 状态:0=新建,10=已处理,20=处理出错
+     * 状态:10=新建,20=已处理,30=处理出错
      */
-    @Column(name="STATUS")
+    @Column(name="ORDER_STATUS")
-    @ApiParam(value = "状态", example = "0")
+    @ApiParam(value = "状态", example = "10")
-    public Integer status;
+    public Integer orderStatus;
 
     @Column(name="REMARK")
     @ApiParam("备注")
@@ -72,4 +74,7 @@ public class WmsShopping extends BaseBean {
     @Column(name="SHIPPING_FLAG")
     @ApiParam("特殊发货标志")
     public String shippingFlag;
+
+    @ApiParam(value ="客户简称")
+    private transient String custName;
 }

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_SN_PRINT")
 @Api("待打印信息")
 public class WmsSnPrint extends BaseBean {

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -26,6 +27,7 @@ import javax.persistence.Table;
 @Table(name="WMS_STOCK_QUAN")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="库存信息",description = "库存信息")
 public class WmsStockQuant extends BaseBean{
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_TASK")
 @Api("ASN主表信息")
 public class WmsTaskInfo extends BaseBean {
@@ -43,9 +45,9 @@ public class WmsTaskInfo extends BaseBean {
     public String reMark;
 
     /**
-     * 状态:0=创建,5=待处理,10=已处理
+     * 状态:1=创建,10=待处理,20=已处理
      */
-    @Column(name="STATUS")
+    @Column(name="TASK_STATUS")
-    @ApiParam(value = "状态", example = "0")
+    @ApiParam(value = "状态", example = "1")
-    public Integer status;
+    public Integer taskStatus;
 }

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_TMP_ORDER_LOCK")
 @Api("盘点单主表信息")
 public class WmsTempOrderLock extends BaseBean {

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

@@ -6,6 +6,7 @@ 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;
 
@@ -25,6 +26,7 @@ import javax.persistence.Table;
 @Table(name="WMS_TRANS")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="库存交易记录表",description = "库存交易记录表")
 public class WmsTrans extends BaseBean{
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -23,6 +24,7 @@ import javax.persistence.Table;
 @Table(name="WMS_TRANS_CODE")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="交易代码方法表",description = "交易代码方法表")
 public class WmsTransCode extends BaseBean{
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_TRANS_QUAN")
 @Api("库存交易信息")
 public class WmsTransQuan extends BaseBean {

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

@@ -6,6 +6,7 @@ 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;
 
@@ -25,6 +26,7 @@ import javax.persistence.Table;
 @Table(name="WMS_TRANS_RCD")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="仓库交易归档表",description = "仓库交易归档表")
 public class WmsTransRcd extends BaseBean{
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -22,6 +23,7 @@ import javax.persistence.Table;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_TRANS_SN")
 @Api("库存交易条码信息")
 public class WmsTransSn extends BaseBean {

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

@@ -4,6 +4,7 @@ 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;
 
@@ -23,6 +24,7 @@ import javax.persistence.Table;
 @Table(name="WMS_TRANS_TYPE")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="交易类型表",description = "交易类型表")
 public class WmsTransType extends BaseBean{
 

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

@@ -4,6 +4,7 @@ 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;
 
@@ -23,6 +24,7 @@ import javax.persistence.Table;
 @Table(name="WMS_ZONES")
 @DynamicInsert
 @DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
 @Api(value="存储区信息表",description = "存储区信息表")
 public class WmsZones extends BaseBean {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepository.java

@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface BasCustomerRepositry extends BaseRepository<BasCustomer,Long> {
+public interface BasCustomerRepository extends BaseRepository<BasCustomer,Long> {
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCheckFactRecordRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCheckFactRecord;
+import cn.estsh.i3plus.pojo.wms.bean.WmsIbCheckPlan;
+
+/**
+ * @Description : 抽点记录表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-13 15:38
+ * @Modify:
+ **/
+public interface WmsCheckFactRecordRepository extends BaseRepository<WmsCheckFactRecord, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description :库存移动单详情表的方法接口
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-13 10:19
+* @Modify:
+**/
+@Repository
+public interface WmsDocMovementDetailsRepository extends BaseRepository<WmsDocMovementDetails, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description :库存移动单主表的方法接口
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-13 10:19
+* @Modify:
+**/
+@Repository
+public interface WmsDocMovementMasterRepository extends BaseRepository<WmsDocMovementMaster, Long> {
+}