From 83c4347a8a9cd863b0abe04c3091b845ed6abcad Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 8 Nov 2018 21:28:24 +0800 Subject: [PATCH 1/9] back --- .../i3plus/pojo/wms/bean/WmsRoutingAssign.java | 52 ++++++ .../i3plus/pojo/wms/bean/WmsRoutingDetail.java | 52 ++++++ .../i3plus/pojo/wms/bean/WmsRoutingMaster.java | 39 +++++ .../wms/repository/WmsRoutingAssignRepository.java | 16 ++ .../wms/repository/WmsRoutingDetailRepository.java | 16 ++ .../wms/repository/WmsRoutingMasterRepository.java | 16 ++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 174 ++++++++++++++------- 7 files changed, 312 insertions(+), 53 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingAssignRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingDetailRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingMasterRepository.java 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..6818110 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 @@ -12,6 +12,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 +71,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 +98,7 @@ public class WmsHqlPack { /** * 库位物料信息 分页查询 + * * @param wmsLocatePart * @return */ @@ -61,6 +115,7 @@ public class WmsHqlPack { /** * 库位信息 分页查询 + * * @param wmsLocate * @return */ @@ -68,17 +123,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 +142,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 +153,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 +208,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 +225,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 +243,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 +262,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 +301,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 +316,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(); } } From 021b4767cd23915426c71685772593853fff9a7e Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 9 Nov 2018 00:23:57 +0800 Subject: [PATCH 2/9] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) 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 6818110..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 : 仓库管理对象封装 @@ -109,6 +110,7 @@ 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(); } From a1f496f8fb8f3c86b2930e3d5bb819cc0a412b9e Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 9 Nov 2018 09:32:33 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=BB=98=E8=AE=A4=E5=80=BC=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 6 +++--- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index 925456c..1f58476 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -50,7 +50,7 @@ public class BasVendor extends BaseBean{ @ApiParam("邮箱") private String vendorEmail; - @Column(name="IS_ASN") - @ApiParam("是否发ASN") + @Column(name = "IS_ASN") + @ApiParam(value = "是否发ASN", example = "0") private Integer isAsn; -} +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index f3074ad..b4218a9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -34,8 +34,8 @@ public class WmsOpType extends BaseBean{ @ApiParam("类型名称") private String opTypeName; - @Column(name="SEQ") - @ApiParam("序号") + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "0") private Integer seq; @Column(name="PROG_CODE") From 7b54382c1a15b8507967cf4476bd31a91054c2c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 9 Nov 2018 11:46:47 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 f0c38ba..541fbd1 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 @@ -333,6 +333,8 @@ public class WmsHqlPack { */ public static String packHqlWmsZones(WmsZones wmsZones) { StringBuffer result = new StringBuffer(); + //有效性 + HqlPack.getNumEqualPack(wmsZones.getIsValid(), "isValid", result); //仓库代码 HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result); //库存地代码 @@ -350,6 +352,8 @@ public class WmsHqlPack { */ public static String packHqlBasCustomer(BasCustomer basCustomer) { StringBuffer result = new StringBuffer(); + //有效性 + HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result); //客户编号 HqlPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result); //客户简称 @@ -367,6 +371,8 @@ public class WmsHqlPack { */ public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { StringBuffer result = new StringBuffer(); + //有效性 + HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result); //供应商编号 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result); //供应商简称 From d73f134579d1f939fd02b6af5d8c466c865b62a8 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 9 Nov 2018 17:19:59 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 f0c38ba..cdcd8bb 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 @@ -281,7 +281,9 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); - HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(), "seq", result); + if(wmsOpType.getSeq()!= null){ + HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(), "seq", result); + } HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result); HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result); return result.toString(); From 716ed008748a89c63bbe2de69a266bed9d3d5cd3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 9 Nov 2018 17:41:50 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) 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 541fbd1..ee134c5 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 @@ -27,6 +27,7 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsRoutingDetail.getSeq(), "seq", result); HqlPack.getNumEqualPack(wmsRoutingDetail.getParentSeq(), "parentSeq", result); HqlPack.timeBuilder(wmsRoutingDetail.getCreateDateTimeStart(), wmsRoutingDetail.getCreateDateTimeEnd(), "createDatetime", result, true); + HqlPack.getNumEqualPack(wmsRoutingDetail.getIsValid(), "isValid", result); return result.toString(); } @@ -60,6 +61,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); HqlPack.getNumEqualPack(wmsRoutingMaster.getSeq(), "seq", result); HqlPack.timeBuilder(wmsRoutingMaster.getCreateDateTimeStart(), wmsRoutingMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result); return result.toString(); } From 5f0f6402a581c9284cf3a7bc9953562f38a9da60 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 9 Nov 2018 18:58:59 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0hql=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) 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 f0c38ba..af1a12a 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 @@ -93,6 +93,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); + HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result); return result.toString(); } @@ -130,6 +131,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsLocate.getLocateType(), "locateType", result); HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); + HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result); return result.toString(); } From 6ebc052d76a6765cbe54de227a8c5060c95c0372 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Mon, 12 Nov 2018 09:14:44 +0800 Subject: [PATCH 8/9] pojo --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 541fbd1..dc635f7 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,7 +2,6 @@ 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 : 仓库管理对象封装 @@ -360,6 +359,12 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); //客户全称 HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); + //客户地址 + HqlPack.getStringLikerPack(basCustomer.getCustAddr(), "custAddr", result); + //聯係人 + HqlPack.getStringLikerPack(basCustomer.getCustOwner(), "custOwner", result); + //電話號碼 + HqlPack.getStringLikerPack(basCustomer.getCustTel(), "custTel", result); return result.toString(); } From 375ba45b9838810034c539ee26f2fea10e6b2541 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Mon, 12 Nov 2018 15:58:00 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 ------ 1 file changed, 6 deletions(-) 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 a806b32..3e45e2b 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 @@ -361,12 +361,6 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result); //客户编号 HqlPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result); - //客户简称 - HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); - //客户全称 - HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); - //客户地址 - HqlPack.getStringLikerPack(basCustomer.getCustAddr(), "custAddr", result); //聯係人 HqlPack.getStringLikerPack(basCustomer.getCustOwner(), "custOwner", result); //電話號碼