From 25606ea25ac1b36aeaed58b408d6af8b490d494b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 8 Jan 2020 15:26:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=906847=20=E5=BC=80=E5=8F=91=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=BC=82=E5=B8=B8=E7=9A=84=E9=A2=84=E8=AD=A6=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E3=80=82=E5=AD=98=E5=9C=A8=E5=A4=84=E7=90=86=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=B1=95=E7=A4=BA=E3=80=82=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E5=89=8D=E6=89=80=E6=9C=89=E5=BC=82=E5=B8=B8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=9D=87=E9=9C=80=E5=A4=84=E7=90=86=E5=AE=8C=E6=88=90=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDataMigrationConfig.java | 90 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 11 +++ .../WmsDataMigrationConfigRepository.java | 17 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 21 +++++ 4 files changed, 139 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java new file mode 100644 index 0000000..9038989 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java @@ -0,0 +1,90 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : WMS数据迁移配置表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-08 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DATA_MIGRATION_CONFIG") +@Api("WMS数据迁移配置表") +public class WmsDataMigrationConfig extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592777L; + + @Column(name="MIG_NAME") + @ApiParam("名称") + private String migName; + + @Column(name="REMARK") + @ApiParam("描述") + private String remark; + + @Column(name="MIGRATION_CYCLE") + @ApiParam("迁移周期") + private String migrationCycle; + + @Column(name="LAST_EXECUTION_TIME") + @ApiParam("末次迁移时间") + private String lastExecutionTime; + + @Column(name="LAST_MRGRATION_QTY") + @ApiParam(value = "末次迁移记录数", example = "0") + private Integer LastmMigrationQty; + + @Column(name="NEXT_EXECUTION_TIME") + @ApiParam("下次执行时间") + private String nextExecutionTime; + + @Column(name="SRC_TABLE_NAME") + @ApiParam("来源表名") + private String srcTableName; + + @Column(name="SRC_QUERY_CONDITIONS") + @ApiParam("来源表查询条件") + private String srcQueryConditions; + + @Column(name="PROCESS_QTY") + @ApiParam(value = "每次处理行数", example = "0") + private Integer processQty; + + @Column(name="DEST_TABLE_NAME") + @ApiParam("目标表名") + private String destTableName; + + @Column(name="IS_PHYSICAL_DELETE") + @ApiParam(value = "是否物理删除", example = "0") + private Integer isPhysicalDelete; + + @Column(name="ERROR_MESSAGE") + @ApiParam("执行错误日志") + private String errorMessage; + + @Transient + @ApiParam(value ="开始时间") + private String mcStartTime; + + @Transient + @ApiParam(value ="结束时间") + private String mcEndTime; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 335aac9..a4405ea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -156,6 +157,10 @@ public class WmsMoveMaster extends BaseBean { @Transient private Integer isSnapshot; + @Transient + @ApiParam("总行数") + private Integer itemQty; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") @@ -220,6 +225,12 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } + public WmsMoveMaster(Integer itemQty , String transTypeCode , Integer itemStatus){ + this.itemQty = itemQty; + this.transTypeCode = transTypeCode; + this.itemStatus = itemStatus; + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java new file mode 100644 index 0000000..080bf9d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java @@ -0,0 +1,17 @@ +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 cn.estsh.i3plus.pojo.wms.bean.WmsDataMigrationConfig; +import org.springframework.stereotype.Repository; + +/** + * @Description :WMS数据迁移配置实体 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-08 14:49 + * @Modify: + **/ +@Repository +public interface WmsDataMigrationConfigRepository 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 215fb1b..55724ff 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 @@ -2692,4 +2692,25 @@ public class WmsHqlPack { return result; } + /** + * 数据迁移配置信息分页查询条件 + * + * @param wmsDataMigrationConfig + * @return + */ + public static DdlPackBean packHqlWmsDataMigrationConfig(WmsDataMigrationConfig wmsDataMigrationConfig) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getMigName(), "migName", result); + DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getRemark(), "remark", result); + DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getSrcTableName(), "srcTableName", result); + DdlPreparedPack.getNumEqualPack(wmsDataMigrationConfig.getIsPhysicalDelete(), "isPhysicalDelete", result); + DdlPreparedPack.getStringBiggerPack(wmsDataMigrationConfig.getMcStartTime(), "nextExecutionTime", result); + DdlPreparedPack.getStringSmallerPack(wmsDataMigrationConfig.getMcEndTime(), "nextExecutionTime", result); + + getStringBuilderPack(wmsDataMigrationConfig, result); + + return result; + } + } From bca93691baf09fc82b1238fbbddea22bc435682e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 8 Jan 2020 15:35:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2020-01-08=E6=B7=BB=E5=8A=A0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=8F=9C=E5=8D=95=E4=B8=8E=E5=AF=B9=E5=BA=94=E5=92=8C?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsListElementModel.java | 33 ++++------------------ 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index a286a2e..2c8f6f2 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -1,10 +1,14 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; +import java.util.List; + /** * @Description : WMS列表菜单model * @Reference : @@ -16,33 +20,6 @@ import lombok.Data; @Api("WMS列表菜单model") public class WmsListElementModel extends BaseBean { - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("标题名称") - private String titleName; - - @ApiParam("序列号:字段标题排序使用默认0（不排序）") - private Integer seq; - - @ApiParam(value = "是否必选:默认1-必选，2-非必选") - private Integer isRequire; - - @ApiParam(value = "宽度") - private Double width; - - @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") - private Integer sort; - - @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") - private Integer isWider; - - @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") - private Integer isSelect; - - @ApiParam(value = "表单字段默认值") - private String defaultValue; - @ApiParam(value = "功能菜单ID") private Long functionId; @@ -52,4 +29,6 @@ public class WmsListElementModel extends BaseBean { @ApiParam(value = "是否默认配置") private Integer isDefault; + List wmsListElementList; + }