From 6ffcdc3c33deac50a4a79e98024235cd4e2d61cc Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 7 Nov 2018 15:55:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=86=E6=9E=90?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=8C=81=E4=B9=85=E5=8C=96=EF=BC=8Cbaserepos?= =?UTF-8?q?itory=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 43 +-- .../base/jpa/daoimpl/BaseMongoRepositoryImpl.java | 26 +- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 112 ++++-- .../estsh/i3plus/pojo/base/tool/BsonPackTool.java | 381 +++++++++++++++------ .../i3plus/pojo/platform/bean/LogOperate.java | 6 +- .../LogOperateRepository.java | 3 +- .../LogSystemRepository.java | 5 +- 7 files changed, 386 insertions(+), 190 deletions(-) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{repository => repositorymongo}/LogOperateRepository.java (87%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{repository => repositorymongo}/LogSystemRepository.java (62%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index b0c41a1..22151c7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -63,31 +63,23 @@ public interface BaseRepository extends JpaReposito int executeUpdate(String qlString, List 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 - * @param propValue + * 弱删除 + * @return count */ - public void deleteByProperties(String[] propName, Object[] propValue); - - /** - * 通过 in 批量删除 - * @param ids 熟悉值数组 - */ - public void deleteByIds(Long[] ids); - - /** - * 批量删除 指定列名 - * @param propName - * @param ids - */ - public void deleteByTypeLong(String propName, Long[] ids); + public int deleteWeaklyById(ID id); + public int deleteWeaklyByIds(Long[] ids) ; + public int deleteWeaklyByProperty(String propName, Object propValue); + public int deleteWeaklyByPropertyIn(String propName, Object[] propValues); + public int deleteWeaklyByProperties(String[] propNames, Object[] objValues); /** * 通过多单属性进行单个值更新 @@ -135,13 +127,6 @@ public interface BaseRepository 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 extends JpaReposito public List findBySqlObjList(String sql); public List findBySqlObjListByPager(String sql,Pager pager); - - } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java index f44aa09..bd7ab88 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java @@ -191,7 +191,12 @@ public class BaseMongoRepositoryImpl 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 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 packObjectListFromDocument(List dList) { @@ -235,9 +244,16 @@ public class BaseMongoRepositoryImpl extends SimpleM } }; - FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson) - .skip(pager.getStartRow()) - .limit(pager.getPageSize()); + FindIterable findIter = null; + if(bson == null) { + 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()){ diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 7f78c9a..1fa0cec 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/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 extends SimpleJpaRep private Class persistentClass; - public BaseRepositoryImpl(Class tClass, EntityManager em) { - super(tClass, em); + public BaseRepositoryImpl(Class clz, EntityManager 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 extends SimpleJpaRep } @Override - public void deleteByProperties(String propName, Object propValue) { - deleteByProperties(new String[] { propName }, new Object[] { propValue }); + public void deleteById(ID id){ + 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) { - deleteByTypeLong("id", ids); + public int deleteByIds(ID[] ids) { + return deleteByPropertyIn("id", ids); } @Override - public void deleteByTypeLong(String propName, Long[] ids) { - if ((propName != null && propName.length() > 0) && (ids != null && ids.length > 0)) { - String hql = "delete from " + persistentClass.getName() + " model where model."+propName+" in(:ids) "; + public int deleteByPropertyIn(String propName, Object[] propValues) { + if ((propName != null && propName.length() > 0) && (propValues != null && propValues.length > 0)) { + 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 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 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java index d8892ed..d7d98aa 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java @@ -76,8 +76,13 @@ public class BsonPackTool { //查询 MongoCollection collection = mongoOperations.getCollection(tableName); - collection.find(bson).skip(skip).limit(limit).forEach(saveBlock); - collection.count(bson); + if(bson == null) { + 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 list = new ArrayList<>(); long count = mongoOperations.getCollection(tableName).count(bson); int loops = (int)((count + pageSize - 1) / pageSize); + List newFinds = null; for(int i = 0; i < loops; i++) { - List 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( - bson, - Filters.gte(columnName,startDate), //大于等于开始日期 - Filters.lte(columnName,endDate) //小于等于结束日期 - ); + if(bson == null) { + bson = Filters.and( + Filters.gte(columnName, startDate), //大于等于开始日期 + 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( - bson, - //Filters.eq(columnName,time[0]) - Filters.regex(columnName, "^"+time[0]) //like 日期%^ - ); + if(bson == null){ + bson = Filters.and( + 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( - bson, - Filters.gte(columnName,time[0]), //大于等于开始日期 - Filters.lte(columnName,time[1]) //小于等于结束日期 - ); + if(bson == null) { + bson = Filters.and( + Filters.gte(columnName, time[0]), //大于等于开始日期 + 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) { - - bson = Filters.and( - bson, - Filters.gte(columnName,time[0] + " 00:00:00"), //大于等于开始日期 - Filters.lte(columnName,time[1] + " 23:59:59") //小于等于结束日期 - ); + if(bson == null) { + bson = Filters.and( + Filters.gte(columnName, time[0] + " 00:00:00"), //大于等于开始日期 + 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( - bson, - Filters.gte(columnName,time[0]), //大于等于开始日期 - Filters.lte(columnName,time[1]) //小于等于结束日期 - ); + if(bson == null) { + bson = Filters.and( + Filters.gte(columnName, time[0]), //大于等于开始日期 + 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( - bson, - Filters.regex(columnName, str) //like - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.or( - Filters.regex(columnName, str) //like - ) - ); + if(bson == null) { + bson = Filters.or( + 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( - bson, - Filters.regex(columnName, str + "^") //like - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.regex(columnName, "^" + str) //like - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.eq(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.eq(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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, - Filters.eq(columnName, data) - ); + + if(bson == null) { + 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( - bson, - Filters.eq(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.gt(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.lt(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.gt(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.lt(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.eq(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.eq(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.eq(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.ne(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.in(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.in(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.nin(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + 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( - bson, - Filters.nin(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.nin(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.nin(columnName, data) + ); + } } return bson; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java index da111f8..bd5b703 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java @@ -31,9 +31,9 @@ public class LogOperate extends BaseBean { @ApiParam(value ="系统模块（枚举）", example = "1") //CommonEnumUtil.SOFT_TYPE private Integer operateModuleId; - - @Column(name="OPERATE_TYPE_ID（枚举）") - //ImppEnumUtil.OPERATE_TYPE + + @Column(name="OPERATE_TYPE_ID") + //ImppEnumUtil.OPERATE_TYPE（枚举） @ApiParam(value ="操作类型" , example = "-1") private Integer operateTypeId; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java similarity index 87% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java index c046242..9d4ff80 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java +++ b/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 { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogSystemRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogSystemRepository.java similarity index 62% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogSystemRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogSystemRepository.java index c608ab9..fccdc6c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogSystemRepository.java +++ b/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 { +public interface LogSystemRepository extends BaseMongoRepository { } From 913783131289d23d95c5d329e806151c9dbf3ded Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Wed, 7 Nov 2018 17:25:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E7=89=A9=E6=96=99=E3=80=81=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java | 4 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 2 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 34 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java index d7b077e..4404e8e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java @@ -31,9 +31,9 @@ public class WmsIbCheckPlan extends BaseBean{ @ApiParam(value ="物料编码") private String partNo; - @Column(name="PART_NAME") + @Column(name="PART_NAME_RDD") @ApiParam(value ="物料名称") - private String partName; + private String partNameRdd; @Column(name="START_DATE") @ApiParam(value ="开始日期") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index f73ac3b..53d6880 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -75,7 +75,7 @@ public class WmsLocate extends BaseBean { private Integer maxPartQty; @Column(name="STOCK_UNIT") - @ApiParam(value ="存放单位", example = "-1") + @ApiParam(value ="存放单位") private String stockUnit; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 790e366..d0694ba 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -17,6 +17,40 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; public class WmsHqlPack { /** + * 库位物料信息 分页查询 + * @param wmsLocatePart + * @return + */ + public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); + HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result); + + return result.toString(); + } + + /** + * 库位信息 分页查询 + * @param wmsLocate + * @return + */ + public static String packHqlWmsLocates(WmsLocate wmsLocate) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsLocate.getLocateNo(),"locateNo",result); + HqlPack.getStringLikerPack(wmsLocate.getLocateName(),"locateName",result); + HqlPack.getStringLikerPack(wmsLocate.getLocateType(),"locateType",result); + HqlPack.getStringLikerPack(wmsLocate.getWhNo(),"whNo",result); + HqlPack.getStringLikerPack(wmsLocate.getZoneNo(),"zoneNo",result); + + return result.toString(); + } + + /** * 工厂仓库模糊分页查询 * @param wareHouse * @return From d505020af2611c803b59e64a3a41bfa8d5f31465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 7 Nov 2018 17:32:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=EF=BC=8C?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=EF=BC=8C=E5=AE=A2=E6=88=B7=E5=8F=91=E5=BE=80?= =?UTF-8?q?=E5=9C=B0=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 60 +++++++++++++++++ .../i3plus/pojo/wms/bean/WmsShippingFlag.java | 61 +++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 77 ++++++++++++++++++++++ .../pojo/wms/repository/BasCustomerRepositry.java | 16 +++++ .../wms/repository/WmsShippingFlagRepositry.java | 16 +++++ .../pojo/wms/repository/WmsZonesRepositry.java | 17 +++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 48 ++++++++++++++ 7 files changed, 295 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java new file mode 100644 index 0000000..03eab05 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.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 :客户信息表 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-06 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="BAS_CUSTOMER") +@DynamicInsert +@DynamicUpdate +@Api(value="客户信息表",description = "客户信息表") +public class BasCustomer extends BaseBean { + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编号") + private String custNo; + + @Column(name = "CUST_NAME") + @ApiParam(value = "客户简称") + private String custName; + + @Column(name = "CUST_DESC") + @ApiParam(value = "客户全称") + private String custDesc; + + @Column(name = "CUST_ADDR") + @ApiParam(value = "客户地址") + private String custAddr; + + @Column(name = "CUST_OWNER") + @ApiParam(value = "联系人") + private String custOwner; + + @Column(name = "CUST_EMAIL") + @ApiParam(value = "邮箱") + private String custEmail; + + @Column(name = "CUST_TEL") + @ApiParam(value = "联系人电话") + private String custTel; + + @Column(name = "CUST_FAX") + @ApiParam(value = "传真") + private String custFax; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java new file mode 100644 index 0000000..8e9d858 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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 : hansen.ke + * @CreateDate : 2018-11-07 14:38 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_SHIPPING_FLAG") +@DynamicInsert +@DynamicUpdate +@Api(value="客户发往地信息表",description = "客户发往地信息表") +public class WmsShippingFlag extends BaseBean { + + @Column(name = "FLAG_NO") + @ApiParam(value = "编号") + private String flagNo; + + @Column(name = "FLAG_NAME") + @ApiParam(value = "简称") + private String flagName; + + @Column(name = "FLAG_DESC") + @ApiParam(value = "全称") + private String flagDesc; + + @Column(name = "FLAG_ADDR") + @ApiParam(value = "地址") + private String flagAddr; + + @Column(name = "FLAG_OWNER") + @ApiParam(value = "联系人") + private String flagOwner; + + @Column(name = "FLAG_EMAIL") + @ApiParam(value = "邮箱") + private String flagEmail; + + @Column(name = "FLAG_TEL") + @ApiParam(value = "联系人电话") + private String flagTel; + + @Column(name = "FLAG_FAX") + @ApiParam(value = "传真") + private String flagFax; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java new file mode 100644 index 0000000..f493b51 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -0,0 +1,77 @@ +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 : hansen.ke + * @CreateDate : 2018-11-06 11:50 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ZONES") +@DynamicInsert +@DynamicUpdate +@Api(value="存储区信息表",description = "存储区信息表") +public class WmsZones extends BaseBean { + + @Column(name = "WH_NO") + @ApiParam(value = "仓库代码") + private String whNo; + + @Column(name = "AREA_NO") + @ApiParam(value = "库存地代码") + private String areaNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区代码") + private String zoneNo; + + @Column(name = "ZONE_NAME") + @ApiParam(value = "存储区名称") + private String zoneName; + + @Column(name = "IS_PM") + @ApiParam(value = "零件级管控" , example = "2") + private Integer isPm; + + @Column(name = "IS_LM") + @ApiParam(value = "批次级管控" , example = "2") + private Integer isLm; + + @Column(name = "IS_SN") + @ApiParam(value = "条码级管控" , example = "1") + private Integer isSn; + + @Column(name = "IS_MIX") + @ApiParam(value = "允许混淆" , example = "1") + private Integer isMix; + + @Column(name = "IS_SC") + @ApiParam(value = "库容检查" , example = "1") + private Integer isSc; + + @Column(name = "STRATEGY") + @ApiParam(value = "堆放策略") + private String strategy; + + @Column(name = "IS_NEGATIVE") + @ApiParam(value = "允许负库存" , example = "1") + private Integer isNegative; + + @Column(name = "CHECK_FIFO") + @ApiParam(value = "校验先进先出" , example = "1") + private Integer checkFifo; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java new file mode 100644 index 0000000..40478e5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.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.BasCustomer; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(客户信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-06 17:27 + * @Modify: + **/ +@Repository +public interface BasCustomerRepositry extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java new file mode 100644 index 0000000..cab9915 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.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.WmsShippingFlag; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(客户发往地信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-07 14:58 + * @Modify: + **/ +@Repository +public interface WmsShippingFlagRepositry extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java new file mode 100644 index 0000000..c61fec7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsZones; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(存储区信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-06 13:40 + * @Modify: + **/ +@Repository +public interface WmsZonesRepositry extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 790e366..3f3737c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -124,4 +124,52 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()+"","isValid",result); return result.toString(); } + + /** + * 存储区信息 查询条件封装 + * @param wmsZones + * @return + */ + public static String packHqlWmsZones(WmsZones wmsZones) { + StringBuffer result = new StringBuffer(); + //仓库代码 + HqlPack.getStringLikerPack(wmsZones.getWhNo(),"whNo",result); + //库存地代码 + HqlPack.getStringLikerPack(wmsZones.getAreaNo(),"areaNo",result); + //存储区代码 + HqlPack.getStringLikerPack(wmsZones.getZoneNo(),"zoneNo",result); + return result.toString(); + } + + /** + * 客户信息 查询条件封装 + * @param basCustomer + * @return + */ + public static String packHqlBasCustomer(BasCustomer basCustomer){ + StringBuffer result = new StringBuffer(); + //客户编号 + HqlPack.getStringLikerPack(basCustomer.getCustNo(),"custNo",result); + //客户简称 + HqlPack.getStringLikerPack(basCustomer.getCustName(),"custName",result); + //客户全称 + HqlPack.getStringLikerPack(basCustomer.getCustDesc(),"custDesc",result); + return result.toString(); + } + + /** + * 客户发往地信息 查询条件封装 + * @param wmsShippingFlag + * @return + */ + public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag){ + StringBuffer result = new StringBuffer(); + //供应商编号 + HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(),"flagNo",result); + //供应商简称 + HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(),"flagName",result); + //供应商全称 + HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(),"flagDesc",result); + return result.toString(); + } }