Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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;
 }

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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -4829,4 +4829,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;
+        }
+    }
+
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : Wms实体字段Model信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-01-08 09:53
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+public class WmsFieldInfoModel implements Serializable {
+
+    private static final long serialVersionUID = -6376845639646427495L;
+
+    @ApiParam(value = "字段信息列表")
+    public List<WmsFieldInfo> wmsFieldInfoList;
+
+    @ApiParam(value = "新增数据操作类")
+    private String baseRepository;
+
+    public WmsFieldInfoModel (String baseRepository, List<WmsFieldInfo> wmsFieldInfoList) {
+        this.baseRepository = baseRepository;
+        this.wmsFieldInfoList = wmsFieldInfoList;
+    }
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.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.WmsListElement;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description : WMS列表菜单model
  * @Reference :
@@ -16,33 +19,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 +28,6 @@ public class WmsListElementModel extends BaseBean {
     @ApiParam(value = "是否默认配置")
     private Integer isDefault;
 
+    List<WmsListElement> wmsListElementList;
+
 }

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;
 
@@ -45,4 +33,7 @@ public class WmsSearchElementModel extends BaseBean {
 
     @ApiParam(value = "是否共享")
     private Integer isShare;
+
+    @ApiParam(value = "Wms查询元素列表")
+    private List<WmsSearchElement> searchElementList;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java

@@ -107,7 +107,7 @@ public class WmsActionGroup extends BaseBean {
     }
 
     public int getIsAutoCommitVal() {
-        return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
+        return this.isAutoCommit == null ? 0 : this.isAutoCommit.intValue();
     }
 
     public int getAutoInitVal() {

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

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

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(){

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

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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java

@@ -7,9 +7,9 @@ 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.Index;
 import javax.persistence.Table;
 
 /**
@@ -21,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)
@@ -29,6 +32,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 +52,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;
 }

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)
@@ -29,6 +33,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 +50,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 +73,8 @@ public class WmsListElement extends BaseBean {
     @Column(name = "DEFAULT_VALUE")
     @ApiParam(value = "表单字段默认值")
     private String defaultValue;
+
+    @Column(name = "USER_CODE")
+    @ApiParam(value = "用户编号")
+    private String userCode;
 }

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)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java

@@ -10,18 +10,23 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 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")
+@Table(name="WMS_SEARCHELEMENT", indexes = {
+        @Index(columnList = "FIELD_NAME"),
+        @Index(columnList = "SEARCH_NAME"),
+        @Index(columnList = "USER_CODE")
+})
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
@@ -29,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;
@@ -48,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;
 }

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,12 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name="WMS_SEARCHELEMENT_FUNCTION")
+@Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = {
+        @Index(columnList = "FUNCTION_ID"),
+        @Index(columnList = "SEARCH_ELEMENT_ID"),
+        @Index(columnList = "IS_SHARE"),
+        @Index(columnList = "USER_CODE")
+})
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
@@ -29,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;

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<String, Object> attachment;
+
+
+}

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<Map<Object,Object>> dataList;
+}

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<WmsDataMigrationConfig, Long> {
+}

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<WmsPushConfig, Long> {
+
+
+}

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<WmsPushLog, Long> {
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
@@ -2692,4 +2693,38 @@ 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;
+    }
+
+    /**
+     * WMS实体字段信息分页查询条件
+     *
+     * @param wmsFieldInfo
+     * @return
+     */
+    public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result);
+        DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result);
+        getStringBuilderPack(wmsFieldInfo, result);
+        return result;
+    }
 }