Merge branch 'dev' into test

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

@@ -23,9 +23,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_DB")
+@Table(name = "MES_DATASOURCE")
 @Api("地址清单")
-public class MesDb extends BaseBean {
+public class MesDatasource extends BaseBean {
 
     @Column(name="DS_CODE")
     @ApiParam("数据源代码")
@@ -55,6 +55,10 @@ public class MesDb extends BaseBean {
     @ApiParam("密码")
     private String dsPassword;
 
+    @Column(name = "DS_DB_NAME")
+    @ApiParam("数据库名称")
+    private String dsDbName;
+
     @Column(name="EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;

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

@@ -2,12 +2,12 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDb;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDatasource;
 
 /**
  * @Author: Wynne.Lu
  * @CreateDate: 2019/9/27 1:58 PM
  * @Description:
  **/
-public interface MesDbRepository extends BaseRepository<MesDb,Long> {
+public interface MesDatasourceRepository extends BaseRepository<MesDatasource,Long> {
 }

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

@@ -51,7 +51,7 @@ public class MesEquTaskPlan extends BaseBean {
 
     @Column(name="DAYS_IN_ADVANCE")
     @ApiParam("创建提前天数")
-    private String daysInAdvance;
+    private Integer daysInAdvance;
 
     @Transient
     @ApiParam(value="生产线")

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

@@ -26,7 +26,7 @@ public class MesEquTaskPlanModel implements Serializable {
     private String lastTime;
 
     @ApiParam("创建提前天数")
-    private String daysInAdvance;
+    private Integer daysInAdvance;
 
     @ApiParam("生产线")
     private String workCenterCode;
@@ -66,7 +66,7 @@ public class MesEquTaskPlanModel implements Serializable {
 
     }
 
-    public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, String daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;