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

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

@@ -63,31 +63,23 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     int executeUpdate(String qlString, List<Object> values);
 
     /**
-     * 通过属性删除
+     * 强删除
-     * @param propName
-     * @param propValue
      */
-    public void deleteByProperties(String propName, Object propValue);
+    public void deleteById(ID id);
+    public int deleteByProperty(String propName, Object propValue);
+    public int deleteByPropertyIn(String propName, Object[] propValues);
+    public int deleteByIds(ID[] ids);
+    public int deleteByProperties(String[] propNames, Object[] objValues);
 
     /**
-     * 通过多个属性删除
+     * 弱删除
-     * @param propName
+     * @return count
-     * @param propValue
      */
-    public void deleteByProperties(String[] propName, Object[] propValue);
+    public int deleteWeaklyById(ID id);
-
+    public int deleteWeaklyByIds(Long[] ids) ;
-    /**
+    public int deleteWeaklyByProperty(String propName, Object propValue);
-     * 通过 in 批量删除
+    public int deleteWeaklyByPropertyIn(String propName, Object[] propValues);
-     * @param ids 熟悉值数组
+    public int deleteWeaklyByProperties(String[] propNames, Object[] objValues);
-     */
-    public void deleteByIds(Long[] ids);
-
-    /**
-     * 批量删除 指定列名
-     * @param propName
-     * @param ids
-     */
-    public void deleteByTypeLong(String propName, Long[] ids);
 
     /**
      * 通过多单属性进行单个值更新
@@ -135,13 +127,6 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     public int updateByHqlWhere(String hqlWhere,String propertyName, Object propertyValue);
 
     /**
-     * 批量弱删除仓库信息
-     * @param ids
-     * @return
-     */
-    public boolean deleteWeaklyByIds(Long[] ids) ;
-
-    /**
      * 批量修改数据熟悉
      * @param hqlWhere      HQL where 语句
      * @param propertyName  修改的字段名称
@@ -240,6 +225,4 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     public List<Object[]> findBySqlObjList(String sql);
 
     public List<Object[]> findBySqlObjListByPager(String sql,Pager pager);
-
-
 }

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

@@ -191,7 +191,12 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
             }
         };
 
-        FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson);
+        FindIterable findIter = null;
+        if(bson != null) {
+            findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson);
+        }else{
+            findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find();
+        }
         if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){
             //排序
             if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){
@@ -207,7 +212,11 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
 
     @Override
     public long findByBsonCount(Bson bson) {
-        return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(bson);
+        if(bson == null){
+            return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count();
+        }else {
+            return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(bson);
+        }
     }
 
     private List<T> packObjectListFromDocument(List<Document> dList) {
@@ -235,9 +244,16 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
             }
         };
 
-        FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson)
+        FindIterable findIter = null;
-                .skip(pager.getStartRow())
+        if(bson == null) {
-                .limit(pager.getPageSize());
+            findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find()
+                    .skip(pager.getStartRow())
+                    .limit(pager.getPageSize());
+        }else{
+            findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson)
+                    .skip(pager.getStartRow())
+                    .limit(pager.getPageSize());
+        }
         if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){
             //排序
             if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){

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

@@ -1,6 +1,8 @@
 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.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.base.tool.SnowflakeIdMaker;
 import org.slf4j.Logger;
@@ -32,10 +34,10 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     private Class<T> persistentClass;
 
-    public BaseRepositoryImpl(Class<T> tClass, EntityManager em) {
+    public BaseRepositoryImpl(Class<T> clz, EntityManager em) {
-        super(tClass, em);
+        super(clz, em);
         this.entityManager = em;
-        this.persistentClass = tClass;
+        this.persistentClass = clz;
     }
 
     private void setParameter(Query query, String[] propName, Object[] propValue) {
@@ -125,39 +127,97 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     @Override
-    public void deleteByProperties(String propName, Object propValue) {
+    public void deleteById(ID id){
-        deleteByProperties(new String[] { propName }, new Object[] { propValue });
+        deleteByProperty("id", id);
     }
 
     @Override
-    public void deleteByProperties(String[] propName, Object[] propValue) {
+    public int deleteByProperty(String propName, Object propValue) {
+        return deleteByProperties(new String[] { propName }, new Object[] { propValue });
+    }
+
+    @Override
+    public int deleteByProperties(String[] propName, Object[] propValue) {
         if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) {
             StringBuffer sb = new StringBuffer("delete from " + persistentClass.getName() + " model where 1=1 ");
             appendQL(sb,propName,propValue);
             Query query = entityManager.createQuery(sb.toString());
             setParameter(query,propName,propValue);
 
-            query.executeUpdate();
+            return query.executeUpdate();
         }else{
             throw new IllegalArgumentException("Method deleteByProperties argument is illegal!propName:" + propName + ",propValue:" + propValue);
         }
     }
 
     @Override
-    public void deleteByIds(Long[] ids) {
+    public int deleteByIds(ID[] ids) {
-        deleteByTypeLong("id",  ids);
+        return deleteByPropertyIn("id",  ids);
     }
 
     @Override
-    public void deleteByTypeLong(String propName, Long[] ids) {
+    public int deleteByPropertyIn(String propName, Object[] propValues) {
-        if ((propName != null && propName.length() > 0) && (ids != null && ids.length > 0)) {
+        if ((propName != null && propName.length() > 0) && (propValues != null && propValues.length > 0)) {
-            String hql = "delete from " + persistentClass.getName() + " model where model."+propName+" in(:ids) ";
+            String hql = "delete from " + persistentClass.getName() + " model where model."+propName+" in(:"+propName+") ";
             Query query = entityManager.createQuery(hql);
-            query.setParameter("ids", Arrays.asList(ids));
+            query.setParameter(propName, Arrays.asList(propValues));
+
+            return query.executeUpdate();
+        }else{
+            throw new IllegalArgumentException("删除出错："+propName+":" + propValues);
+        }
+    }
+
+    @Override
+    public int deleteWeaklyById(ID id) {
+        return deleteWeaklyByProperty("id", id);
+    }
+
+    @Override
+    public int deleteWeaklyByIds(Long[] ids) {
+        return deleteWeaklyByPropertyIn("id",  ids);
+    }
+
+    @Override
+    public int deleteWeaklyByProperty(String propName, Object propValue) {
+        return deleteWeaklyByProperties(new String[] { propName }, new Object[] { propValue });
+    }
+
+    /**
+     * 批量弱删除
+     * @return
+     */
+    @Override
+    public int deleteWeaklyByPropertyIn(String propName, Object[] propValues) {
+        if(propValues != null && propValues.length > 0){
+            String hql = "update " + persistentClass.getName() + " model set model.isValid = :isValid  where model."+propName+" in(:"+propName+") ";
+            Query query = entityManager.createQuery(hql);
+            query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue());
+            query.setParameter(propName, Arrays.asList(propValues));
+
+            return query.executeUpdate();
+        }else{
+            throw new IllegalArgumentException("弱删除失败："+propName+":" + propValues);
+        }
+    }
+
+    /**
+     * 批量弱删除
+     * @return
+     */
+    @Override
+    public int deleteWeaklyByProperties(String[] propName, Object[] propValue) {
+        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  where 1=1 ");
+            appendQL(sb,propName,propValue);
+            Query query = entityManager.createQuery(sb.toString());
+            query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue());
+
+            setParameter(query,propName,propValue);
 
