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 129cfe3..e13e761 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 @@ -72,26 +72,6 @@ public interface BaseRepository extends JpaReposito public int deleteByProperties(String[] propNames, Object[] objValues); /** - * 弱删除 - * @return count - */ - 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); - - /** - * 更新有效无效状态 - * @return count - */ - 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); - - /** * 通过多单属性进行单个值更新 * @param conditionName * @param conditionValue @@ -235,4 +215,26 @@ public interface BaseRepository extends JpaReposito public List findBySqlObjList(String sql); public List findBySqlObjListByPager(String sql,Pager pager); + + /****************** 部分业务处理 *******************/ + + /** + * 弱删除 + * @return count + */ + public int deleteWeaklyById(ID id,String username); + public int deleteWeaklyByIds(Long[] ids,String username) ; + public int deleteWeaklyByProperty(String propName, Object propValue,String username); + public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username); + public int deleteWeaklyByProperties(String[] propNames, Object[] objValues,String username); + + /** + * 更新有效无效状态 + * @return count + */ + public int updateValidStatusById(ID id,int status,String username); + public int updateValidStatusByIds(Long[] ids,int status,String username) ; + public int updateValidStatusByProperty(String propName, Object propValue,int status,String username); + public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status,String username); + public int updateValidStatusByProperties(String[] propNames, Object[] objValues,int status,String username); } 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 bd7ab88..022ca3f 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 @@ -12,6 +12,8 @@ import com.mongodb.client.model.Sorts; import org.apache.commons.lang3.StringUtils; import org.bson.Document; import org.bson.conversions.Bson; +import org.bson.json.JsonMode; +import org.bson.json.JsonWriterSettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.mapping.context.MappingContext; @@ -20,6 +22,7 @@ import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity; import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty; import org.springframework.data.mongodb.repository.query.MongoEntityInformation; import org.springframework.data.mongodb.repository.support.SimpleMongoRepository; +import springfox.documentation.spring.web.json.Json; import javax.persistence.Id; import java.io.Serializable; @@ -47,6 +50,7 @@ public class BaseMongoRepositoryImpl extends SimpleM private final MongoEntityInformation entityInformation; private final MappingContext, MongoPersistentProperty> mongoContext; private final Class entityClass; + private SnowflakeIdMaker snowflakeIdMaker; public BaseMongoRepositoryImpl(MongoEntityInformation metadata, MongoOperations mongoOperations) { super(metadata, mongoOperations); @@ -54,6 +58,7 @@ public class BaseMongoRepositoryImpl extends SimpleM this.mongoOperations = mongoOperations; this.entityClass = this.entityInformation.getJavaType(); mongoContext = mongoOperations.getConverter().getMappingContext(); + snowflakeIdMaker = new SnowflakeIdMaker(); } /** @@ -99,7 +104,7 @@ public class BaseMongoRepositoryImpl extends SimpleM Object val = idField.get(item); if((type == long.class || type == Long.class) && (val == null || Long.parseLong(val.toString()) == 0)){ // long类型主键，以snowflake为主键 - idField.set(item, new SnowflakeIdMaker().nextId()); + idField.set(item, snowflakeIdMaker.nextId()); } else if(type == String.class && (val==null || "".equals(val))){ // String类型主键，以UUID为主键 idField.set(item, UUID.randomUUID().toString().replace("-", "").toLowerCase()); @@ -222,8 +227,10 @@ public class BaseMongoRepositoryImpl extends SimpleM private List packObjectListFromDocument(List dList) { //将获取的document转为对象 List resultList = new ArrayList<>(); + // 设置为宽松模式 + JsonWriterSettings jsonWriterSettings = JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).build(); for(Document d : dList){ - resultList.add(JSONObject.parseObject(d.toJson(), entityClass)); + resultList.add(JSONObject.parseObject(d.toJson(jsonWriterSettings), entityClass)); } return resultList; 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 0466c15..01e6c9d 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 @@ -2,7 +2,6 @@ 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; @@ -14,6 +13,7 @@ import javax.persistence.Id; import javax.persistence.Query; import java.io.Serializable; import java.lang.reflect.Field; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -33,11 +33,13 @@ public class BaseRepositoryImpl extends SimpleJpaRep private final EntityManager entityManager; private Class persistentClass; + private SnowflakeIdMaker snowflakeIdMaker; public BaseRepositoryImpl(Class clz, EntityManager em) { super(clz, em); this.entityManager = em; this.persistentClass = clz; + this.snowflakeIdMaker = new SnowflakeIdMaker(); } private void setParameter(Query query, String[] propName, Object[] propValue) { @@ -146,7 +148,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep return query.executeUpdate(); }else{ - throw new IllegalArgumentException("Method deleteByProperties argument is illegal!propName:" + propName + ",propValue:" + propValue); + throw new IllegalArgumentException("删除错误!propName:" + propName + ",propValue:" + propValue); } } @@ -169,112 +171,6 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public int deleteWeaklyById(ID id) { - return deleteWeaklyByProperty("id", id); - } - - @Override - public int deleteWeaklyByIds(Long[] ids) { - return deleteWeaklyByPropertyIn("id", ids); - } - - @Override - public int deleteWeaklyByProperty(String propName, Object propValue) { - return deleteWeaklyByProperties(new String[] { propName }, new Object[] { propValue }); - } - - /** - * 批量弱删除 - * @return - */ - @Override - public int deleteWeaklyByPropertyIn(String propName, Object[] propValues) { - if(propValues != null && propValues.length > 0){ - String hql = "update " + persistentClass.getName() + " model set model.isValid = :isValid where model."+propName+" in(:"+propName+") "; - Query query = entityManager.createQuery(hql); - query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); - query.setParameter(propName, Arrays.asList(propValues)); - - return query.executeUpdate(); - }else{ - throw new IllegalArgumentException("弱删除失败："+propName+":" + propValues); - } - } - - /** - * 批量弱删除 - * @return - */ - @Override - public int deleteWeaklyByProperties(String[] propName, Object[] propValue) { - if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { - StringBuffer sb = new StringBuffer("update " + persistentClass.getName() + " model set model.isValid = :isValid where 1=1 "); - appendQL(sb,propName,propValue); - Query query = entityManager.createQuery(sb.toString()); - query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); - - setParameter(query,propName,propValue); - - 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); - } - } - - @Override public int updateByProperties(String conditionName, Object conditionValue, String propertyName, Object propertyValue) { return updateByProperties(new String[] { conditionName }, new Object[] { conditionValue }, new String[] { propertyName }, new Object[] { propertyValue }); } @@ -312,7 +208,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep setParameter(query, conditionName, conditionValue); return query.executeUpdate(); } else { - throw new IllegalArgumentException("Method updateByProperties argument is illegal!conditionName:" + conditionName + throw new IllegalArgumentException("参数值错误!conditionName:" + conditionName + ",conditionValue:" + conditionValue + ",propertyName:" + propertyName + ",propertyValue:" + propertyValue); } } @@ -343,7 +239,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep return query.executeUpdate(); } else { - throw new IllegalArgumentException("Method updateByProperties argument is illegal! propertyName:" + propertyName + ",propertyValue:" + propertyValue); + throw new IllegalArgumentException("参数值错误! propertyName:" + propertyName + ",propertyValue:" + propertyValue); } } @@ -925,7 +821,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep Object val = idField.get(item); if((type == long.class || type == Long.class) && (val == null || Long.parseLong(val.toString()) == 0)){ // long类型主键，以snowflake为主键 - idField.set(item, new SnowflakeIdMaker().nextId()); + idField.set(item, snowflakeIdMaker.nextId()); } else if(type == String.class && (val==null || "".equals(val))){ // String类型主键，以UUID为主键 idField.set(item, UUID.randomUUID().toString().replace("-", "").toLowerCase()); @@ -944,4 +840,140 @@ public class BaseRepositoryImpl extends SimpleJpaRep throw new RuntimeException(e); } } + + /************** 部分业务 *************/ + private String getNowTime(boolean needSecond) { + return needSecond ? getNowTime("yyyy-MM-dd HH:mm:ss") : getNowTime("yyyy-MM-dd HH:mm"); + } + + private String getNowTime(String format) { + String dateTime; + try { + dateTime = (new SimpleDateFormat(format)).format(new Date()); + } catch (Exception e) { + dateTime = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date()); + } + + return dateTime; + } + + @Override + public int deleteWeaklyById(ID id,String username) { + return deleteWeaklyByProperty("id", id,username); + } + + @Override + public int deleteWeaklyByIds(Long[] ids,String username) { + return deleteWeaklyByPropertyIn("id", ids,username); + } + + @Override + public int deleteWeaklyByProperty(String propName, Object propValue,String username) { + return deleteWeaklyByProperties(new String[] { propName }, new Object[] { propValue },username); + } + + /** + * 批量弱删除 + * @return + */ + @Override + public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username) { + if(propValues != null && propValues.length > 0){ + String hql = "update " + persistentClass.getName() + + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where model." + + propName + " in(:"+propName+") "; + Query query = entityManager.createQuery(hql); + query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + query.setParameter("modifyUser",username); + query.setParameter("modifyDatetime",getNowTime(true)); + query.setParameter(propName, Arrays.asList(propValues)); + + return query.executeUpdate(); + }else{ + throw new IllegalArgumentException("弱删除失败："+propName+":" + propValues); + } + } + + /** + * 批量弱删除 + * @return + */ + @Override + public int deleteWeaklyByProperties(String[] propName, Object[] propValue,String username) { + if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { + StringBuffer sb = new StringBuffer("update " + persistentClass.getName() + + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 "); + appendQL(sb,propName,propValue); + Query query = entityManager.createQuery(sb.toString()); + query.setParameter("modifyUser",username); + query.setParameter("modifyDatetime",getNowTime(true)); + query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + + setParameter(query,propName,propValue); + + return query.executeUpdate(); + }else{ + throw new IllegalArgumentException("弱删除失败："+propName+":" + propValue); + } + } + + @Override + public int updateValidStatusById(ID id,int status,String username) { + return updateValidStatusByProperty("id", id,status,username); + } + + @Override + public int updateValidStatusByIds(Long[] ids,int status,String username) { + return updateValidStatusByPropertyIn("id", ids,status,username); + } + + @Override + public int updateValidStatusByProperty(String propName, Object propValue,int status,String username) { + return updateValidStatusByProperties(new String[] { propName }, new Object[] { propValue },status,username); + } + + /** + * 批量弱删除 + * @return + */ + @Override + public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status,String username) { + if(propValues != null && propValues.length > 0){ + String hql = "update " + persistentClass.getName() + + " model set model.isValid = :isValid ,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where model." + + propName + " in(:"+propName+") "; + Query query = entityManager.createQuery(hql); + query.setParameter("modifyUser",username); + query.setParameter("modifyDatetime",getNowTime(true)); + 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,String username) { + if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { + StringBuffer sb = new StringBuffer("update " + persistentClass.getName() + + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 "); + appendQL(sb,propName,propValue); + Query query = entityManager.createQuery(sb.toString()); + query.setParameter("modifyUser",username); + query.setParameter("modifyDatetime",getNowTime(true)); + query.setParameter("isValid",status); + + setParameter(query,propName,propValue); + + return query.executeUpdate(); + }else{ + throw new IllegalArgumentException("修改状态失败："+propName+":" + propValue); + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysException.java new file mode 100644 index 0000000..5bf5e4d --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysException.java @@ -0,0 +1,45 @@ +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; +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 : Frin + * @Date : 2018-11-8 12:30:00 + * @Modify : + **/ +@Data +@Entity +@Table(name="SYS_EXCEPTION") +@DynamicInsert +@DynamicUpdate +@Api(value="系统异常表",description = "记录系统出现的异常") +public class SysException extends BaseBean { + + @Column(name="EXC_MODULE_ID") + @ApiParam(value ="系统模块（枚举）", example = "1") + //CommonEnumUtil.SOFT_TYPE + private Integer excModuleId; + + @Column(name="EXC_CLASS_NAME") + @ApiParam(value ="异常类名") + private String excClassName; + + @Column(name="EXC_MESSAGE") + @ApiParam(value ="异常信息") + private String excMessage; + + @Column(name="EXC_STACK") + @ApiParam(value ="堆栈信息") + private String excStack; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysExceptionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysExceptionRepository.java new file mode 100644 index 0000000..05697c4 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysExceptionRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repositorymongo; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysException; + +/** + * @Description : 异常记录表(使用Mongodb) + * @Reference : + * @Author : frin + * @Date : 2018-11-8 12:03:00 + * @Modify : + **/ +public interface SysExceptionRepository extends BaseMongoRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java new file mode 100644 index 0000000..de8e4d5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.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 : dragon.xu + * @CreateDate : 2018-11-08 17:54 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "WMS_ROUTING_ASSIGN") +@Api("物流路线分配表") +public class WmsRoutingAssign extends BaseBean { + + @Column(name = "WH_NO") + @ApiParam(value = "仓库代码") + private String whNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区编号") + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位编号") + private String locateNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + private String vendorNo; + + @Column(name = "ROUTING_CODE") + @ApiParam(value = "路线编码") + private String routingCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java new file mode 100644 index 0000000..3dfcd2c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.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 : dragon.xu + * @CreateDate : 2018-11-08 17:54 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "WMS_ROUTING_DETAIL") +@Api("物流路线明细表") +public class WmsRoutingDetail extends BaseBean { + @Column(name = "ROUTING_CODE") + @ApiParam(value = "路线编码") + private String routingCode; + + @Column(name = "OP_STEP") + @ApiParam(value = "作业步骤") + private String opStep; + + @Column(name = "OK_SEQ") + @ApiParam(value = "成功跳转序号", example = "1") + private Integer okSeq; + + @Column(name = "NG_SEQ") + @ApiParam(value = "失败跳转序号", example = "1") + private Integer ngSeq; + + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "1") + private Integer seq; + + @Column(name = "PARENT_SEQ") + @ApiParam(value = "上级步骤序号", example = "1") + private Integer parentSeq; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java new file mode 100644 index 0000000..b3425cd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java @@ -0,0 +1,39 @@ +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 : dragon.xu + * @CreateDate : 2018-11-08 17:54 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "WMS_ROUTING_MASTER") +@Api("物流路线主表") +public class WmsRoutingMaster extends BaseBean { + @Column(name = "ROUTING_CODE") + @ApiParam(value = "路线编码") + private String routingCode; + + @Column(name = "ROUTING_NAME") + @ApiParam(value = "路线名称") + private String routingName; + + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "1") + private Integer seq; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingAssignRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingAssignRepository.java new file mode 100644 index 0000000..b024922 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingAssignRepository.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.WmsRoutingAssign; +import org.springframework.stereotype.Repository; + +/** + * @Description :物流路线分配Repository + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-08 10:19 + * @Modify: + **/ +@Repository +public interface WmsRoutingAssignRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingDetailRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingDetailRepository.java new file mode 100644 index 0000000..1d64e06 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingDetailRepository.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.WmsRoutingDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description :物流路线明细Repository的方法接口 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-08 10:19 + * @Modify: + **/ +@Repository +public interface WmsRoutingDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingMasterRepository.java new file mode 100644 index 0000000..d758bdc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingMasterRepository.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.WmsRoutingMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description :物流路线主表Repository的方法接口 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-08 10:19 + * @Modify: + **/ +@Repository +public interface WmsRoutingMasterRepository 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 7abca1a..f0c38ba 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; +import org.apache.commons.lang3.StringUtils; /** * @Description : 仓库管理对象封装 @@ -12,6 +13,57 @@ import cn.estsh.i3plus.pojo.wms.bean.*; **/ public class WmsHqlPack { /** + * 物流路线明细查询条件封装 + * + * @param wmsRoutingDetail + * @return + */ + public static String packHqlWmsRoutingDetail(WmsRoutingDetail wmsRoutingDetail) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsRoutingDetail.getRoutingCode(), "routingCode", result); + HqlPack.getStringLikerPack(wmsRoutingDetail.getOpStep(), "opStep", result); + HqlPack.getNumEqualPack(wmsRoutingDetail.getOkSeq(), "okSeq", result); + HqlPack.getNumEqualPack(wmsRoutingDetail.getNgSeq(), "ngSeq", result); + HqlPack.getNumEqualPack(wmsRoutingDetail.getSeq(), "seq", result); + HqlPack.getNumEqualPack(wmsRoutingDetail.getParentSeq(), "parentSeq", result); + HqlPack.timeBuilder(wmsRoutingDetail.getCreateDateTimeStart(), wmsRoutingDetail.getCreateDateTimeEnd(), "createDatetime", result, true); + return result.toString(); + } + + /** + * 物流路线分配查询条件封装 + * + * @param wmsRoutingAssign + * @return + */ + public static String packHqlWmsRoutingAssign(WmsRoutingAssign wmsRoutingAssign) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsRoutingAssign.getWhNo(), "whNo", result); + HqlPack.getStringLikerPack(wmsRoutingAssign.getZoneNo(), "zoneNo", result); + HqlPack.getStringLikerPack(wmsRoutingAssign.getLocateNo(), "locateNo", result); + HqlPack.getStringLikerPack(wmsRoutingAssign.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsRoutingAssign.getVendorNo(), "vendorNo", result); + HqlPack.getStringLikerPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result); + HqlPack.timeBuilder(wmsRoutingAssign.getCreateDateTimeStart(), wmsRoutingAssign.getCreateDateTimeEnd(), "createDatetime", result, true); + return result.toString(); + } + + /** + * 物流路线主表查询条件封装 + * + * @param wmsRoutingMaster + * @return + */ + public static String packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); + HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); + HqlPack.getNumEqualPack(wmsRoutingMaster.getSeq(), "seq", result); + HqlPack.timeBuilder(wmsRoutingMaster.getCreateDateTimeStart(), wmsRoutingMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + return result.toString(); + } + + /** * 物料查询条件封装 * * @param wmsPart @@ -20,16 +72,18 @@ public class WmsHqlPack { public static String packHqlWmsPart(WmsPart wmsPart) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); - HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDateTime", result, true); + HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDatetime", result, true); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); - HqlPack.getStringLikerPack(wmsPart.getAbc(), "ABC", result); + HqlPack.getStringLikerPack(wmsPart.getAbc(), "abc", result); HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result); HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result); return result.toString(); } + /** * 抽点比例信息 分页查询 + * * @param wmsIbCheckPlan * @return */ @@ -45,6 +99,7 @@ public class WmsHqlPack { /** * 库位物料信息 分页查询 + * * @param wmsLocatePart * @return */ @@ -55,12 +110,14 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result); + HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result); return result.toString(); } /** * 库位信息 分页查询 + * * @param wmsLocate * @return */ @@ -68,17 +125,18 @@ public class WmsHqlPack { 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); + 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 */ @@ -86,9 +144,9 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); // 部门名称 - HqlPack.getStringLikerPack(wareHouse.getCode(),"code", result); + HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); // 部门代码 - HqlPack.getStringLikerPack(wareHouse.getName(),"name", result); + HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); return result.toString(); } @@ -97,51 +155,54 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); // 功能名称（name） - HqlPack.getStringLikerPack(wmsButton.getName(),"name", result); + HqlPack.getStringLikerPack(wmsButton.getName(), "name", result); // 前端实现（ui） - HqlPack.getStringLikerPack(wmsButton.getUi(),"ui", result); + HqlPack.getStringLikerPack(wmsButton.getUi(), "ui", result); // URI权限规则（bs） - HqlPack.getStringLikerPack(wmsButton.getBs(),"bs", result); + HqlPack.getStringLikerPack(wmsButton.getBs(), "bs", result); return result.toString(); } /** * 元数据信息 分页查询 + * * @param wmsObject * @return */ - public static String packHqlWmsObject(WmsObject wmsObject){ + public static String packHqlWmsObject(WmsObject wmsObject) { StringBuffer result = new StringBuffer(); // 编码 - HqlPack.getStringLikerPack(wmsObject.getCode(),"code",result); - // 名称 - HqlPack.getStringEqualPack(wmsObject.getName(),"name",result); + HqlPack.getStringLikerPack(wmsObject.getCode(), "code", result); + // 名称 + HqlPack.getStringEqualPack(wmsObject.getName(), "name", result); // 数据主表 - HqlPack.getStringEqualPack(wmsObject.getTableName(),"tableName",result); + HqlPack.getStringEqualPack(wmsObject.getTableName(), "tableName", result); // 自定义业务拦截 - HqlPack.getStringEqualPack(wmsObject.getBizIntercept(),"bizIntercept",result); + HqlPack.getStringEqualPack(wmsObject.getBizIntercept(), "bizIntercept", result); return result.toString(); } /** * 元数据字段分页查询 + * * @param wmsField * @return */ - public static String packHqlWmsField(WmsField wmsField){ + public static String packHqlWmsField(WmsField wmsField) { StringBuffer result = new StringBuffer(); // 编码 - HqlPack.getStringLikerPack(wmsField.getObjectCode(),"objectCode",result); - HqlPack.getStringLikerPack(wmsField.getTableName(),"tableName",result); + HqlPack.getStringLikerPack(wmsField.getObjectCode(), "objectCode", result); + HqlPack.getStringLikerPack(wmsField.getTableName(), "tableName", result); return result.toString(); } /** * 交易类型信息 分页查询 + * * @param wmsTransType * @return */ @@ -149,15 +210,16 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getNumEqualPack(wmsTransType.getIsValid(),"isValid",result); - HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(),"transTypeCode",result); - HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(),"transTypeName",result); + HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result); + HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); return result.toString(); } /** * 库存交易记录信息 分页查询 + * * @param wmsTrans * @return */ @@ -165,15 +227,16 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringEqualPack(wmsTrans.getTransCode(),"transCode",result); - HqlPack.getStringEqualPack(wmsTrans.getSn(),"sn",result); - HqlPack.timeBuilder(wmsTrans.getCreateDatetime(),null,"createDatetime",result,true); + HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result); + HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result); + HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true); return result.toString(); } /** * 仓库分页查询条件 + * * @param wareHouse * @return */ @@ -182,16 +245,17 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); - HqlPack.getNumEqualPack(wareHouse.getIsValid(),"isValid",result); + HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result); return result.toString(); } /** * 供应商分页查询 + * * @param basVendor * @return */ - public static String packHqlBasVendor(BasVendor basVendor){ + public static String packHqlBasVendor(BasVendor basVendor) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result); @@ -200,34 +264,36 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); - if(basVendor.getIsAsn()!= null){ + if (basVendor.getIsAsn() != null) { HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result); } - HqlPack.getNumEqualPack(basVendor.getIsValid(),"isValid",result); + HqlPack.getNumEqualPack(basVendor.getIsValid(), "isValid", result); return result.toString(); } /** * 作业类型分页查询 + * * @param wmsOpType * @return */ - public static String packHqlWmsOpType(WmsOpType wmsOpType){ + public static String packHqlWmsOpType(WmsOpType wmsOpType) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(),"opTypeName",result); - HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(),"seq",result); - HqlPack.getStringLikerPack(wmsOpType.getProCode(),"proCode",result); - HqlPack.getNumEqualPack(wmsOpType.getIsValid(),"isValid",result); + HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); + HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(), "seq", result); + HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result); + HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result); return result.toString(); } /** * 仓库唯一性校验查询条件【用于添加和修改】 + * * @param wareHouse * @return */ - public static String packHqlWareHouseUnique(WareHouse wareHouse){ + public static String packHqlWareHouseUnique(WareHouse wareHouse) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); @@ -237,12 +303,13 @@ public class WmsHqlPack { /** * 供应商唯一性校验查询条件【用于添加和修改】 + * * @param basVendor * @return */ - public static String packHqlBasVendorUnique(BasVendor basVendor){ + public static String packHqlBasVendorUnique(BasVendor basVendor) { StringBuffer result = new StringBuffer(); - if(basVendor.getId()!=null){ + if (basVendor.getId() != null) { HqlPack.getNumNOEqualPack(basVendor.getId(), "id", result); } HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); @@ -251,58 +318,61 @@ public class WmsHqlPack { return result.toString(); } - public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType){ + public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(),"opTypeName",result); + 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.getWhNo(), "whNo", result); //库存地代码 - HqlPack.getStringLikerPack(wmsZones.getAreaNo(),"areaNo",result); + HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 - HqlPack.getStringLikerPack(wmsZones.getZoneNo(),"zoneNo",result); + HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); return result.toString(); } /** * 客户信息 查询条件封装 + * * @param basCustomer * @return */ - public static String packHqlBasCustomer(BasCustomer basCustomer){ + public static String packHqlBasCustomer(BasCustomer basCustomer) { StringBuffer result = new StringBuffer(); //客户编号 - HqlPack.getStringLikerPack(basCustomer.getCustNo(),"custNo",result); + HqlPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result); //客户简称 - HqlPack.getStringLikerPack(basCustomer.getCustName(),"custName",result); + HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); //客户全称 - HqlPack.getStringLikerPack(basCustomer.getCustDesc(),"custDesc",result); + HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); return result.toString(); } /** * 客户发往地信息 查询条件封装 + * * @param wmsShippingFlag * @return */ - public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag){ + public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { StringBuffer result = new StringBuffer(); //供应商编号 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(),"flagNo",result); + HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result); //供应商简称 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(),"flagName",result); - //供应商全称 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(),"flagDesc",result); + HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); + //供应商全称 + HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); return result.toString(); } }