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(); + } }