-            query.executeUpdate();
+            return query.executeUpdate();
         }else{
-            throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! "+propName+":" + ids);
+            throw new IllegalArgumentException("弱删除失败："+propName+":" + propValue);
         }
     }
 
@@ -782,28 +842,6 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     /**
-     * 批量弱删除
-     * @param ids
-     * @return
-     */
-    @Override
-    public boolean deleteWeaklyByIds(Long[] ids) {
-        if(ids != null && ids.length > 0){
-            String hql = "update " + persistentClass.getName() + " model where model.id in(:ids) ";
-            Query query = entityManager.createQuery(hql);
-            query.setParameter("ids", Arrays.asList(ids));
-
-            int delResult = query.executeUpdate();
-            if (delResult == ids.length) {
-                return true;
-            }
-        }else{
-            throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! ids:" + ids);
-        }
-        return false;
-    }
-
-    /**
      * 保存对象
      * @param item 保存对象
      * @return

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

@@ -76,8 +76,13 @@ public class BsonPackTool {
 
         //查询
         MongoCollection<Document> collection = mongoOperations.getCollection(tableName);
-        collection.find(bson).skip(skip).limit(limit).forEach(saveBlock);
+        if(bson == null) {
-        collection.count(bson);
+            collection.count();
+            collection.find().skip(skip).limit(limit).forEach(saveBlock);
+        }else {
+            collection.count(bson);
+            collection.find(bson).skip(skip).limit(limit).forEach(saveBlock);
+        }
 
         return newLins;
     }
@@ -95,8 +100,9 @@ public class BsonPackTool {
         List<Document> list = new ArrayList<>();
         long count = mongoOperations.getCollection(tableName).count(bson);
         int loops = (int)((count + pageSize - 1) / pageSize);
+        List<Document> newFinds = null;
         for(int i = 0; i < loops; i++) {
-            List<Document> newFinds = query(mongoOperations, tableName, bson, i * pageSize, pageSize);
+            newFinds = query(mongoOperations, tableName, bson, i * pageSize, pageSize);
             list.addAll(newFinds);
         }
         return list;
@@ -131,11 +137,18 @@ public class BsonPackTool {
         if (isShowTime&& endDate.trim().length()<=11) {
             endDate+= " 23:59:59";
         }
-        bson = Filters.and(
+        if(bson == null) {
-                bson,
+            bson = Filters.and(
-                Filters.gte(columnName,startDate),  //大于等于开始日期
+                    Filters.gte(columnName, startDate),  //大于等于开始日期
-                Filters.lte(columnName,endDate)     //小于等于结束日期
+                    Filters.lte(columnName, endDate)     //小于等于结束日期
-                );
+            );
+        }else{
+            bson = Filters.and(
+                    bson,
+                    Filters.gte(columnName, startDate),  //大于等于开始日期
+                    Filters.lte(columnName, endDate)     //小于等于结束日期
+            );
+        }
 
         return bson;
     }
@@ -160,11 +173,16 @@ public class BsonPackTool {
             String[] time = date.split(",");
             if(time.length == 1){
                 //只有开始日期，没有结束日期
-                bson = Filters.and(
+                if(bson == null){
-                        bson,
+                    bson = Filters.and(
-                        //Filters.eq(columnName,time[0])
+                            Filters.regex(columnName, "^" + time[0]) //like 日期%^
-                        Filters.regex(columnName, "^"+time[0]) //like 日期%^
+                    );
-                );
+                }else {
+                    bson = Filters.and(
+                            bson,
+                            Filters.regex(columnName, "^" + time[0]) //like 日期%^
+                    );
+                }
             }else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0) || (time[1] != null & time[1].trim().length() > 0))) {
                 if (time[0] == null || time[0].trim().length() == 0) {
                     time[0] = "1900-01-01";
@@ -182,26 +200,46 @@ public class BsonPackTool {
                 if (isShowTime&& time[1].trim().length()<=11) {
                     time[1]+= " 23:59:59";
                 }
-                bson = Filters.and(
+                if(bson == null) {
-                        bson,
+                    bson = Filters.and(
-                        Filters.gte(columnName,time[0]),  //大于等于开始日期
+                            Filters.gte(columnName, time[0]),  //大于等于开始日期
-                        Filters.lte(columnName,time[1])     //小于等于结束日期
+                            Filters.lte(columnName, time[1])     //小于等于结束日期
-                );
+                    );
+                }else{
+                    bson = Filters.and(
+                            bson,
+                            Filters.gte(columnName, time[0]),  //大于等于开始日期
+                            Filters.lte(columnName, time[1])     //小于等于结束日期
+                    );
+                }
             } else {
                 if (showTaday) {
                     if (isShowTime) {
-
+                        if(bson == null) {
-                        bson = Filters.and(
+                            bson = Filters.and(
-                                bson,
+                                    Filters.gte(columnName, time[0] + " 00:00:00"),  //大于等于开始日期
-                                Filters.gte(columnName,time[0] + " 00:00:00"),  //大于等于开始日期
+                                    Filters.lte(columnName, time[1] + " 23:59:59")     //小于等于结束日期
-                                Filters.lte(columnName,time[1] + " 23:59:59")     //小于等于结束日期
+                            );
-                        );
+                        }else{
+                            bson = Filters.and(
+                                    bson,
+                                    Filters.gte(columnName, time[0] + " 00:00:00"),  //大于等于开始日期
+                                    Filters.lte(columnName, time[1] + " 23:59:59")     //小于等于结束日期
+                            );
+                        }
                     }else{
-                        bson = Filters.and(
+                        if(bson == null) {
-                                bson,
+                            bson = Filters.and(
-                                Filters.gte(columnName,time[0]),  //大于等于开始日期
+                                    Filters.gte(columnName, time[0]),  //大于等于开始日期
-                                Filters.lte(columnName,time[1])     //小于等于结束日期
+                                    Filters.lte(columnName, time[1])     //小于等于结束日期
-                        );
+                            );
+                        }else{
+                            bson = Filters.and(
+                                    bson,
+                                    Filters.gte(columnName, time[0]),  //大于等于开始日期
+                                    Filters.lte(columnName, time[1])     //小于等于结束日期
+                            );
+                        }
                     }
                 }
             }
@@ -219,10 +257,16 @@ public class BsonPackTool {
         if (str != null && str.trim().length() > 0) {
             str = getSafeParam(str);
 
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.regex(columnName, str) //like
+                        Filters.regex(columnName, str) //like
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.regex(columnName, str) //like
+                );
+            }
         }
 
         return bson;
@@ -238,12 +282,18 @@ public class BsonPackTool {
         if (str != null && str.trim().length() > 0) {
             str = getSafeParam(str);
 
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.or(
-                    Filters.or(
+                               Filters.regex(columnName, str) //like
-                        Filters.regex(columnName, str) //like
+                        );
-                    )
+            }else {
-            );
+                bson = Filters.and(
+                        bson,
+                        Filters.or(
+                                Filters.regex(columnName, str) //like
+                        )
+                );
+            }
         }
         return bson;
     }
@@ -257,10 +307,16 @@ public class BsonPackTool {
     public static Bson getStringRightLikerPack(String str,String columnName, Bson bson) {
         if (str != null && str.trim().length() > 0) {
             str = getSafeParam(str);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.regex(columnName, str + "^") //like
+                        Filters.regex(columnName, str + "^") //like
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.regex(columnName, str + "^") //like
+                );
+            }
         }
         return bson;
     }
@@ -274,10 +330,16 @@ public class BsonPackTool {
     public static Bson getStringLeftLikerPack(String str,String columnName, Bson bson) {
         if (str != null && str.trim().length() > 0) {
             str = getSafeParam(str);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.regex(columnName, "^" + str) //like
+                        Filters.regex(columnName, "^" + str) //like
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.regex(columnName, "^" + str) //like
+                );
+            }
         }
         return bson;
     }
@@ -290,10 +352,16 @@ public class BsonPackTool {
     public static Bson getStringEqualPack(String data,String columnName, Bson bson) {
         if(data != null && data.trim().length() > 0){
             data = getSafeParam(data);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.eq(columnName, data)
+                        Filters.eq(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.eq(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -306,10 +374,16 @@ public class BsonPackTool {
     public static Bson getNumEqualPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) > 0){
             data = getSafeParam(data);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.eq(columnName, data)
+                        Filters.eq(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.eq(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -322,10 +396,17 @@ public class BsonPackTool {
     public static Bson getNumEqualPackForZero(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) >= 0){
             data = getSafeParam(data);
-            bson = Filters.and(
+
-                    bson,
+            if(bson == null) {
-                    Filters.eq(columnName, data)
+                bson = Filters.and(
-            );
+                        Filters.eq(columnName, data)
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.eq(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -338,10 +419,16 @@ public class BsonPackTool {
     public static Bson getNumWithZeroEqualPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) >= 0){
             data = getSafeParam(data);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.eq(columnName, data)
+                        Filters.eq(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.eq(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -354,10 +441,16 @@ public class BsonPackTool {
     public static Bson getNumBiggerPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) > 0){
             data = getSafeParam(data);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.gt(columnName, data)
+                        Filters.gt(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.gt(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -370,10 +463,16 @@ public class BsonPackTool {
     public static Bson getNumSmallerPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) > 0){
             data = getSafeParam(data);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.lt(columnName, data)
+                        Filters.lt(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.lt(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -386,10 +485,16 @@ public class BsonPackTool {
     public static Bson getDoubleBiggerPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Double.parseDouble(data.toString()) > 0){
             data = getSafeParam(data);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.gt(columnName, data)
+                        Filters.gt(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.gt(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -402,10 +507,16 @@ public class BsonPackTool {
     public static Bson getDoubleSmallerPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Double.parseDouble(data.toString()) > 0){
             data = getSafeParam(data);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.lt(columnName, data)
+                        Filters.lt(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.lt(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -418,10 +529,16 @@ 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);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.eq(columnName, data)
+                        Filters.eq(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.eq(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -434,10 +551,16 @@ public class BsonPackTool {
     public static Bson getNumEqualPackDouble(Object data,String columnName, Bson bson) {
         if(data!=null&&Double.parseDouble(data.toString()) > 0){
             data = getSafeParam(data);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.eq(columnName, data)
+                        Filters.eq(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.eq(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -450,10 +573,16 @@ 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);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.eq(columnName, data)
+                        Filters.eq(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.eq(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -466,10 +595,16 @@ public class BsonPackTool {
     public static Bson getNumNOEqualPack(Object data,String columnName, Bson bson) {
         if(data!=null){
             data = getSafeParam(data);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.ne(columnName, data)
+                        Filters.ne(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.ne(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -483,10 +618,16 @@ public class BsonPackTool {
     public static Bson getInPack(String data,String columnName, Bson bson){
         if (data!=null&&data.trim().length()>0) {
             data = getSafeParam(data);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.in(columnName, data)
+                        Filters.in(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.in(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -513,10 +654,16 @@ public class BsonPackTool {
                     data += "'" + dataArray[i] + "',";
                 }
             }
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.in(columnName, data)
+                        Filters.in(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.in(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -543,10 +690,16 @@ public class BsonPackTool {
                     data += "'" + dataArray[i] + "',";
                 }
             }
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.nin(columnName, data)
+                        Filters.nin(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.nin(columnName, data)
+                );
+            }
         }
         return bson;
     }
@@ -560,10 +713,16 @@ public class BsonPackTool {
     public static Bson getNotInPack(String data,String columnName, Bson bson){
         if (data!=null&&data.trim().length()>0) {
             data = getSafeParam(data);
-            bson = Filters.and(
+            if(bson == null) {
-                    bson,
+                bson = Filters.and(
-                    Filters.nin(columnName, data)
+                        Filters.nin(columnName, data)
-            );
+                );
+            }else{
+                bson = Filters.and(
+                        bson,
+                        Filters.nin(columnName, data)
+                );
+            }
         }
         return bson;
     }

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

@@ -32,8 +32,8 @@ public class LogOperate extends BaseBean {
     //CommonEnumUtil.SOFT_TYPE
     private Integer operateModuleId;
 
-    @Column(name="OPERATE_TYPE_ID（枚举）")
+    @Column(name="OPERATE_TYPE_ID")
-    //ImppEnumUtil.OPERATE_TYPE
+    //ImppEnumUtil.OPERATE_TYPE（枚举）
     @ApiParam(value ="操作类型" , example = "-1")
     private Integer operateTypeId;
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.platform.repository;
+package cn.estsh.i3plus.pojo.platform.repositorymongo;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
 import cn.estsh.i3plus.pojo.platform.bean.LogOperate;
@@ -10,6 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.LogOperate;
  * @Date        : 2018-10-22 12:03:00.118
  * @Modify      :
  **/
