From 09339a6e1f980daaa1241de0633c6782f1fb3f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 16 Jan 2020 19:05:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=901405=20=E7=89=A9=E6=B5=81=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E5=9C=A8=E7=89=A9=E5=93=81=E5=88=86=E7=B1=BB=E5=8F=8A?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=BA=A7=E5=88=AB=E7=9A=84=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 2 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 50 ++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index a9b133d..e9f1cd8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -196,7 +196,7 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "CONSIGNATION") @ApiParam("是否寄售 1-是 2-否") - private Integer consignation; + private Integer consignation = 2; public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); 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 cdf4f66..49aa95c 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 @@ -2744,4 +2744,54 @@ public class WmsHqlPack { getStringBuilderPack(searchElementFunction, result); return result; } + + /** + * 物料组信息分页查询条件 + * + * @param wmsPartGroup + * @return + */ + public static DdlPackBean packHqlWmsPartGroup(WmsPartGroup wmsPartGroup) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsPartGroup.getPartGroupNo(), "partGroupNo", result); + DdlPreparedPack.getStringLikerPack(wmsPartGroup.getPartGroupName(), "partGroupName", result); + + getStringBuilderPack(wmsPartGroup, result); + + return result; + } + + /** + * 物料组物流路线信息分页查询条件 + * + * @param wmsPartGroupRoute + * @return + */ + public static DdlPackBean packHqlWmsPartGroupRoute(WmsPartGroupRoute wmsPartGroupRoute) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsPartGroupRoute.getPartGroupNo(), "partGroupNo", result); + + getStringBuilderPack(wmsPartGroupRoute, result); + + return result; + } + + /** + * 物料组物流路线信息分页查询条件 + * + * @param wmsPartGroupDetails + * @return + */ + public static DdlPackBean packHqlWmsPartGroupDetails(WmsPartGroupDetails wmsPartGroupDetails) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsPartGroupDetails.getPartGroupNo(), "partGroupNo", result); + + getStringBuilderPack(wmsPartGroupDetails, result); + + return result; + } + } From 5feae0dd1a10468b3143fb539b811fb24e6cc284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 16 Jan 2020 19:06:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=901405=20=E7=89=A9=E6=B5=81=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E5=9C=A8=E7=89=A9=E5=93=81=E5=88=86=E7=B1=BB=E5=8F=8A?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=BA=A7=E5=88=AB=E7=9A=84=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsPartGroup.java | 39 ++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsPartGroupDetails.java | 43 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsPartGroupRoute.java | 43 ++++++++++++++++++++++ .../repository/WmsPartGroupDetailsRepository.java | 16 ++++++++ .../wms/repository/WmsPartGroupRepository.java | 16 ++++++++ .../repository/WmsPartGroupRouteRepository.java | 16 ++++++++ 6 files changed, 173 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRouteRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java new file mode 100644 index 0000000..9641130 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.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 lombok.EqualsAndHashCode; +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 : jessica.chen + * @CreateDate : 2020-01-15 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PART_GROUP") +@Api("物料组信息") +public class WmsPartGroup extends BaseBean{ + + private static final long serialVersionUID = 9214639813072864436L; + @Column(name="PART_GROUP_NO") + @ApiParam("物料组编号") + private String partGroupNo; + + @Column(name="PART_GROUP_NAME") + @ApiParam("物料组名称") + private String partGroupName; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java new file mode 100644 index 0000000..d2e7f87 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java @@ -0,0 +1,43 @@ +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 lombok.EqualsAndHashCode; +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 : jessica.chen + * @CreateDate : 2020-01-15 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PART_GROUP_DETAILS") +@Api("物料组明细信息") +public class WmsPartGroupDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072864444L; + @Column(name="PART_GROUP_NO") + @ApiParam("物料组编号") + private String partGroupNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java new file mode 100644 index 0000000..80cc3af --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java @@ -0,0 +1,43 @@ +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 lombok.EqualsAndHashCode; +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 : jessica.chen + * @CreateDate : 2020-01-15 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PART_GROUP_ROUTE") +@Api("物料组物流路线信息") +public class WmsPartGroupRoute extends BaseBean{ + + private static final long serialVersionUID = 9214639813072864438L; + @Column(name="PART_GROUP_NO") + @ApiParam("物料组编号") + private String partGroupNo; + + @Column(name = "ROUTING_CODE") + @ApiParam(value = "线路代码") + private String routingCode; + + @Column(name = "ROUTING_NAME") + @ApiParam(value = "线路名称") + private String routingName; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupDetailsRepository.java new file mode 100644 index 0000000..253c463 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupDetailsRepository.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.WmsPartGroupDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description :物料组明细信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 15:17 + * @Modify: + **/ +@Repository +public interface WmsPartGroupDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRepository.java new file mode 100644 index 0000000..ddd376a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRepository.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.WmsPartGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description :物料组信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 15:17 + * @Modify: + **/ +@Repository +public interface WmsPartGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRouteRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRouteRepository.java new file mode 100644 index 0000000..c7e779f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRouteRepository.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.WmsPartGroupRoute; +import org.springframework.stereotype.Repository; + +/** + * @Description :物料组物流路线信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 15:17 + * @Modify: + **/ +@Repository +public interface WmsPartGroupRouteRepository extends BaseRepository { +}