From 9a6b1c4bf106ab99c253d70bb7438f0271c120f0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 15 Oct 2019 20:50:28 +0800 Subject: [PATCH] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/model/MesWorkOrderButtonModel.java | 3 + .../estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 64 ++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesFaultCause.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesFaultMethod.java | 2 +- .../i3plus/pojo/mes/bean/MesFaultPhenomenon.java | 2 +- .../i3plus/pojo/mes/model/MesEquTaskPlanModel.java | 87 ++++++++++++++++++++++ .../pojo/mes/model/MesEquTaskStandardModel.java | 28 ++++--- .../i3plus/pojo/mes/model/MesEquipmentModel.java | 12 +++ .../pojo/mes/model/MesWorkOrderButtonModel.java | 3 + .../mes/repository/MesEquTaskPlanRepository.java | 16 ++++ 10 files changed, 207 insertions(+), 12 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java index 8cd2304..c21e26b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java @@ -35,5 +35,8 @@ public class MesWorkOrderButtonModel implements Serializable { @ApiParam("关闭按钮") private boolean closeButton; + @ApiParam("完成按钮") + private boolean completeButton; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java new file mode 100644 index 0000000..a507c64 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -0,0 +1,64 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :设备周期作业计划 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQU_TASK_PLAN") +@Api("设备周期作业计划") +public class MesEquTaskPlan extends BaseBean { + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name="TASK_CYCLE") + @ApiParam("周期(天)") + private Integer taskCycle; + + @Column(name="LAST_TIME") + @ApiParam("上一执行时间") + private String lastTime; + + @Column(name="DAYS_IN_ADVANCE") + @ApiParam("创建提前天数") + private String daysInAdvance; + + @Transient + @ApiParam(value="生产线") + private String workCenterCode; + + @Transient + @ApiParam(value="设备类别") + private String equipmentCategory; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java index 9a8c536..888bb7a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_CAUSE") -@Api("PLC配置表") +@Api("mes设备故障原因表") public class MesFaultCause extends BaseBean { @Column(name = "FC_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java index 22a4f2a..06d07d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_METHOD") -@Api("PLC配置表") +@Api("mes设备故障方法表") public class MesFaultMethod extends BaseBean { @Column(name = "FM_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java index 576626b..b3ec52c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_PHENOMENON") -@Api("PLC配置表") +@Api("mes设备故障现象表") public class MesFaultPhenomenon extends BaseBean { @Column(name = "FP_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java new file mode 100644 index 0000000..f406591 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquTaskPlanModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("作业类型") + private Integer taskType; + + @ApiParam("周期(天)") + private Integer taskCycle; + + @ApiParam("上一执行时间") + private String lastTime; + + @ApiParam("创建提前天数") + private String daysInAdvance; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("设备类别") + private String equipmentCategory; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("有效性") + public Integer isValid; + + @ApiParam("是否已删除") + public Integer isDeleted; + + @ApiParam("创建用户") + public String createUser; + + @ApiParam("创建日期") + public String createDatetime; + + @ApiParam("修改人") + public String modifyUser; + + @ApiParam("修改日期") + public String modifyDatetime; + + @ApiParam("作业类型") + private String taskTypeName; + + @ApiParam("设备类别") + private String equipmentCategoryName; + + + public MesEquTaskPlanModel() { + + } + + 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) { + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.taskType = taskType; + this.taskCycle = taskCycle; + this.lastTime = lastTime; + this.daysInAdvance = daysInAdvance; + this.workCenterCode = workCenterCode; + this.equipmentCategory = equipmentCategory; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java index 58d977b..ca5f0ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java @@ -20,7 +20,7 @@ public class MesEquTaskStandardModel implements Serializable { private Integer taskType; @ApiParam("操作项") - private Integer actionItem; + private String actionItem; @ApiParam("操作标准") private String actionStandard; @@ -31,33 +31,42 @@ public class MesEquTaskStandardModel implements Serializable { @ApiParam("生产线") private String workCenterCode; - @ApiParam(value ="组织代码") + @ApiParam("设备类别") + private String equipmentCategory; + + @ApiParam("组织代码") public String organizeCode; - @ApiParam(value = "有效性") + @ApiParam("有效性") public Integer isValid; - @ApiParam(value = "是否已删除") + @ApiParam("是否已删除") public Integer isDeleted; - @ApiParam(value = "创建用户") + @ApiParam("创建用户") public String createUser; - @ApiParam(value = "创建日期") + @ApiParam("创建日期") public String createDatetime; - @ApiParam(value = "修改人") + @ApiParam("修改人") public String modifyUser; - @ApiParam(value = "修改日期") + @ApiParam("修改日期") public String modifyDatetime; + @ApiParam("作业类型") + private String taskTypeName; + + @ApiParam("设备类别") + private String equipmentCategoryName; + public MesEquTaskStandardModel() { } - public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer actionItem, String actionStandard, String actionGuide, String workCenterCode, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, String actionStandard, String actionGuide, 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; @@ -66,6 +75,7 @@ public class MesEquTaskStandardModel implements Serializable { this.actionStandard = actionStandard; this.actionGuide = actionGuide; this.workCenterCode = workCenterCode; + this.equipmentCategory = equipmentCategory; this.organizeCode = organizeCode; this.isValid = isValid; this.isDeleted = isDeleted; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index 63cad36..5e09c06 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -85,6 +85,18 @@ public class MesEquipmentModel implements Serializable { @ApiParam( "修改日期") public String modifyDatetime; + @ApiParam("设备状态") + private String statusName; + + @ApiParam("设备类型") + private String equipmentTypeName; + + @ApiParam("设备类别") + private String equipmentCategoryName; + + @ApiParam("连接类型") + private String connectTypeName; + public MesEquipmentModel() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java index 1d37fff..4a5af7e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java @@ -44,5 +44,8 @@ public class MesWorkOrderButtonModel implements Serializable { @ApiParam("关闭按钮") private boolean closeButton; + @ApiParam("完成按钮") + private boolean completeButton; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java new file mode 100644 index 0000000..33c9dc1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlan; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : 王杰 + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskPlanRepository extends BaseRepository { +}