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

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java

@@ -0,0 +1,103 @@
+package cn.estsh.i3plus.pojo.mes.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.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_DATA_MIGRATION_CFG")
+@Api("MES数据迁移配置表")
+public class MesDataMigrationCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6445732389643648643L;
+
+    @Column(name = "PCN_CODE")
+    @ApiParam("PCN节点名称代码")
+    private String pcnCode;
+
+    @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 = "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 = "LAST_EXECUTION_TIME")
+    @ApiParam("末次迁移时间")
+    private String lastExecutionTime;
+
+    @Column(name = "LAST_MIGRATION_QTY")
+    @ApiParam(value = "末次迁移记录数", example = "0")
+    private Integer lastMigrationQty;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("执行错误日志")
+    private String errorMessage;
+
+
+    @Transient
+    @ApiParam(value = "开始时间")
+    private String mcStartTime;
+
+    @Transient
+    @ApiParam(value = "结束时间")
+    private String mcEndTime;
+
+    /*public MesDataMigrationCfg(String migName, String remark, String migrationCycle, String nextExecutionTime, String srcTableName, String srcQueryConditions, Integer processQty, String destTableName, Integer isPhysicalDelete, String lastExecutionTime, Integer lastMigrationQty, String errorMessage, String mcStartTime, String mcEndTime) {
+        this.migName = migName;
+        this.remark = remark;
+        this.migrationCycle = migrationCycle;
+        this.nextExecutionTime = nextExecutionTime;
+        this.srcTableName = srcTableName;
+        this.srcQueryConditions = srcQueryConditions;
+        this.processQty = processQty;
+        this.destTableName = destTableName;
+        this.isPhysicalDelete = isPhysicalDelete;
+        this.lastExecutionTime = lastExecutionTime;
+        this.lastMigrationQty = lastMigrationQty;
+        this.errorMessage = errorMessage;
+        this.mcStartTime = mcStartTime;
+        this.mcEndTime = mcEndTime;
+    }*/
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java

@@ -81,7 +81,7 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("默认工作中心")
     private String defaultWorkCenter;
 
-    @Column(name = "PRODUCE_CTGY_CODE",columnDefinition = "default ''")
+    @Column(name = "PRODUCE_CTGY_CODE",columnDefinition = "varchar(225) default ''")
     @ApiParam("产品类型代码")
     private String produceCategoryCode;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java

@@ -12,4 +12,10 @@ public class MesWorkCellStatusModel {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @ApiParam("故障类型")
+    private String alarmName;
+
+    @ApiParam("故障原因")
+    private String acDesc;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataMigrationCfgRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesDataMigrationCfg;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MesDataMigrationCfgRepository extends BaseRepository<MesDataMigrationCfg, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -3721,4 +3721,29 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 数据迁移表查询条件封装
+     */
+    public static DdlPackBean getDataMigrationCfg(MesDataMigrationCfg cfg) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(cfg.getOrganizeCode());
+        if (!StringUtils.isEmpty(cfg.getPcnCode())) {
+            DdlPreparedPack.getStringEqualPack(cfg.getPcnCode(), "pcnCode", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getMigName())) {
+            DdlPreparedPack.getStringLikerPack(cfg.getMigName(), "migName", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getRemark())) {
+            DdlPreparedPack.getStringLikerPack(cfg.getRemark(), "remark", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getSrcTableName())) {
+            DdlPreparedPack.getStringEqualPack(cfg.getSrcTableName(), "srcTableName", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getSrcQueryConditions())) {
+            DdlPreparedPack.getStringEqualPack(cfg.getSrcQueryConditions(), "srcQueryConditions", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getDestTableName())) {
+            DdlPreparedPack.getStringEqualPack(cfg.getDestTableName(), "destTableName", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -125,6 +125,9 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "是否允许重置")
     private Integer isResetAble;
 
+    @ApiParam(value = "是否重置")
+    private Integer isReset;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;
@@ -155,4 +158,7 @@ public class WmsActionResponseBean<Obj> implements Serializable {
         this.codeStatus = codeStatus;
     }
 
+    public int getIsResetVal() {
+        return this.isReset == null ? 0 : this.isReset;
+    }
 }