-
+public interface LogOperateRepository extends BaseMongoRepository<LogOperate, Long> {
-//public interface LogOperateRepository extends BaseMongoRepository<LogOperate, Long> {
+}
-//}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogSystemRepository.java

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.platform.repository;
+package cn.estsh.i3plus.pojo.platform.repositorymongo;
 
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.platform.bean.LogSystem;
 import org.springframework.data.mongodb.repository.MongoRepository;
@@ -11,5 +12,5 @@ import org.springframework.data.mongodb.repository.MongoRepository;
  * @Date        : 2018-10-22 12:03:00.158
  * @Modify      :
  **/
-public interface LogSystemRepository extends MongoRepository<LogSystem, Long> {
+public interface LogSystemRepository extends BaseMongoRepository<LogSystem, Long> {
 }

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

@@ -0,0 +1,60 @@
+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 : ASN订单主表
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_DOC_ASN_MASTER")
+@Api("ASN主表信息")
+public class WmsASNMaster extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
+
+    /**
+     * 单据类型:REG=原物料采购,
+     * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购
+     */
+    @Column(name="TYPE")
+    @ApiParam("单据类型")
+    public String type;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    public String status;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    public String vendorNo;
+
+    @Column(name="VERSION")
+    @ApiParam("版本")
+    public String version;
+
+    @Column(name="SRC")
+    @ApiParam("单据来源")
+    public String src;
+
+    @Column(name="PO_NO")
+    @ApiParam("PO单号")
+    public String poNo;
+}

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

