From 7d4ba10449d80125659d4a9c00278e6e79583a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 15:23:43 +0800 Subject: [PATCH 1/7] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/annotation/FieldAnnotation.java | 18 ++++++++++ .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 5 +++ .../pojo/model/wms/WmsSearchElementModel.java | 3 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 34 +++++++++++++++++++ .../i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java | 38 +++++++++++++++++++++- .../pojo/wms/bean/dynamic/WmsListElement.java | 11 ++++--- .../wms/bean/dynamic/WmsSearchElementFunction.java | 4 +++ 7 files changed, 107 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java index 5a6b149..2e2b0a2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java @@ -13,4 +13,22 @@ import java.lang.annotation.*; public @interface FieldAnnotation { // Web前端字段数据类型 WmsEnumUtil.FIELD_TYPE webFieldType(); + // 条件表达式:>,<,>=等 + String conditionExpre() default "="; + // 条件连接符:and/or + String conditionConnector() default "and"; + // 排序序号 + int seq() default 0; + // 字段列宽度 + double width() default 0d; + // 排序规则:默认0-不排序，1-升序2-降序 + int sort() default 0; + // 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗 + int isWider() default 2; + // 是否勾选:默认1-勾选，2-非勾选 + int isSelect() default 1; + // 是否必选:默认1-必选，2-非必选 + int isRequire() default 1; + // 是否表单字段展示:默认1-显示，2-隐藏 + int isShow() default 1; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 5ba62b3..9c10c6c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -41,6 +41,7 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 @@ -63,6 +64,7 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) // @AnnoOutputColumn(hidden = true) public String organizeCode; @@ -87,15 +89,18 @@ public abstract class BaseBean implements Serializable { @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) public String createDatetime; @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) public String modifyUser; @Column(name="MODIFY_DATE_TIME") @ApiParam(value = "修改日期") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) public String modifyDatetime; @Transient diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index b785f96..9ca8e79 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -45,4 +45,7 @@ public class WmsSearchElementModel extends BaseBean { @ApiParam(value = "是否共享") private Integer isShare; + + @ApiParam(value = "搜索名称") + private String searchName; } 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 1b049a9..748e194 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 @@ -35,14 +35,17 @@ public class WmsPart extends BaseBean { private static final long serialVersionUID = 4849044986767609346L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "PART_SPEC") @ApiParam(value = "物料规格") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partSpec; @Column(name = "PART_TYPE") @@ -53,46 +56,57 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE_DESC") @ApiParam(value = "物料类型描述") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partTypeDesc; @Column(name = "GRAPHI_NO") @ApiParam(value = "图号") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String graphiNo; @Column(name = "VERSION") @ApiParam(value = "版本") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String version; @Column(name = "COLOR") @ApiParam(value = "颜色") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String color; @Column(name = "STOCK_UNIT") @ApiParam(value = "库存单位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String stockUnit; @Column(name = "ABC") @ApiParam(value = "分类") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String abc; @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double bu2su; @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double pu2su; @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标包", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double snp; @ColumnDefault("2") @@ -103,18 +117,22 @@ public class WmsPart extends BaseBean { @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double min; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double max; @Column(name = "PART_GROUP") @ApiParam(value = "物料组") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String lotCheckRule; @Column(name = "SN_CONTROL") @@ -124,34 +142,42 @@ public class WmsPart extends BaseBean { @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String vendorNo; @Column(name = "IN_LOCATE_NO") @ApiParam(value = "默认入库库位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String inLocateNo; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String prodCfgTypeName; @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String outCloseVendor; @Column(name = "QUALITY_DAYS") @ApiParam("保质期天数") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer qualityDays; @Column(name = "IS_REPORT_PARTNO") @@ -161,18 +187,22 @@ public class WmsPart extends BaseBean { @Column(name = "REPORT_LOCATE_NO") @ApiParam("报工库位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String reportLocateNo; @Column(name = "REPORT_ZONE_NO") @ApiParam("报工存储区") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String reportZoneNo; @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @ApiParam(value = "待质检比例", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @@ -183,11 +213,13 @@ public class WmsPart extends BaseBean { @Transient @ApiParam("总数量") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double qty; @Transient @ApiParam("库存水平") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String stockLevelStatus; @Column(name="verb_num") @@ -206,10 +238,12 @@ public class WmsPart extends BaseBean { @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer cycleRquestPeriod = 0; @Column(name = "CYCLE_RQUEST_QTY") @ApiParam(value = "循环补货数量", example = "0") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double cycleRquestQty = 0d; public int getIqcVal(){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java index 718dd49..7ef1220 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java @@ -7,7 +7,6 @@ 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; @@ -29,6 +28,7 @@ import javax.persistence.Table; public class WmsFieldInfo extends BaseBean { private static final long serialVersionUID = 3903166651913139064L; + @Column(name = "FIELD_NAME") @ApiParam(value = "字段名称") private String fieldName; @@ -48,4 +48,40 @@ public class WmsFieldInfo extends BaseBean { @Column(name = "ENTITY_DESC") @ApiParam(value = "实体描述") private String entityDesc; + + @Column(name = "SEQ") + @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）") + private Integer seq; + + @Column(name = "IS_REQUIRE") + @ApiParam(value = "是否必选:默认1-必选，2-非必选") + private Integer isRequire; + + @Column(name = "WIDTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "宽度", example = "0") + private Double width; + + @Column(name = "SORT") + @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") + private Integer sort; + + @Column(name = "IS_WIDER") + @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") + private Integer isWider; + + @Column(name = "IS_SELECT") + @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") + private Integer isSelect; + + @Column(name = "IS_SHOW") + @ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏") + private Integer isShow; + + @Column(name = "CONDITION_EXPRE") + @ApiParam(value = "条件表达式:>,<,>=等") + private String conditionExpre; + + @Column(name = "CONDITION_CONNECTOR") + @ApiParam(value = "条件连接符:and/or") + private String conditionConnector; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java index bd3d125..09109a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -29,6 +29,7 @@ import javax.persistence.Table; public class WmsListElement extends BaseBean { private static final long serialVersionUID = 3903166651913139060L; + @Column(name = "FIELD_NAME") @ApiParam(value = "字段名称") private String fieldName; @@ -45,14 +46,10 @@ public class WmsListElement extends BaseBean { @ApiParam(value = "是否必选:默认1-必选，2-非必选") private Integer isRequire; - @Column(name = "WIDTH", columnDefinition = "decimal(2,5)") + @Column(name = "WIDTH", columnDefinition = "decimal(18,8)") @ApiParam(value = "宽度", example = "0") private Double width; - public Double getWidth() { - return this.width == null ? 0 : this.width.doubleValue(); - } - @Column(name = "SORT") @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") private Integer sort; @@ -72,4 +69,8 @@ public class WmsListElement extends BaseBean { @Column(name = "DEFAULT_VALUE") @ApiParam(value = "表单字段默认值") private String defaultValue; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index 81bf452..d10ef27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -37,6 +37,10 @@ public class WmsSearchElementFunction extends BaseBean { @ApiParam(value = "组名称") private String groupName; + @Column(name = "SEARCH_NAME") + @ApiParam(value = "搜索名称") + private String searchName; + @Column(name = "SEARCH_ELEMENT_ID") @ApiParam(value = "搜索元素ID") private Long searchElementId; 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 2/7] =?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 3/7] =?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; + } From e1386275d0f9d71396f585ab962bc3f2c8e81939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 15:49:57 +0800 Subject: [PATCH 4/7] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java | 6 +++++- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java | 6 +++++- .../i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java | 5 ++++- .../i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java | 9 ++++++++- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java index 7ef1220..b1f3e68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -20,7 +21,10 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_FIELDINFO") +@Table(name="WMS_FIELDINFO", indexes = { + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "ENTITY_NAME") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java index 09109a7..d654c64 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,10 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_LISTELEMENT") +@Table(name="WMS_LISTELEMENT", indexes = { + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "USER_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java index 18ff672..dc94f0a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,11 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_LISTELEMENT_FUNCTION") +@Table(name="WMS_LISTELEMENT_FUNCTION", indexes = { + @Index(columnList = "FUNCTION_ID"), + @Index(columnList = "ELEMENT_ID"), + @Index(columnList = "USER_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index cdae331..de0aaf6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,9 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_SEARCHELEMENT") +@Table(name="WMS_SEARCHELEMENT", indexes = { + @Index(columnList = "FIELD_NAME") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index d10ef27..54f31aa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,13 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_SEARCHELEMENT_FUNCTION") +@Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = { + @Index(columnList = "FUNCTION_ID"), + @Index(columnList = "SEARCH_NAME"), + @Index(columnList = "SEARCH_ELEMENT_ID"), + @Index(columnList = "IS_SHARE"), + @Index(columnList = "USER_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) From d05fd542b37d0b24a7ec595ffd03e9ba3f01da4b 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 16:29:07 +0800 Subject: [PATCH 5/7] =?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 --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java | 1 - 1 file changed, 1 deletion(-) 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 2c8f6f2..0a11f26 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 @@ -6,7 +6,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.util.List; /** From c14d6c6916ea260c967fb4a5baad4fbee39f2b7a Mon Sep 17 00:00:00 2001 From: gcj Date: Wed, 8 Jan 2020 17:31:45 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 35 ++++++++ .../estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 92 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java | 52 ++++++++++++ .../pojo/wms/modelbean/MailMessageModel.java | 15 ++++ .../pojo/wms/modelbean/PushMessageModel.java | 25 ++++++ .../wms/repository/WmsPushConfigRepository.java | 19 +++++ .../pojo/wms/repository/WmsPushLogRepository.java | 18 +++++ 7 files changed, 256 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 665cbcb..33d06b5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4793,4 +4793,39 @@ public class WmsEnumUtil { } + /** + * 推送类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PUSH_TYPE { + EMAIL(10, "邮件"), SMS(20, "短信"); + + private int value; + private String description; + + PUSH_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java new file mode 100644 index 0000000..374abd7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -0,0 +1,92 @@ +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 : gcj + * @CreateDate : 2020-01-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PUSH_CONFIG") +@Api("推送配置") +public class WmsPushConfig extends BaseBean{ + + private static final long serialVersionUID = 2701710669030092153L; + @ApiParam("推送名称") + @Column(name = "PUSH_NAME") + private String pushName; + + @ApiParam("规则类型") + @Column(name = "QUARTZ_CRON") + private String quartzCron; + + @ApiParam("末次执行时间") + @Column(name = "LAST_EXE_TIME") + private String lastExeTime; + + @ApiParam("下次执行时间") + @Column(name = "NEXT_EXE_TIME") + private String nextExeTime; + + @ApiParam("序号") + @Column(name = "SERIAL_NUMBER") + private Integer serialNumber; + + @ApiParam("查询Hql") + @Column(name = "HQL_STR") + private String hqlStr; + + @ApiParam("查询Sql") + @Column(name = "SQL_STR") + private String sqlStr; + + @ApiParam("脚本编号") + @Column(name = "SCRIPT_NO") + private String scriptNo; + + @ApiParam("标题模板") + @Column(name = "TITLE_TEMPLATE") + private String titleTemplate; + + @ApiParam("消息体模板") + @Column(name = "CONTENT_TEMPLATE") + private String contentTemplate; + + @ApiParam("推送类型") + @Column(name = "PUSH_TYPE") + private Integer pushType; + + @ApiParam("描述") + @Column(name = "REMARK") + private String remark; + + @ApiParam("推送地址") + @Column(name ="PATH_URL") + private String pathUrl; + + @ApiParam("头标签") + @Column(name = "TITLE_LABEL") + private String titleLabel; + + @ApiParam("内容标签") + @Column(name = "CONTENT_LABEL") + private String contentLabel; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java new file mode 100644 index 0000000..6a57625 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -0,0 +1,52 @@ +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 : gcj + * @CreateDate : 2020-01-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PUSH_LOG") +@Api("推送日志") +public class WmsPushLog extends BaseBean{ + + private static final long serialVersionUID = -1708833666516164845L; + @Column(name = "EXE_HQL") + @ApiParam("执行Hql") + private String exeHql; + + @Column(name = "PUSH_TITLE") + @ApiParam("推送标题") + private String pushTitle; + + @Column(name = "PUSH_CONTENT") + @ApiParam("推送内容") + private String pushContent; + + @Column(name = "PUSH_TYPE") + @ApiParam("推送类型") + private String pushType; + + @Column(name = "PUSH_RESULT") + @ApiParam("推送结果") + private String pushResult; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java new file mode 100644 index 0000000..6667a49 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import lombok.Data; + +import java.util.Map; + +@Data +public class MailMessageModel extends PushMessageModel { + + + //附加，value 文件的绝对地址/动态模板数据 + private Map attachment; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java new file mode 100644 index 0000000..1e2ff26 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class PushMessageModel { + + + //标题 + public String title; + //内容 + public String content; + + //推送类型 + public String pushType; + + //推送地址 + public String pathUrl; + + //推送数据 + List> dataList; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java new file mode 100644 index 0000000..65de6a6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushConfig; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 推送日志配置信息 + * @Reference : + * @Author : gcj + * @CreateDate : 2020-01-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsPushConfigRepository extends BaseRepository { + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java new file mode 100644 index 0000000..209b9a7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 推送日志保存对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2020-01-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsPushLogRepository extends BaseRepository { + +} From daf3365ce3a222c4b5330e76861bb4d1d8373781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 18:22:00 +0800 Subject: [PATCH 7/7] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsSearchElementModel.java | 22 +++++----------------- .../pojo/wms/bean/dynamic/WmsSearchElement.java | 15 +++++++++++++-- .../wms/bean/dynamic/WmsSearchElementFunction.java | 6 +----- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index 9ca8e79..0056ba7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -1,10 +1,13 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * @Description : WMS列表搜索model * @Reference : @@ -16,21 +19,6 @@ import lombok.Data; @Api("WMS列表搜索model") public class WmsSearchElementModel extends BaseBean { - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("标题名称") - private String titleName; - - @ApiParam(value = "条件表达式:>,<,>=等") - private String conditionExpre; - - @ApiParam(value = "检索值") - private String value; - - @ApiParam(value = "条件连接符:and/or") - private String conditionConnector; - @ApiParam(value = "功能菜单ID") private Long functionId; @@ -46,6 +34,6 @@ public class WmsSearchElementModel extends BaseBean { @ApiParam(value = "是否共享") private Integer isShare; - @ApiParam(value = "搜索名称") - private String searchName; + @ApiParam(value = "Wms查询元素列表") + private List searchElementList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index de0aaf6..8ffe833 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -16,14 +16,16 @@ import javax.persistence.Table; /** * @Description : WMS搜索元素表 * @Reference : - * @Author : sjc + * @Author : siliter.yuan * @CreateDate : 2020-01-07 09:06 * @Modify: **/ @Data @Entity @Table(name="WMS_SEARCHELEMENT", indexes = { - @Index(columnList = "FIELD_NAME") + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "SEARCH_NAME"), + @Index(columnList = "USER_CODE") }) @DynamicInsert @DynamicUpdate @@ -32,6 +34,7 @@ import javax.persistence.Table; public class WmsSearchElement extends BaseBean { private static final long serialVersionUID = 3903166651913139062L; + @Column(name = "FIELD_NAME") @ApiParam(value = "字段名称") private String fieldName; @@ -51,4 +54,12 @@ public class WmsSearchElement extends BaseBean { @Column(name = "CONDITION_CONNECTOR") @ApiParam(value = "条件连接符:and/or") private String conditionConnector; + + @Column(name = "SEARCH_NAME") + @ApiParam(value = "搜索名称") + private String searchName; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index 54f31aa..43cbb23 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -24,7 +24,6 @@ import javax.persistence.Table; @Entity @Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = { @Index(columnList = "FUNCTION_ID"), - @Index(columnList = "SEARCH_NAME"), @Index(columnList = "SEARCH_ELEMENT_ID"), @Index(columnList = "IS_SHARE"), @Index(columnList = "USER_CODE") @@ -36,6 +35,7 @@ import javax.persistence.Table; public class WmsSearchElementFunction extends BaseBean { private static final long serialVersionUID = 3903166651913139063L; + @Column(name = "FUNCTION_ID") @ApiParam(value = "功能菜单ID") private Long functionId; @@ -44,10 +44,6 @@ public class WmsSearchElementFunction extends BaseBean { @ApiParam(value = "组名称") private String groupName; - @Column(name = "SEARCH_NAME") - @ApiParam(value = "搜索名称") - private String searchName; - @Column(name = "SEARCH_ELEMENT_ID") @ApiParam(value = "搜索元素ID") private Long searchElementId;