Merge remote-tracking branch 'origin/dev' into dev

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

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