@@ -0,0 +1,103 @@
+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 : ASN订单明细信息
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_DOC_ASN_DETAILS")
+@Api("ASN订单明细信息")
+public class WmsASNMasterDetails 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="PO_ITEM")
+    @ApiParam("PO行号")
+    public String poItem;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="ZDATE")
+    @ApiParam("计划交货日期")
+    public String zDate;
+
+    @Column(name="ZTIME")
+    @ApiParam("计划交货时间")
+    public String zTime;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    public String status;
+
+    @Column(name="PACKAGE")
+    @ApiParam("包装名称")
+    public String pageAge;
+
+    /**
+     * 是否免费:0=计费,1=免费
+     */
+    @Column(name="IS_FREE")
+    @ApiParam(value = "是否免费", example = "1")
+    public Integer isFree;
+
+    @Column(name="DOCK")
+    @ApiParam("道口")
+    public String dock;
+
+    @Column(name="SN_1D")
+    @ApiParam("一维条码")
+    public String snOneBarCode;
+
+    @Column(name="SN_2D")
+    @ApiParam("二维条码")
+    public String snTwoBarCode;
+
+    @Column(name="GROUP_NO")
+    @ApiParam("组条码")
+    public String groupNo;
+
+    @Column(name="ERP_WH_NO")
+    @ApiParam("默认收货库存地")
+    public String erpWhNo;
+
+    @Column(name="VENDOR_LOT_NO")
+    @ApiParam("供应商批次")
+    public String vendorLotNo;
+}

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

