From 4cf396419d08a0252d634391ca809c532ef11365 Mon Sep 17 00:00:00 2001 From: Administrator <962239776@qq.com> Date: Thu, 1 Nov 2018 14:30:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/InterfaceDevice.java | 41 +++++++++++ .../estsh/i3plus/pojo/wms/bean/InterfaceType.java | 80 ++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java new file mode 100644 index 0000000..3ee748c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 接口驱动类信息实体 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-01 11:45 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="T_INTERFACE_DEVICE") +@Api("接口驱动类信息") +public class InterfaceDevice extends BaseBean { + + @Column(name="DEVICE_NAME") + @ApiParam("驱动名称") + private String deviceName; + + @Column(name="DEVICE_CLASSNAME") + @ApiParam("驱动类名称") + private String deviceClassname; + + @Column(name="STATUS") + @ApiParam("状态") + private String status; + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java new file mode 100644 index 0000000..eecb4f2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 接口类型信息实体 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-01 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="T_INTERFACE_TYPE") +@Api("接口类型信息") +public class InterfaceType { + + @Column(name="TP_ID") + @ApiParam("接口编号") + private String tpId; + + @Column(name="TP_TYP") + @ApiParam("接口类型") + private String tpTyp; + + @Column(name="PB_NO") + @ApiParam("发布方编码") + private String pbNo; + + @Column(name="TP_NO") + @ApiParam("接口编码") + private String tpNo; + + @Column(name="TP_DESC") + @ApiParam("接口主题描述") + private String tpDesc; + + @Column(name="MES_TAB") + @ApiParam("接口业务表") + private String mesTab; + + @Column(name="MES_GROUP") + @ApiParam("业务表的分组条件") + private String mesGroup; + + @Column(name="MES_PK") + @ApiParam("业务表主键") + private String mesPk; + + @Column(name="ACT_TYPE") + @ApiParam("业务类型") + private Integer actType; + + @Column(name="ACT_DESC") + @ApiParam("业务描述") + private String actDesc; + + @Column(name="DEVICE_ID") + @ApiParam("驱动类编号") + private String deviceId; + + @Column(name="REQUEST_URL") + @ApiParam("服务器请求路径") + private String requestUrl; + + @Column(name="CFILE_PATH") + @ApiParam("客户文件路径") + private String cfilePath; + +} From 7479104bb9ee7d119dde645ef45da76f6a2da71e Mon Sep 17 00:00:00 2001 From: Administrator <962239776@qq.com> Date: Fri, 2 Nov 2018 09:30:32 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=A9=B1=E5=8A=A8?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/InterfaceDevice.java | 12 ++--- .../estsh/i3plus/pojo/wms/bean/InterfaceType.java | 52 +++++++++++++++------- .../wms/repository/InterfaceDeviceRepository.java | 16 +++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 ++++++ 4 files changed, 71 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java index 3ee748c..d3dc77f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java @@ -26,16 +26,16 @@ import javax.persistence.Table; @Api("接口驱动类信息") public class InterfaceDevice extends BaseBean { - @Column(name="DEVICE_NAME") + @Column(name="device_name") @ApiParam("驱动名称") private String deviceName; - @Column(name="DEVICE_CLASSNAME") + @Column(name="device_classname") @ApiParam("驱动类名称") - private String deviceClassname; + private String deviceClassName; - @Column(name="STATUS") - @ApiParam("状态") - private String status; + @Column(name="status") + @ApiParam("状态 【0-禁用 1-正常】") + private Integer status; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java index eecb4f2..39d7dd6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java @@ -1,5 +1,8 @@ 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; @@ -23,58 +26,75 @@ import javax.persistence.Table; @DynamicUpdate @Table(name="T_INTERFACE_TYPE") @Api("接口类型信息") -public class InterfaceType { +public class InterfaceType extends BaseBean { - @Column(name="TP_ID") + @Column(name="tp_id") @ApiParam("接口编号") - private String tpId; + @JsonSerialize(using = ToStringSerializer.class) + private Long tpId; - @Column(name="TP_TYP") + @Column(name="tp_typ") @ApiParam("接口类型") private String tpTyp; - @Column(name="PB_NO") + @Column(name="pb_no") @ApiParam("发布方编码") private String pbNo; - @Column(name="TP_NO") + @Column(name="tp_no") @ApiParam("接口编码") private String tpNo; - @Column(name="TP_DESC") + @Column(name="tp_desc") @ApiParam("接口主题描述") private String tpDesc; - @Column(name="MES_TAB") + @Column(name="mes_tab") @ApiParam("接口业务表") private String mesTab; - @Column(name="MES_GROUP") + @Column(name="mes_group") @ApiParam("业务表的分组条件") private String mesGroup; - @Column(name="MES_PK") + @Column(name="mes_pk") @ApiParam("业务表主键") private String mesPk; - @Column(name="ACT_TYPE") + @Column(name="act_type") @ApiParam("业务类型") private Integer actType; - @Column(name="ACT_DESC") + @Column(name="act_desc") @ApiParam("业务描述") private String actDesc; - @Column(name="DEVICE_ID") + @Column(name="device_id") @ApiParam("驱动类编号") - private String deviceId; + @JsonSerialize(using = ToStringSerializer.class) + private Long deviceId; - @Column(name="REQUEST_URL") + @Column(name="request_url") @ApiParam("服务器请求路径") private String requestUrl; - @Column(name="CFILE_PATH") + @Column(name="cfile_path") @ApiParam("客户文件路径") private String cfilePath; + public Long getTpId() { + if(tpId != null) { + return tpId.longValue(); + }else{ + return tpId; + } + } + + public Long getDeviceId() { + if(deviceId != null) { + return deviceId.longValue(); + }else{ + return deviceId; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java new file mode 100644 index 0000000..62a206c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.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.InterfaceDevice; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-01 15:13 + * @Modify: + **/ +@Repository +public interface InterfaceDeviceRepository 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 863f641..3bc083a 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,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; import cn.estsh.i3plus.pojo.wms.bean.WareHouse; /** @@ -27,4 +28,16 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 接口驱动类信息 分页查询 + * @return + */ + public static String packHqlInterfaceDevice(InterfaceDevice interfaceDevice){ + StringBuffer sb = new StringBuffer(); + //驱动类名称 + HqlPack.getStringEqualPack(interfaceDevice.getDeviceClassName(),"deviceClassName",sb); + + return null; + } } From e36c33969f622ef11ad8f954e4589fc03e60d027 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 2 Nov 2018 09:55:17 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/repository/WmsTransRcdRepository.java | 14 ++++++++++++++ .../i3plus/pojo/wms/repository/WmsTransRepository.java | 14 ++++++++++++++ .../i3plus/pojo/wms/repository/WmsTransTypeRepository.java | 14 ++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.java new file mode 100644 index 0000000..42395be --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransRcd; + +/** + * @Description : 仓库交易归档表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-02 9:50 + * @Modify: + **/ +public interface WmsTransRcdRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.java new file mode 100644 index 0000000..d9f9ce3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTrans; + +/** + * @Description : 仓库交易记录表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-02 9:49 + * @Modify: + **/ +public interface WmsTransRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java new file mode 100644 index 0000000..f58d5e0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; + +/** + * @Description : 交易类型表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-02 9:49 + * @Modify: + **/ +public interface WmsTransTypeRepository extends BaseRepository { +} From 468ab162a555d44964597ffde90accd5abdfebe4 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 2 Nov 2018 14:43:36 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 39 ++++++++-------------- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 38 ++++++++------------- .../wms/repository/WmsTransTypeRepository.java | 1 + .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 10 ++++++ 4 files changed, 37 insertions(+), 51 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index c0bd9ef..e4657c3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -5,7 +5,6 @@ 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 io.swagger.models.auth.In; import lombok.Data; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -70,29 +69,25 @@ public class WmsTrans extends BaseBean{ @ApiParam(value ="单位") private String unit; - @Column(name="SRC_LOC_ID") - @ApiParam(value ="来源库位id") + @Column(name="LOC_ID") + @ApiParam(value ="库位id") @JsonSerialize(using = ToStringSerializer.class) - private Long srcLocId; + private Long locId; - @Column(name="SRC_LOC_CODE") - @ApiParam(value ="来源库位代码") - private String srcLocCode; + @Column(name="SLOC_CODE") + @ApiParam(value ="库位代码") + private String locCode; - @Column(name="DEST_LOC_ID") - @ApiParam(value ="目标库位id") + @Column(name="GROUP_ID") + @ApiParam(value ="分组id") @JsonSerialize(using = ToStringSerializer.class) - private Long destLocId; + private Long groupId; - @Column(name="DEST_LOC_CODE") - @ApiParam(value ="目标库位代码") - private String destLocCode; - - public Long getSrcLocId() { - if(srcLocId != null) { - return srcLocId.longValue(); + public Long getLocId() { + if(locId != null) { + return locId.longValue(); }else{ - return srcLocId; + return locId; } } @@ -103,12 +98,4 @@ public class WmsTrans extends BaseBean{ return partId; } } - - public Long getDestLocId() { - if(destLocId != null) { - return destLocId.longValue(); - }else{ - return destLocId; - } - } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 8b49c9f..5c38f65 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -69,29 +69,25 @@ public class WmsTransRcd extends BaseBean{ @ApiParam(value ="单位") private String unit; - @Column(name="SRC_LOC_ID") - @ApiParam(value ="来源库位id") + @Column(name="LOC_ID") + @ApiParam(value ="库位id") @JsonSerialize(using = ToStringSerializer.class) - private Long srcLocId; + private Long locId; - @Column(name="SRC_LOC_CODE") - @ApiParam(value ="来源库位代码") - private String srcLocCode; + @Column(name="SLOC_CODE") + @ApiParam(value ="库位代码") + private String locCode; - @Column(name="DEST_LOC_ID") - @ApiParam(value ="目标库位id") + @Column(name="GROUP_ID") + @ApiParam(value ="分组id") @JsonSerialize(using = ToStringSerializer.class) - private Long destLocId; + private Long groupId; - @Column(name="DEST_LOC_CODE") - @ApiParam(value ="目标库位代码") - private String destLocCode; - - public Long getSrcLocId() { - if(srcLocId != null) { - return srcLocId.longValue(); + public Long getLocId() { + if(locId != null) { + return locId.longValue(); }else{ - return srcLocId; + return locId; } } @@ -102,12 +98,4 @@ public class WmsTransRcd extends BaseBean{ return partId; } } - - public Long getDestLocId() { - if(destLocId != null) { - return destLocId.longValue(); - }else{ - return destLocId; - } - } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java index f58d5e0..0c453f1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; +import org.springframework.stereotype.Repository; /** * @Description : 交易类型表 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 3bc083a..8634073 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; import cn.estsh.i3plus.pojo.wms.bean.WareHouse; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; /** * @Description : 仓库管理对象封装 @@ -40,4 +41,13 @@ public class WmsHqlPack { return null; } + + public static String packHqlWmsTransType(WmsTransType wmsTransType) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsTransType.getTransCode(),"transCode",result); + + return result.toString(); + } } From 26f30ec92be0ef78bd5204738696ff8bdfea74b9 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 2 Nov 2018 14:44:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index e4657c3..70f7448 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -74,7 +74,7 @@ public class WmsTrans extends BaseBean{ @JsonSerialize(using = ToStringSerializer.class) private Long locId; - @Column(name="SLOC_CODE") + @Column(name="LOC_CODE") @ApiParam(value ="库位代码") private String locCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 5c38f65..4a3a8f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -74,7 +74,7 @@ public class WmsTransRcd extends BaseBean{ @JsonSerialize(using = ToStringSerializer.class) private Long locId; - @Column(name="SLOC_CODE") + @Column(name="LOC_CODE") @ApiParam(value ="库位代码") private String locCode; From da9b042cf0c99d921f9a731d21590559f58463b2 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 2 Nov 2018 15:52:18 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 6 +++--- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 70f7448..8519f11 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -14,7 +14,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : 仓库交易记录表 + * @Description : 库存交易记录表 * @Reference : * @Author : jimmy.zeng * @CreateDate : 2018-11-01 13:21 @@ -25,7 +25,7 @@ import javax.persistence.Table; @Table(name="WMS_TRANS") @DynamicInsert @DynamicUpdate -@Api(value="仓库交易记录表",description = "仓库交易记录表") +@Api(value="库存交易记录表",description = "库存交易记录表") public class WmsTrans extends BaseBean{ @Column(name="ORDER_NO") @@ -51,7 +51,7 @@ public class WmsTrans extends BaseBean{ @Column(name="TRANS_STATUS") @ApiParam(value ="交易状态") - private String Trans_status; + private Integer transStatus; @Column(name="QTY") @ApiParam(value ="需求数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 4a3a8f8..b27dfb8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -51,7 +51,7 @@ public class WmsTransRcd extends BaseBean{ @Column(name="TRANS_STATUS") @ApiParam(value ="交易状态") - private Integer TransStatus; + private Integer transStatus; @Column(name="QTY") @ApiParam(value ="需求数") 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 8634073..092edb1 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 @@ -46,7 +46,8 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getNumEqualPack(wmsTransType.getTransCode(),"transCode",result); + HqlPack.getStringEqualPack(wmsTransType.getTransCode(),"transCode",result); + HqlPack.getStringEqualPack(wmsTransType.getTransName(),"transName",result); return result.toString(); }