From 8f2301825bc2ae75923753135910dd292b099937 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Wed, 7 Nov 2018 14:20:27 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=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 | 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 1876110..9d2581e 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 @@ -134,7 +134,12 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); - HqlPack.getStringEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()+"","isValid",result); + // 默认有效 + if(wareHouse.getIsValid()==null){ + HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",result); + }else{ + HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.INVAILD.getValue()+"","isValid",result); + } return result.toString(); } } From 0f7af655aada1ba40862c9898181612501bf2403 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 8 Nov 2018 10:49:54 +0800 Subject: [PATCH 2/8] =?UTF-8?q?wms=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 45 ++++++++++++++++++++++ 1 file changed, 45 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 9d2581e..e350323 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 @@ -142,4 +142,49 @@ public class WmsHqlPack { } return result.toString(); } + + /** + * 供应商分页查询 + * @param basVendor + * @return + */ + public static String packHqlBasVendor(BasVendor basVendor){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result); + HqlPack.getStringLikerPack(basVendor.getVendorName(), "vendorName", result); + HqlPack.getStringLikerPack(basVendor.getVendorOwner(), "vendorOwner", result); + HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); + HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); + HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); + HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result); + + // 默认有效 + if(basVendor.getIsValid()==null){ + HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",result); + }else{ + HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.INVAILD.getValue()+"","isValid",result); + } + return result.toString(); + } + + /** + * 作业类型分页查询 + * @param wmsOpType + * @return + */ + 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); + // 默认有效 + if(wmsOpType.getIsValid()==null){ + HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",result); + }else{ + HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.INVAILD.getValue()+"","isValid",result); + } + return result.toString(); + } } From e0737797eb7fd0745794354fc225570a36f59ab5 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 8 Nov 2018 11:58:17 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=8A=BD=E7=82=B9?= =?UTF-8?q?=E6=AF=94=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 +++++++++++++++ 1 file changed, 15 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 a8d6185..41abb7f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -17,6 +17,21 @@ 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 From 2b1bf288e1758949dbaaa3f87a700351ac111074 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 8 Nov 2018 15:16:11 +0800 Subject: [PATCH 4/8] Part --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 6 +- .../pojo/wms/repository/WmsPartRepository.java | 2 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 107 +++++++++++++-------- 3 files changed, 72 insertions(+), 43 deletions(-) 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 index 3660e9a..10be89e 100644 --- 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 @@ -1,8 +1,6 @@ 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; @@ -14,7 +12,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : + * @Description :物料实体 * @Reference : * @Author : dragon.xu * @CreateDate : 2018-11-07 16:06 @@ -65,7 +63,7 @@ public class WmsPart extends BaseBean { @Column(name="ABC") @ApiParam(value ="分类") - private String ABC; + private String abc; @Column(name="BUY_UNIT") @ApiParam(value ="采购单位") 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 index 426a002..902159d 100644 --- 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 @@ -4,7 +4,7 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsPart; import org.springframework.stereotype.Repository; /** -* @Description : +* @Description :物料Repository的方法接口 * @Reference : * @Author : dragon.xu * @CreateDate : 2018-11-08 10:19 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 a8d6185..3978a76 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 @@ -15,9 +15,29 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; * @Modify: **/ public class WmsHqlPack { + /** + * 物料查询条件封装 + * + * @param wmsPart + * @return + */ + 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.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); + HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); + HqlPack.getStringLikerPack(wmsPart.getAbc(), "ABC", result); + HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result); + HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result); + return result.toString(); + } /** * 库位物料信息 分页查询 + * * @param wmsLocatePart * @return */ @@ -34,6 +54,7 @@ public class WmsHqlPack { /** * 库位信息 分页查询 + * * @param wmsLocate * @return */ @@ -41,17 +62,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 */ @@ -59,9 +81,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(); } @@ -70,51 +92,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 */ @@ -122,15 +147,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 */ @@ -138,15 +164,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 */ @@ -155,55 +182,59 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); - HqlPack.getStringEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()+"","isValid",result); + HqlPack.getStringEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() + "", "isValid", result); return result.toString(); } + /** * 存储区信息 查询条件封装 + * * @param wmsZones * @return */ public static String packHqlWmsZones(WmsZones wmsZones) { StringBuffer result = new StringBuffer(); //仓库代码 - HqlPack.getStringLikerPack(wmsZones.getWhNo(),"whNo",result); + HqlPack.getStringLikerPack(wmsZones.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 aec47b10fab2fd436e6675db64d8a11d4ed3af3d Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 8 Nov 2018 15:32:43 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E3=80=81?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/repository/LogOperateRepository.java | 6 ++- .../cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 57 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java | 45 +++++++++++++++++ .../pojo/wms/repository/BasVendorRepository.java | 16 ++++++ .../pojo/wms/repository/WmsOpTypeRepository.java | 16 ++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 51 ++++++++++++++----- 6 files changed, 178 insertions(+), 13 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasVendorRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java 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/repository/LogOperateRepository.java index c046242..440d49c 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/repository/LogOperateRepository.java @@ -1,15 +1,19 @@ +/* package cn.estsh.i3plus.pojo.platform.repository; 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-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 new file mode 100644 index 0000000..3cf7845 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.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; +import java.util.prefs.BackingStoreException; + +/** + * @Description : 供应商 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="BAS_VENDOR") +@Api("供应商") +public class BasVendor extends BaseBean{ + + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + private String vendorNo; + + @Column(name="VENDOR_NAME") + @ApiParam("供应商简称") + private String vendorName; + + @Column(name="VENDOR_DESC") + @ApiParam("供应商全称") + private String vendorDesc; + + @Column(name="VENDOR_ADDR") + @ApiParam("供应商地址") + private String vendorAddr; + + @Column(name="VENDOR_OWNER") + @ApiParam("联系人") + private String vendorOwner; + + @Column(name="VENDOR_EMAIL") + @ApiParam("邮箱") + private String vendorEmail; + + @Column(name="IS_ASN") + @ApiParam("是否发ASN") + private Integer isAsn; +} 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 new file mode 100644 index 0000000..f3074ad --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -0,0 +1,45 @@ +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-07 14:41 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="WMS_OP_TYPE") +@Api("作业类型") +public class WmsOpType extends BaseBean{ + + @Column(name="OP_TYPE_CODE") + @ApiParam("类型编号") + private String opTypeCode; + + @Column(name="OP_TYPE_NAME") + @ApiParam("类型名称") + private String opTypeName; + + @Column(name="SEQ") + @ApiParam("序号") + private Integer seq; + + @Column(name="PROG_CODE") + @ApiParam("处理程序") + private String proCode; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasVendorRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasVendorRepository.java new file mode 100644 index 0000000..4386df3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasVendorRepository.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.BasVendor; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:49 + * @Modify: + **/ +@Repository +public interface BasVendorRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java new file mode 100644 index 0000000..59aad4c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.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.WmsOpType; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业类型 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:46 + * @Modify: + **/ +@Repository +public interface WmsOpTypeRepository 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 e350323..ba31919 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 @@ -157,14 +157,10 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); - HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result); - - // 默认有效 - if(basVendor.getIsValid()==null){ - HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",result); - }else{ - HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.INVAILD.getValue()+"","isValid",result); + if(basVendor.getIsAsn()!= null){ + HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result); } + HqlPack.getNumEqualPack(basVendor.getIsValid(),"isValid",result); return result.toString(); } @@ -179,12 +175,43 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(),"opTypeName",result); HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(),"seq",result); HqlPack.getStringLikerPack(wmsOpType.getProCode(),"proCode",result); - // 默认有效 - if(wmsOpType.getIsValid()==null){ - HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",result); - }else{ - HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.INVAILD.getValue()+"","isValid",result); + HqlPack.getNumEqualPack(wmsOpType.getIsValid(),"isValid",result); + return result.toString(); + } + + /** + * 仓库唯一性校验查询条件【用于添加和修改】 + * @param wareHouse + * @return + */ + public static String packHqlWareHouseUnique(WareHouse wareHouse){ + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); + HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); + HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); + return result.toString(); + } + + /** + * 供应商唯一性校验查询条件【用于添加和修改】 + * @param basVendor + * @return + */ + public static String packHqlBasVendorUnique(BasVendor basVendor){ + StringBuffer result = new StringBuffer(); + if(basVendor.getId()!=null){ + HqlPack.getNumNOEqualPack(basVendor.getId(), "id", result); } + HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); + HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); + HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); + return result.toString(); + } + + public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType){ + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); + HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(),"opTypeName",result); return result.toString(); } } From 2108f314b13b0cdf85b8bf7dbb4623de67649f26 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 8 Nov 2018 16:40:33 +0800 Subject: [PATCH 6/8] =?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 | 7 +------ 1 file changed, 1 insertion(+), 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 6611fee..3bba3a8 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 @@ -170,12 +170,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); - // 默认有效 - if(wareHouse.getIsValid()==null){ - HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",result); - }else{ - HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.INVAILD.getValue()+"","isValid",result); - } + HqlPack.getNumEqualPack(wareHouse.getIsValid(),"isValid",result); return result.toString(); } From de2325d2ebc6de459519da6a79b82b13f6b23d4f Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 8 Nov 2018 16:44:24 +0800 Subject: [PATCH 7/8] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 -- 1 file changed, 2 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 3978a76..fdf314e 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 @@ -23,9 +23,7 @@ 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.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); From 0df6504c561a5d9918c8738e8cf5b316c30855a8 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 8 Nov 2018 16:46:52 +0800 Subject: [PATCH 8/8] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ---- 1 file changed, 4 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 a84d7d9..7abca1a 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 @@ -1,11 +1,7 @@ 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.WareHouse; -import cn.estsh.i3plus.pojo.wms.bean.WmsTrans; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; /** * @Description : 仓库管理对象封装