@@ -0,0 +1,92 @@
+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_FG_INSTOCK")
+@Api("产品入库信息")
+public class WmsFGInStock extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
+
+    @Column(name="WO_NO")
+    @ApiParam("ERP工单号")
+    public String woNo;
+
+    @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="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    public String status;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String reMark;
+
+    @Column(name="SRC")
+    @ApiParam("单据来源")
+    public String src;
+
+    @Column(name="ERP_WH_NO")
+    @ApiParam("默认收货库存地")
+    public String erpWhNo;
+
+    @Column(name="LINE_NO")
+    @ApiParam("生产线")
+    public String lineNo;
+
+    @Column(name="WH_NO")
+    @ApiParam("默认仓库")
+    public String whNo;
+
+    @Column(name="CUST_NO")
+    @ApiParam("客户编码")
+    public String custNo;
+
+    @Column(name="SHIPPING_FLAG")
+    @ApiParam("特殊发货标志")
+    public String shippingFlag;
+
+    @Column(name="LOT_NO")
+    @ApiParam("生产批次")
+    public String lotNo;
+}

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

@@ -0,0 +1,115 @@
+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;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    public String 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

@@ -0,0 +1,99 @@
+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("状态")
+    public String 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/WmsPOMaster.java

@@ -0,0 +1,60 @@
+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 : PO订单主表
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_DOC_PO_MASTER")
+@Api("PO主表信息")
+public class WmsPOMaster extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
+
+    /**
+     * 单据类型:REG=原物料采购,
+     * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购
+     */
+    @Column(name="TYPE")
+    @ApiParam("单据类型")
+    public String type;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    public String status;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    public String vendorNo;
+
+    @Column(name="VERSION")
+    @ApiParam("版本")
+    public String version;
+
+    @Column(name="SRC")
+    @ApiParam("单据来源")
+    public String src;
+
+    @Column(name="IS_ASN")
+    @ApiParam("是否有ASN")
+    public String isAsn;
+}

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

