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..129cfe3 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,33 @@ 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); + 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); /** - * 通过 in 批量删除 - * @param ids 熟悉值数组 + * 更新有效无效状态 + * @return count */ - public void deleteByIds(Long[] ids); - - /** - * 批量删除 指定列名 - * @param propName - * @param ids - */ - public void deleteByTypeLong(String propName, Long[] ids); + public int updateValidStatusById(ID id,int status); + public int updateValidStatusByIds(Long[] ids,int status) ; + public int updateValidStatusByProperty(String propName, Object propValue,int status); + public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status); + public int updateValidStatusByProperties(String[] propNames, Object[] objValues,int status); /** * 通过多单属性进行单个值更新 @@ -135,13 +137,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 +235,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..0466c15 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,150 @@ 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 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(propName, Arrays.asList(propValues)); + + return query.executeUpdate(); + }else{ + throw new IllegalArgumentException("删除出错："+propName+":" + propValues); + } } @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 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("ids", Arrays.asList(ids)); + query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + query.setParameter(propName, Arrays.asList(propValues)); - query.executeUpdate(); + return query.executeUpdate(); }else{ - throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! "+propName+":" + ids); + 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); + + return query.executeUpdate(); + }else{ + throw new IllegalArgumentException("弱删除失败："+propName+":" + propValue); + } + } + + @Override + public int updateValidStatusById(ID id,int status) { + return updateValidStatusByProperty("id", id,status); + } + + @Override + public int updateValidStatusByIds(Long[] ids,int status) { + return updateValidStatusByPropertyIn("id", ids,status); + } + + @Override + public int updateValidStatusByProperty(String propName, Object propValue,int status) { + return updateValidStatusByProperties(new String[] { propName }, new Object[] { propValue },status); + } + + /** + * 批量弱删除 + * @return + */ + @Override + public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status) { + 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",status); + query.setParameter(propName, Arrays.asList(propValues)); + + return query.executeUpdate(); + }else{ + throw new IllegalArgumentException("弱删除失败："+propName+":" + propValues); + } + } + + /** + * 批量弱删除 + * @return + */ + @Override + public int updateValidStatusByProperties(String[] propName, Object[] propValue,int status) { + 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",status); + + setParameter(query,propName,propValue); + + return query.executeUpdate(); + }else{ + throw new IllegalArgumentException("弱删除失败："+propName+":" + propValue); } } @@ -782,28 +895,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-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index 78f3aa7..ca6bba6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -198,6 +198,18 @@ public class HqlPack { } /** + * 封装String对象成equal语句 + * @param columnName 列名 + * @param result + */ + public static void getStringEqualPackOr(String data,String columnName, StringBuffer result) { + if(data != null && data.trim().length() > 0){ + data = getSafeParam(data); + result.append(" or model."+columnName+" = '" + data + "'"); + } + } + + /** * 封装long或者int的整数对象成equal语句 * @param columnName 列名 * @param result @@ -214,6 +226,18 @@ public class HqlPack { * @param columnName 列名 * @param result */ + public static void getNumEqualPackOr(Object data,String columnName, StringBuffer result) { + if(data!=null&&Long.parseLong(data.toString()) > 0){ + data = getSafeParam(data); + result.append(" or model."+columnName+" = " + data + ""); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * @param columnName 列名 + * @param result + */ public static void getNumEqualPackForZero(Object data,String columnName, StringBuffer result) { if(data!=null&&Long.parseLong(data.toString()) >= 0){ data = getSafeParam(data); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/FactoryStore.java similarity index 94% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/FactoryStore.java index 8a9668a..09172ce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/FactoryStore.java @@ -1,5 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean; - +package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; 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 84% 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 440d49c..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,19 +1,14 @@ -/* -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; -*/ /** * @Description : 操作日志表(使用Mongodb) * @Reference : * @Author : wei.peng * @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 { } 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/CustomerSendTo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/CustomerSendTo.java deleted file mode 100644 index eb5b76c..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/CustomerSendTo.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : 工厂仓库 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-04 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name="T_WMS_CUSTOMER_SENDTO") -@Api("客户发往地信息") -public class CustomerSendTo extends BaseBean { - - @Column(name="CUSTOMER_ID") - @ApiParam("客户端编号") - public String customerId; - - @Column(name="PART_ID") - @ApiParam("零件编号") - public String partId; - - @Column(name="CUSTOMER_PARTNO") - @ApiParam("客户零件号") - public String customerPartNo; - - @Column(name="ERP_PARTNO") - @ApiParam("ERP零件号") - public String ERPPartNo; - - @Column(name="CUSTOMER_SENDTO_CODE") - @ApiParam("客户发往地代码") - public String customerSendToCode; - - @Column(name="CUSTOMER_SENDTO_NAME") - @ApiParam("客户发往地名称") - public String customerSendToName; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java deleted file mode 100644 index d3dc77f..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : 接口驱动类信息实体 - * @Reference : - * @Author : amy - * @CreateDate : 2018-11-01 11:45 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name="T_INTERFACE_DEVICE") -@Api("接口驱动类信息") -public class InterfaceDevice extends BaseBean { - - @Column(name="device_name") - @ApiParam("驱动名称") - private String deviceName; - - @Column(name="device_classname") - @ApiParam("驱动类名称") - private String deviceClassName; - - @Column(name="status") - @ApiParam("状态 【0-禁用 1-正常】") - private Integer status; - - } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java deleted file mode 100644 index 39d7dd6..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java +++ /dev/null @@ -1,100 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : 接口类型信息实体 - * @Reference : - * @Author : amy - * @CreateDate : 2018-11-01 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name="T_INTERFACE_TYPE") -@Api("接口类型信息") -public class InterfaceType extends BaseBean { - - @Column(name="tp_id") - @ApiParam("接口编号") - @JsonSerialize(using = ToStringSerializer.class) - private Long tpId; - - @Column(name="tp_typ") - @ApiParam("接口类型") - private String tpTyp; - - @Column(name="pb_no") - @ApiParam("发布方编码") - private String pbNo; - - @Column(name="tp_no") - @ApiParam("接口编码") - private String tpNo; - - @Column(name="tp_desc") - @ApiParam("接口主题描述") - private String tpDesc; - - @Column(name="mes_tab") - @ApiParam("接口业务表") - private String mesTab; - - @Column(name="mes_group") - @ApiParam("业务表的分组条件") - private String mesGroup; - - @Column(name="mes_pk") - @ApiParam("业务表主键") - private String mesPk; - - @Column(name="act_type") - @ApiParam("业务类型") - private Integer actType; - - @Column(name="act_desc") - @ApiParam("业务描述") - private String actDesc; - - @Column(name="device_id") - @ApiParam("驱动类编号") - @JsonSerialize(using = ToStringSerializer.class) - private Long deviceId; - - @Column(name="request_url") - @ApiParam("服务器请求路径") - private String requestUrl; - - @Column(name="cfile_path") - @ApiParam("客户文件路径") - private String cfilePath; - - public Long getTpId() { - if(tpId != null) { - return tpId.longValue(); - }else{ - return tpId; - } - } - - public Long getDeviceId() { - if(deviceId != null) { - return deviceId.longValue(); - }else{ - return deviceId; - } - } -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java deleted file mode 100644 index 0f59530..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : 工厂仓库 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-04 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name="WH_STOCK_AREA") -@Api("仓库区域") -public class StockArea extends BaseBean { - - @Column(name="AREA_CODE") - @ApiParam("仓库区域代码") - public String areaCode; - - @Column(name="AREA_NAME") - @ApiParam("仓库区域名称") - public String areaName; - - @Column(name="WH_ID") - @ApiParam(value = "仓库编号", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - public Long whId; - - @Column(name="WH_CODE_RDD") - @ApiParam("仓库代码") - public String whCodeRdd; - - @Column(name="WH_NAME_RDD") - @ApiParam("仓库名称") - public String whNameRdd; - - public Long getWhId() { - if(whId != null) { - return whId.longValue(); - }else{ - return whId; - } - } - -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java deleted file mode 100644 index c44b785..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : 库位 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-04 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name="WH_STOCK_LOC") -@Api("仓库库位") -public class StockLocation extends BaseBean { - - @Column(name="LOC_CODE") - @ApiParam("仓库库位代码") - public String locCode; - - @Column(name="LOC_NAME") - @ApiParam("仓库库位名称") - public String locName; - - @Column(name="AREA_ID") - @ApiParam(value = "库区编号", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - public Long areaId; - - @Column(name="AREA_CODE_RDD") - @ApiParam("库区代码") - public String areaCodeRdd; - - @Column(name="AREA_NAME_RDD") - @ApiParam("库区名称") - public String areaNameRdd; - - public Long getAreaId() { - if(areaId != null) { - return areaId.longValue(); - }else{ - return areaId; - } - } -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java new file mode 100644 index 0000000..713c550 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -0,0 +1,64 @@ +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; + + /** + * 状态:0=新建,10=收货中,20=收货完成, + * 30=入库中,40=入库完成,90=已关闭,91=已取消 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "0") + public Integer 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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java new file mode 100644 index 0000000..8322953 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -0,0 +1,106 @@ +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; + + /** + * 状态:N=正常,C=行取消,R=已收货 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "1") + public Integer 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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java new file mode 100644 index 0000000..5eadd36 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.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 : silliter.yuan + * @CreateDate : 2018-11-06 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_AREA_OWNER") +@DynamicInsert +@DynamicUpdate +@Api(value="责任区域分配信息",description = "责任区域分配信息") +public class WmsAreaOwner extends BaseBean { + + @Column(name = "WH_NO") + @ApiParam(value = "仓库代码") + private String whNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区编号") + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位编号") + private String locateNo; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + private String vendorNo; + + @Column(name = "OWNER_USER_NO") + @ApiParam(value = "负责人") + private String ownerUserNo; + + @Column(name = "IS_PRE_ASSIGN") + @ApiParam(value = "是否预分配人员") + private String isPreAssign; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java new file mode 100644 index 0000000..8b5cb29 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -0,0 +1,79 @@ +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_CS_FACTTRANS") +@Api("盘点实盘信息") +public class WmsCSFactTrans extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name="WH_NO") + @ApiParam("仓库代码") + public String whNo; + + @Column(name="ZONE_NO") + @ApiParam("存储区编号") + public String zoneNo; + + @Column(name="LOCATE_NO") + @ApiParam("库位编号") + public String locateNo; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="SN") + @ApiParam("条码") + public String sn; + + @Column(name="QTY") + @ApiParam(value = "库存数量", example = "0") + public Double qty; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + @Column(name="FACT_QTY") + @ApiParam(value = "实盘数量", example = "0") + public Double factQty; + + /** + * 状态:0=创建,10=已处理 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "1") + public Integer status; + + @Column(name="REMARK") + @ApiParam(value = "备注") + public String reMark; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefUserWareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java similarity index 57% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefUserWareHouse.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java index ba6e1bb..3e970c4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefUserWareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java @@ -12,25 +12,25 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : 用户仓库关系表 + * @Description : 盘点库位信息 * @Reference : * @Author : silliter.yuan - * @CreateDate : 2018-10-31 15:18 + * @CreateDate : 2018-11-06 15:58 * @Modify: **/ @Data @Entity @DynamicInsert @DynamicUpdate -@Table(name="T_WMS_USER_WAREHOUSE") -@Api("用户仓库关系表") -public class RefUserWareHouse extends BaseBean { +@Table(name="WMS_DOC_CS_LOCATE") +@Api("盘点库位信息") +public class WmsCSLocate extends BaseBean { - @Column(name="USER_ID") - @ApiParam("用户编号") - public String userId; + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; - @Column(name="WAREHOUSE_ID") - @ApiParam("仓库编号") - public String storeId; + @Column(name="LOCATE_NO") + @ApiParam("库位代码") + public String locateNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java new file mode 100644 index 0000000..61f7b21 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -0,0 +1,89 @@ +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_CS_DETAILS") +@Api("盘点单冻结信息") +public class WmsCSOrderDetails extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name="WH_NO") + @ApiParam("仓库代码") + public String whNo; + + @Column(name="ZONE_NO") + @ApiParam("存储区编号") + public String zoneNo; + + @Column(name="LOCATE_NO") + @ApiParam("库位编号") + public String locateNo; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="SN") + @ApiParam("条码") + public String sn; + + @Column(name="QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + /** + * 质检状态:0=未质检,10=质检中,20=质检合格, + * 30=质检不合格,40=已退货 + */ + @Column(name="QC_STATUS") + @ApiParam(value = "质检状态", example = "1") + public Integer qcStatus; + + /** + * 条码状态:0=创建,10=已收货,20=已质检, + * 30=已入库,40=待出库,50=已出库, + * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 + */ + @Column(name="STATUS") + @ApiParam(value = "条码状态", example = "1") + public Integer status; + + /** + * 处理状态:0=已创建,5=已盘,10=已冻结 + * ,20=已解冻,30=取消冻结 + */ + @Column(name="TRANS_STATUS") + @ApiParam(value = "处理状态", example = "1") + public Integer transStatus; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java new file mode 100644 index 0000000..365196f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -0,0 +1,52 @@ +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_CS_ORDER") +@Api("盘点单主表信息") +public class WmsCSOrderMaster extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + /** + * 单据类型:10=日常盘点,20=月度盘点, + * 30=季度盘点,40=年度盘点 + */ + @Column(name="ORDER_TYPE") + @ApiParam("单据类型") + public String orderType; + + @Column(name="STATUS") + @ApiParam("状态") + public String status; + + @Column(name="PERSENT") + @ApiParam("盘点进度") + public String persent; + + @Column(name="REMARK") + @ApiParam("备注") + public String reMark; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java new file mode 100644 index 0000000..650a3f4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java @@ -0,0 +1,40 @@ +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_CS_PART") +@Api("盘点区物料信息") +public class WmsCSPart 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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefOrgWareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java similarity index 57% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefOrgWareHouse.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java index 275677d..04ce4e7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefOrgWareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java @@ -12,25 +12,25 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : 仓库组织关系表 + * @Description : 盘点存储区信息 * @Reference : * @Author : silliter.yuan - * @CreateDate : 2018-10-31 15:18 + * @CreateDate : 2018-11-06 15:58 * @Modify: **/ @Data @Entity @DynamicInsert @DynamicUpdate -@Table(name="T_WMS_ORG_WAREHOUSE") -@Api("工厂仓库组织关系表") -public class RefOrgWareHouse extends BaseBean { +@Table(name="WMS_DOC_CS_ZONE") +@Api("盘点存储区信息") +public class WmsCSZone extends BaseBean { - @Column(name="ORG_ID") - @ApiParam("组织编号") - public String orgId; + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; - @Column(name="WAREHOUSE_ID") - @ApiParam("仓库编号") - public String storeId; + @Column(name="ZONE_NO") + @ApiParam("存储区代码") + public String zoneNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java new file mode 100644 index 0000000..ebfe0df --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java @@ -0,0 +1,64 @@ +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_IB_CHECK_FACT") +@Api("抽点记录信息") +public class WmsCheckFactRecord extends BaseBean { + + @Column(name="PO_NO") + @ApiParam("采购单号") + public String poNo; + + @Column(name="ASN_NO") + @ApiParam("ANS单号") + public String asnNo; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + public String vendorNo; + + @Column(name="SN") + @ApiParam("条码") + public String sn; + + @Column(name="REMARK") + @ApiParam("备注") + public String reMark; + + @Column(name="PLAN_QTY") + @ApiParam(value = "应收数量", example = "0") + public Double planQty; + + @Column(name="CHECK_QTY") + @ApiParam(value = "抽点数量", example = "0") + public Double checkQty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java new file mode 100644 index 0000000..5d25594 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.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 : 产品入库信息 + * @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; + + /** + * 状态:0=新建,10=已处理,20=处理出错 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "0") + public Integer 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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java index 9ec77db..4b40af3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java @@ -103,11 +103,11 @@ public class WmsField extends BaseBean{ private String defaulter; @Column(name = "ADD_STATUS") - @ApiParam("状态") + @ApiParam(value = "状态", example = "1") private Integer addStatus; @Column(name = "DATA_TYPE") - @ApiParam("数据类型") + @ApiParam(value = "数据类型", example = "1") private Integer dataType; @Column(name = "DATA_TYPE_NAME") @@ -115,11 +115,11 @@ public class WmsField extends BaseBean{ private String dataTypeName; @Column(name = "DATA_SIZE") - @ApiParam("整数位长度") + @ApiParam(value = "整数位长度", example = "1") private Integer dataSize; @Column(name = "DATA_DECIMAL") - @ApiParam("小数位长度") + @ApiParam(value = "小数位长度", example = "1") private Integer dataDecimal; } 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 new file mode 100644 index 0000000..4404e8e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java @@ -0,0 +1,58 @@ +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 io.swagger.models.auth.In; +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 : jimmy.zeng + * @CreateDate : 2018-11-07 10:55 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_IB_CHECK_PLAN") +@DynamicInsert +@DynamicUpdate +@Api(value="抽点比例表",description = "抽点比例表") +public class WmsIbCheckPlan extends BaseBean{ + + @Column(name="PART_NO") + @ApiParam(value ="物料编码") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam(value ="物料名称") + private String partNameRdd; + + @Column(name="START_DATE") + @ApiParam(value ="开始日期") + private String startDate; + + @Column(name="END_DATE") + @ApiParam(value ="结束日期") + private String endDate; + + @Column(name="LOT_QTY") + @ApiParam(value ="样本数量", example = "-1") + private Integer lotQty; + + @Column(name="COUNTER") + @ApiParam(value ="已收货件数", example = "-1") + private Integer counter; + + @Column(name="CHECK_COUNTER") + @ApiParam(value ="已抽点件数", example = "-1") + private Integer checkCounter; + +} 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 new file mode 100644 index 0000000..53d6880 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -0,0 +1,81 @@ +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 : jimmy.zeng + * @CreateDate : 2018-11-07 10:35 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_LOCATE") +@DynamicInsert +@DynamicUpdate +@Api(value="库位表",description = "库位表") +public class WmsLocate extends BaseBean { + + @Column(name="LOCATE_NO") + @ApiParam(value ="库位代码") + private String locateNo; + + @Column(name="LOCATE_NAME") + @ApiParam(value ="库位名称") + private String locateName; + + @Column(name="LOCATE_TYPE") + @ApiParam(value ="库位类型") + private String locateType; + + @Column(name="WH_NO") + @ApiParam(value ="仓库代码") + private String whNo; + + @Column(name="ZONE_NO") + @ApiParam(value ="存储区代码") + private String zoneNo; + + @Column(name="X") + @ApiParam(value ="X", example = "-1") + private Integer x; + + @Column(name="Y") + @ApiParam(value ="Y", example = "-1") + private Integer y; + + @Column(name="Z") + @ApiParam(value ="Z", example = "-1") + private Integer z; + + @Column(name="SEQ") + @ApiParam(value ="序号", example = "-1") + private Integer seq; + + @Column(name="IS_EMPTY") + @ApiParam(value ="是否空库位", example = "-1") + private Integer isEmpty; + + @Column(name="MAX_PACKAGE_QTY") + @ApiParam(value ="最大包装数量", example = "-1") + private Integer maxPackageQty; + + @Column(name="MAX_PART_QTY") + @ApiParam(value ="最大零件数量", example = "-1") + private Integer maxPartQty; + + @Column(name="STOCK_UNIT") + @ApiParam(value ="存放单位") + private String stockUnit; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java new file mode 100644 index 0000000..f2687db --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -0,0 +1,40 @@ +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 : jimmy.zeng + * @CreateDate : 2018-11-07 10:51 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_LOCATE_PART") +@DynamicInsert +@DynamicUpdate +@Api(value="库位物料表",description = "库位物料表") +public class WmsLocatePart extends BaseBean{ + + @Column(name="LOCATE_NO") + @ApiParam(value ="库位代码") + private String locateNo; + + @Column(name="PART_NO") + @ApiParam(value ="物料编码") + private String partNo; + + @Column(name="PART_NAME") + @ApiParam(value ="物料名称") + private String partName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java new file mode 100644 index 0000000..31e6802 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -0,0 +1,86 @@ +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_MOVE_DETAILS") +@Api("库存移动单明细信息") +public class WmsMoveDetails 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="CUST_NO") + @ApiParam("客户编号") + public String custNo; + + @Column(name="QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name="TRANS_QTY") + @ApiParam(value = "处理数量", example = "0") + public Double transQty; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + @Column(name="WH_NO") + @ApiParam("仓库代码") + public String whNo; + + @Column(name="ZONE_NO") + @ApiParam("存储区代码") + public String zoneNo; + + @Column(name="LOCATE_NO") + @ApiParam("库位代码") + public String locateNo; + + /** + * 状态:0=创建,5=待处理,10=已处理 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "0") + public Integer status; + + /** + * ASN,PO,SO + */ + @Column(name="REF_TYPE") + @ApiParam("关联单据类型") + public String refType; + + @Column(name="REF_SRC") + @ApiParam("关联单号") + public String refSrc; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java new file mode 100644 index 0000000..375238b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -0,0 +1,52 @@ +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_MOVE_MASTER") +@Api("库存移动单主表信息") +public class WmsMoveMaster extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + /** + * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, + * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, + * MI=移库入库,MO=移库出库,SO=发运 + */ + @Column(name="TYPE") + @ApiParam("业务类型") + public String type; + + /** + * 状态:0=创建,5=待处理,10=已处理 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "0") + public Integer status; + + @Column(name="REMARK") + @ApiParam("备注") + public String reMark; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java new file mode 100644 index 0000000..a2560d2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java @@ -0,0 +1,118 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 库存移动单明细信息 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="WMS_DOC_MOVEMENT_DETAILS") +@Api("库存移动单明细信息") +public class WmsMoveMentDetails extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name="ITEM") + @ApiParam("行号") + public String item; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + @Column(name="SRC_WH") + @ApiParam("发出库仓库") + public String srcWh; + + @Column(name="DEST_WH") + @ApiParam("接收库仓库") + public String destWh; + + @Column(name="PRINT_QTY") + @ApiParam("条码打印数量") + public String printQty; + + @Column(name="FACT_QTY") + @ApiParam("操作完成数量") + public String factQty; + + @Column(name="ZDATE") + @ApiParam("计划交货日期") + public String zDate; + + @Column(name="ZTIME") + @ApiParam("计划交货时间") + public String zTime; + + @Column(name="SRC_NO") + @ApiParam("源单号") + public String srcNo; + + /** + * 状态:N=正常,C=行取消 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "1") + public Integer status; + + @Column(name="REMARK") + @ApiParam("备注") + public String reMark; + + /** + * 是否免费:0=计费,1=免费 + */ + @Column(name="IS_FREE") + @ApiParam(value = "是否免费", example = "1") + public Integer isFree; + + @Column(name="PICK_QTY") + @ApiParam(value = "已配数量", example = "0") + public Double pickQty; + + @Column(name="OUT_QTY") + @ApiParam(value = "已提交数量", example = "0") + public Double outQty; + + @Column(name="INLINE_QTY") + @ApiParam(value = "已上线数量", example = "0") + public Double inLineQty; + + @Column(name="REJECT_QTY") + @ApiParam(value = "退料数量", example = "0") + public Double rejectQty; + + @Column(name="REJECT_POST_QTY") + @ApiParam(value = "退料提交数量", example = "0") + public Double rejectPostQty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java new file mode 100644 index 0000000..e9a7946 --- /dev/null +++ b/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(value = "状态", example = "0") + public Integer status; + + @Column(name="CUSTOMER_NO") + @ApiParam("客户编号") + public String customerNo; + + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + public String vendorNo; + + @Column(name="VERSION") + @ApiParam("版本") + public String version; + + @Column(name="SRC") + @ApiParam("单据来源") + public String src; + + @Column(name="SRC_NO") + @ApiParam("关联单据") + public String srcNo; + + @Column(name="ERP_ORDERNO") + @ApiParam("ERP单号") + public String erpOrderNo; + + /** + * 单据类型:WO=工单配料 + */ + @Column(name="ORDER_TYPE") + @ApiParam("单据类型") + public String orderType; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java new file mode 100644 index 0000000..daa3cb8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -0,0 +1,67 @@ +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_MOVE_SN") +@Api("库存移动单条码信息") +public class WmsMoveSn 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; + + /** + * 状态:0=创建,10=已处理 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "0") + public Integer status; + + @Column(name="SN") + @ApiParam("条码") + public String sn; + + @Column(name="REMARK") + @ApiParam("备注") + public String reMark; + + @Column(name="LOT_NO") + @ApiParam("批次编号") + public String lotNo; + + @Column(name="PACKAGE_NO") + @ApiParam("容器编号") + public String packAgeNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java new file mode 100644 index 0000000..06c7238 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -0,0 +1,64 @@ +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; + + /** + * 状态:0=新建,10=收货中,20=收货完成, + * 30=入库中,40=入库完成,90=已关闭,91=已取消 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "0") + public Integer 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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java new file mode 100644 index 0000000..12d6ff4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -0,0 +1,98 @@ +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; + + /** + * 状态:N=正常,C=行取消 + */ + @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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java new file mode 100644 index 0000000..40ac3af --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java @@ -0,0 +1,44 @@ +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_PACKAGE") +@Api("物理包装信息") +public class WmsPackage extends BaseBean { + + @Column(name="PACKAGE_NO") + @ApiParam("包装编号") + public String packageNo; + + @Column(name="PACKAGE_TYPE_ID") + @ApiParam(value = "包装类型", example = "1") + public Integer packTypeId; + + @Column(name="PARENT_PACKAGE_NO") + @ApiParam("上级包装编号") + public String parentPackageNo; + + @Column(name="SN") + @ApiParam("条码") + public String sn; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java new file mode 100644 index 0000000..3660e9a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -0,0 +1,109 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-07 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "WMS_PART") +@Api("物料表") +public class WmsPart extends BaseBean { + @Column(name="PART_NO") + @ApiParam(value ="物料编码") + private String partNo; + + @Column(name="PART_NAME") + @ApiParam(value ="物料名称") + private String partName; + + @Column(name="PART_SPEC") + @ApiParam(value ="物料规格") + private String partSpec; + + @Column(name="PART_TYPE") + @ApiParam(value ="物料类型") + private String partType; + + @Column(name="PART_TYPE_DESC") + @ApiParam(value ="物料类型描述") + private String partTypeDesc; + + @Column(name="GRAPHI_NO") + @ApiParam(value ="图号") + private String graphiNo; + + @Column(name="VERSION") + @ApiParam(value ="版本") + private String version; + + @Column(name="COLOR") + @ApiParam(value ="颜色") + private String color; + + @Column(name="STOCK_UNIT") + @ApiParam(value ="库存单位") + private String stockUnit; + + @Column(name="ABC") + @ApiParam(value ="分类") + private String ABC; + + @Column(name="BUY_UNIT") + @ApiParam(value ="采购单位") + private String buyUnit; + + @Column(name="BU2SU") + @ApiParam(value ="换算率1",example = "1") + private Double bu2su; + + @Column(name="PRICE_UNIT") + @ApiParam(value ="计价单位") + private String priceUnit; + + @Column(name="PU2SU") + @ApiParam(value ="换算率2",example = "1") + private Double pu2su; + + @Column(name="SNP") + @ApiParam(value ="标准包装",example = "1") + private Double snp; + + @Column(name="IQC") + @ApiParam(value ="收货检验否",example = "1") + private Integer iqc; + + @Column(name="MIN") + @ApiParam(value ="最低库存",example = "1") + private Double min; + + @Column(name="MAX") + @ApiParam(value ="最高库存",example = "1") + private Double max; + + @Column(name="PART_GROUP") + @ApiParam(value ="物料组") + private String partGroup; + + @Column(name="LOT_CHECK_RULE") + @ApiParam(value ="批次校验规则") + private String lotCheckRule; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java new file mode 100644 index 0000000..7b08157 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -0,0 +1,81 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +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_QC_DETAILS") +@Api("质检单明细信息") +public class WmsQCDetails extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name="ITEM") + @ApiParam("行号") + public String item; + + /** + * 状态:N=正常,C=行取消 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "1") + public Integer status; + + @Column(name="REMARK") + @ApiParam("备注") + public String reMark; + + @Column(name="PLAN_QTY") + @ApiParam(value = "应检数量", example = "0") + public Double planQty; + + @Column(name="FACT_QTY") + @ApiParam(value = "实检数量", example = "0") + public Double factQty; + + @Column(name="REJECT_QTY") + @ApiParam(value = "不合格数量", example = "0") + public Double rejectQty; + + @Column(name="QC_USER") + @ApiParam("检验员") + public String qcUser; + + @Column(name="QC_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="检验时间",example = "2000-01-01 01:00:00") + public String qcTime; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java new file mode 100644 index 0000000..755bd06 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -0,0 +1,75 @@ +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_QC_MASTER") +@Api("质检单主表信息") +public class WmsQCMaster extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + /** + * 业务类型:IQC=进料检验,IPQC=在线检验, + * FQC=成品检验,OQC=出货检验 + */ + @Column(name="TYPE") + @ApiParam("业务类型") + public String type; + + /** + * 状态:0=新建,5=待处理,10=已完成,90=已关闭,91=已取消 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "0") + public Integer status; + + @Column(name="REMARK") + @ApiParam("备注") + public String reMark; + + @Column(name="CUSTOMER_NO") + @ApiParam("客户编号") + public String customerNo; + + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + public String vendorNo; + + @Column(name="VERSION") + @ApiParam(value = "版本", example = "1") + public Integer version; + + @Column(name="PO_NO") + @ApiParam("采购单号") + public String poNo; + + @Column(name="ASN_NO") + @ApiParam("ASN单号") + public String asnNo; + + @Column(name="IB_NO") + @ApiParam("入库单号") + public String ibNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java new file mode 100644 index 0000000..8d96924 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -0,0 +1,67 @@ +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_QC_TRANS") +@Api("质检单操作明细信息") +public class WmsQCTrans extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name="ITEM") + @ApiParam("行号") + public String item; + + /** + * 状态:0=创建,10=已处理 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "0") + public Integer status; + + @Column(name="REMARK") + @ApiParam("备注") + public String reMark; + + @Column(name="PASS_QTY") + @ApiParam("合格数量") + public String passQty; + + @Column(name="REJECT_QTY") + @ApiParam("不合格数量") + public String rejectQty; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="SN") + @ApiParam("条码") + public String sn; +} 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/WmsShopping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java new file mode 100644 index 0000000..81072cd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java @@ -0,0 +1,75 @@ +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; + + /** + * 状态:0=新建,10=已处理,20=处理出错 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "0") + public Integer 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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java new file mode 100644 index 0000000..21a9a98 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java @@ -0,0 +1,59 @@ +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_SN_PRINT") +@Api("待打印信息") +public class WmsSnPrint extends BaseBean { + + @Column(name="SRC_TYPE") + @ApiParam("来源单据类型") + public String srcType; + + @Column(name="SRC_NO") + @ApiParam("来源单据编号") + public String srcNo; + + @Column(name="PRINT_CONTEXT") + @ApiParam("打印内容") + public String printContext; + + @Column(name="REMARK") + @ApiParam("备注") + public String reMark; + + /** + * 状态:0=创建,5=待处理,10=已处理 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "0") + public Integer status; + + @Column(name="PRINT_TEMPLET") + @ApiParam("打印模板") + public String printTemplet; + + @Column(name="PRINT_MACHINE") + @ApiParam("打印机") + public String printMachine; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java index bd18537..d11ec7a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiParam; import lombok.Data; import org.hibernate.annotations.DynamicInsert; @@ -14,7 +15,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : 库存表 + * @Description : 库存信息 * @Reference : * @Author : jessica.chen * @CreateDate : 2018-11-02 11:06 @@ -22,35 +23,12 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_STOCK_QUANT") +@Table(name="WMS_STOCK_QUAN") @DynamicInsert @DynamicUpdate -@Api(value="库存表",description = "库存表") +@Api(value="库存信息",description = "库存信息") public class WmsStockQuant extends BaseBean{ - @Column(name="CUST_ID") - @ApiParam(value ="客户编号",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long custId; - - @Column(name="CUST_CODE") - @ApiParam(value ="客户代码") - private String custCode; - - @Column(name="SUPP_ID") - @ApiParam(value ="供应商编号",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long suppId; - - @Column(name="SUPP_CODE") - @ApiParam(value ="供应商代码") - private String suppCode; - - @Column(name="PART_ID") - @ApiParam(value ="零件id", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long partId; - @Column(name="PART_NO") @ApiParam(value ="零件编号") private String partNo; @@ -59,74 +37,27 @@ public class WmsStockQuant extends BaseBean{ @ApiParam(value ="零件名称") private String partNameRdd; - @Column(name="UNIT") - @ApiParam(value ="采购单位") - private String unit; + @Column(name="QTY") + @ApiParam(value = "可用数量", example = "0") + public Double qty; - @Column(name="QIT") - @ApiParam(value ="库存数") - private Double qit; + @Column(name="UNIT") + @ApiParam("单位") + public String unit; - @Column(name="ERP_WAREHOUSE") - @ApiParam(value ="收货库存地") - private String erpWareHouse; + @Column(name="TOTAL_QTY") + @ApiParam(value ="总数量", example = "0") + private Double totalQty; - @Column(name="WH_ID") - @ApiParam(value ="仓库编号",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long whId; + @Column(name="ZONE_NO") + @ApiParam(value ="存储区编号") + private String zoneNo; - @Column(name="WH_CODE") + @Column(name="WH_NO") @ApiParam(value ="仓库代码") - private String whCode; + private String whNo; - @Column(name="LOC_ID") - @ApiParam(value ="库位编号",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long locId; - - @Column(name="LOC_CODE") + @Column(name="LOCATE_NO") @ApiParam(value ="库位代码") - private String locCode; - - public Long getCustId() { - if(custId != null) { - return custId.longValue(); - }else{ - return custId; - } - } - - public Long getSuppId() { - if(suppId != null) { - return suppId.longValue(); - }else{ - return suppId; - } - } - - public Long getPartId() { - if(partId != null) { - return partId.longValue(); - }else{ - return partId; - } - } - - public Long getWhId() { - if(whId != null) { - return whId.longValue(); - }else{ - return whId; - } - } - - public Long getLocId() { - if(locId != null) { - return locId.longValue(); - }else{ - return locId; - } - } - + private String locateNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java new file mode 100644 index 0000000..06bfc76 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -0,0 +1,51 @@ +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_TASK") +@Api("ASN主表信息") +public class WmsTaskInfo extends BaseBean { + + @Column(name="MOVE_NO") + @ApiParam("移动单号") + public String moveNo; + + @Column(name="USER_NO") + @ApiParam("作业人员") + public String userNo; + + @Column(name="OP_TYPE_CODE") + @ApiParam("作业类型") + public String opTypeCode; + + @Column(name="REMARK") + @ApiParam("备注") + public String reMark; + + /** + * 状态:0=创建,5=待处理,10=已处理 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "0") + public Integer status; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java new file mode 100644 index 0000000..bf2a454 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java @@ -0,0 +1,57 @@ +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_TMP_ORDER_LOCK") +@Api("盘点单主表信息") +public class WmsTempOrderLock extends BaseBean { + + /** + * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, + * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, + * MI=移库入库,MO=移库出库,SO=发运 + */ + @Column(name="BIZ_TYPE") + @ApiParam("业务类型") + public String bizType; + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name="USER_NO") + @ApiParam("员工编号") + public String userNo; + + @Column(name="IS_RUNNING") + @ApiParam("操作中") + public String isRunning; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 047ec43..31d956b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -78,7 +78,7 @@ public class WmsTrans extends BaseBean{ @ApiParam(value ="库位代码") private String locCode; - @ApiParam(value ="目标库位id") + @ApiParam(value ="目标库位id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private transient Long targetLocId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java new file mode 100644 index 0000000..ede0bb7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -0,0 +1,89 @@ +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 : 库存交易条码信息 （移库类的交易需要记录2笔交易数据，正负各一笔） + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="WMS_TRANS_QUAN") +@Api("库存交易信息") +public class WmsTransQuan extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name="WH_NO") + @ApiParam("仓库代码") + public String whNo; + + @Column(name="ZONE_NO") + @ApiParam("存储区编号") + public String zoneNo; + + @Column(name="LOCATE_NO") + @ApiParam("库位编号") + public String locateNo; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="SN") + @ApiParam("条码") + public String sn; + + @Column(name="QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + /** + * 质检状态:0=未质检,10=质检中,20=质检合格, + * 30=质检不合格,40=已退货 + */ + @Column(name="QC_STATUS") + @ApiParam(value = "质检状态", example = "1") + public Integer qcStatus; + + /** + * 条码状态:0=创建,10=已收货,20=已质检, + * 30=已入库,40=待出库,50=已出库, + * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 + */ + @Column(name="STATUS") + @ApiParam(value = "条码状态", example = "1") + public Integer status; + + /** + * 处理状态:0=已创建,5=已盘,10=已冻结 + * ,20=已解冻,30=取消冻结 + */ + @Column(name="TRANS_STATUS") + @ApiParam(value = "处理状态", example = "1") + public Integer transStatus; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 8cb4e15..d53d5a3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -62,7 +62,7 @@ public class WmsTransRcd extends BaseBean{ private String transCode; @Column(name="DATASOURCE") - @ApiParam(value ="数据来源") + @ApiParam(value ="数据来源", example = "1") private Integer dataSource; @Column(name="UNIT") @@ -83,7 +83,7 @@ public class WmsTransRcd extends BaseBean{ @JsonSerialize(using = ToStringSerializer.class) private Long groupId; - @ApiParam(value ="库存数") + @ApiParam(value ="库存数", example = "0") private transient Double qit; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java new file mode 100644 index 0000000..c939bee --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.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 : 库存交易条码信息（移库类的交易需要记录2笔交易数据，正负各一笔） + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="WMS_TRANS_SN") +@Api("库存交易条码信息") +public class WmsTransSn extends BaseBean { + + @Column(name="WH_NO") + @ApiParam("仓库代码") + public String whNo; + + @Column(name="ZONE_NO") + @ApiParam("存储区编号") + public String zoneNo; + + @Column(name="LOCATE_NO") + @ApiParam("库位编号") + public String locateNo; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="SN") + @ApiParam("条码") + public String sn; + + @Column(name="PACKAGE_NO") + @ApiParam("容器编号") + public String packageNo; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + @Column(name="TRANS_CODE") + @ApiParam("事务代码") + public String transCode; + + @Column(name="QTY") + @ApiParam(value = "交易数量", example = "0") + public Double qty; + + @Column(name="TRANS_NO") + @ApiParam("事务编号") + public String transNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index b14a8ca..2bd7a11 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -26,12 +26,20 @@ import javax.persistence.Table; @Api(value="交易类型表",description = "交易类型表") public class WmsTransType extends BaseBean{ - @Column(name="TRANS_CODE") - @ApiParam(value ="交易代码") - private String transCode; + @Column(name="TRANS_TYPE_CODE") + @ApiParam(value ="类型编号") + private String transTypeCode; - @Column(name="TRANS_NAME") - @ApiParam(value ="交易名称") - private String transName; + @Column(name="TRANS_TYPE_NAME") + @ApiParam(value ="类型名称") + private String transTypeName; + + @Column(name="SEQ") + @ApiParam(value ="序号", example = "-1") + private Integer seq; + + @Column(name="PROG_CODE") + @ApiParam(value ="处理程序") + private String progCode; } 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/FactoryStoreRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.java deleted file mode 100644 index ce111b5..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.FactoryStore; -import cn.estsh.i3plus.pojo.wms.bean.WareHouse; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @Description : 对象持久层仓用方法控制 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-13 9:47 - * @Modify: - **/ -@Repository -public interface FactoryStoreRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockAreaRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockAreaRepository.java deleted file mode 100644 index 21c260d..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockAreaRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.StockArea; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; - -/** - * @Description : 库区表 - * @Reference : - * @Author : jessica.chen - * @CreateDate : 2018-11-04 12:02 - * @Modify: - **/ -public interface StockAreaRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockLocationRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockLocationRepository.java deleted file mode 100644 index 32832f1..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockLocationRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.StockArea; -import cn.estsh.i3plus.pojo.wms.bean.StockLocation; - -/** - * @Description : 库位表 - * @Reference : - * @Author : jessica.chen - * @CreateDate : 2018-11-04 14:33 - * @Modify: - **/ -public interface StockLocationRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java new file mode 100644 index 0000000..00e94fd --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterRepository.java similarity index 56% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterRepository.java index 62a206c..9644b9f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterRepository.java @@ -1,16 +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.InterfaceDevice; +import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster; import org.springframework.stereotype.Repository; /** * @Description : 对象持久层仓用方法控制 * @Reference : - * @Author : amy - * @CreateDate : 2018-11-01 15:13 + * @Author : silliter.yuan + * @CreateDate : 2018-11-06 9:47 * @Modify: **/ @Repository -public interface InterfaceDeviceRepository extends BaseRepository { +public interface WmsASNMasterRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFGInStockRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFGInStockRepository.java new file mode 100644 index 0000000..057ead5 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java new file mode 100644 index 0000000..04b5b62 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsIbCheckPlan; + +/** + * @Description : 抽点比例表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-07 11:17 + * @Modify: + **/ +public interface WmsIbCheckPlanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLocatePartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLocatePartRepository.java new file mode 100644 index 0000000..ca8ee42 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLocatePartRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsLocatePart; + +/** + * @Description : 库位物料表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-07 11:16 + * @Modify: + **/ +public interface WmsLocatePartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLocateRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLocateRepository.java new file mode 100644 index 0000000..c624d01 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLocateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; + +/** + * @Description : 库位表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-07 11:14 + * @Modify: + **/ +public interface WmsLocateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java new file mode 100644 index 0000000..ef0c9c5 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java new file mode 100644 index 0000000..6ea8bc5 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterDetailsRepository.java new file mode 100644 index 0000000..a12a784 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterRepository.java new file mode 100644 index 0000000..cd937c8 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRepository.java new file mode 100644 index 0000000..426a002 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPart; +import org.springframework.stereotype.Repository; +/** +* @Description : +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-08 10:19 +* @Modify: +**/ +@Repository +public interface WmsPartRepository 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/WmsShoppingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShoppingRepository.java new file mode 100644 index 0000000..e6e6250 --- /dev/null +++ b/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 { +} 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 ba31919..6611fee 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 @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; -import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; import cn.estsh.i3plus.pojo.wms.bean.WareHouse; import cn.estsh.i3plus.pojo.wms.bean.WmsTrans; import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; @@ -18,6 +17,55 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; public class WmsHqlPack { /** + * 抽点比例信息 分页查询 + * @param wmsIbCheckPlan + * @return + */ + public static String packHqlWmsIbCheckPlan(WmsIbCheckPlan wmsIbCheckPlan) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); + + return result.toString(); + } + + /** + * 库位物料信息 分页查询 + * @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 @@ -47,18 +95,6 @@ public class WmsHqlPack { } /** - * 接口驱动类信息 分页查询 - * @return - */ - public static String packHqlInterfaceDevice(InterfaceDevice interfaceDevice){ - StringBuffer sb = new StringBuffer(); - //驱动类名称 - HqlPack.getStringEqualPack(interfaceDevice.getDeviceClassName(),"deviceClassName",sb); - - return null; - } - - /** * 元数据信息 分页查询 * @param wmsObject * @return @@ -102,8 +138,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getNumEqualPack(wmsTransType.getIsValid(),"isValid",result); - HqlPack.getStringLikerPack(wmsTransType.getTransCode(),"transCode",result); - HqlPack.getStringLikerPack(wmsTransType.getTransName(),"transName",result); + HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(),"transTypeCode",result); + HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(),"transTypeName",result); return result.toString(); } @@ -214,4 +250,52 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(),"opTypeName",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(); + } }