@@ -0,0 +1,95 @@
+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 : PO订单明细信息
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_DOC_PO_DETAILS")
+@Api("PO订单明细信息")
+public class WmsPOMasterDetails 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="PRINT_QTY")
+    @ApiParam("条码打印数量")
+    public String printQty;
+
+    @Column(name="RC_QTY")
+    @ApiParam("收货数量")
+    public String rcQty;
+
+    @Column(name="PASS_QTY")
+    @ApiParam("质检合格数量")
+    public String passQty;
+
+    @Column(name="NG_QTY")
+    @ApiParam("质检不合格数量")
+    public String ngQty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="ZDATE")
+    @ApiParam("计划交货日期")
+    public String zDate;
+
+    @Column(name="ZTIME")
+    @ApiParam("计划交货时间")
+    public String zTime;
+
+    @Column(name="WH_NO")
+    @ApiParam("默认入库仓库代码")
+    public String whNo;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    public String status;
+
+    @Column(name="SNP")
+    @ApiParam("标准包装")
+    public String snp;
+
+    /**
+     * 是否免费:0=计费,1=免费
+     */
+    @Column(name="IS_FREE")
+    @ApiParam(value = "是否免费", example = "1")
+    public Integer isFree;
+}

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

@@ -0,0 +1,72 @@
+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_SHIPPING")
+@Api("产品发运信息")
+public class WmsShopping extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("发运单号")
+    public String orderNo;
+
+    @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="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    public String status;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String reMark;
+
+    @Column(name="SRC")
+    @ApiParam("单据来源")
+    public String src;
+
+    @Column(name="CUST_NO")
+    @ApiParam("客户编码")
+    public String custNo;
+
+    @Column(name="SHIPPING_FLAG")
+    @ApiParam("特殊发货标志")
+    public String shippingFlag;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.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.WmsASNMasterDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 9:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsASNMasterDetailsRepository extends BaseRepository<WmsASNMasterDetails, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterRepository.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.WmsASNMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 9:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsASNMasterRepository extends BaseRepository<WmsASNMaster, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFGInStockRepository.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.WmsFGInStock;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 9:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsFGInStockRepository extends BaseRepository<WmsFGInStock, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.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.WmsMoveMentDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 9:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsMoveMentDetailsRepository extends BaseRepository<WmsMoveMentDetails, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.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.WmsMoveMentMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 9:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsMoveMentMasterRepository extends BaseRepository<WmsMoveMentMaster, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterDetailsRepository.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.WmsPOMasterDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 9:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsPOMasterDetailsRepository extends BaseRepository<WmsPOMasterDetails, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterRepository.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.WmsPOMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 9:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsPOMasterRepository extends BaseRepository<WmsPOMaster, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShoppingRepository.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.WmsShopping;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 9:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsShoppingRepository extends BaseRepository<WmsShopping, Long> {
+}