From 752476b3dfb5188a262c1ec717bd7eab9e6844ab Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 23 Oct 2019 20:11:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E9=9C=80=E6=B1=821086=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=8C=E7=AC=AC2=E6=AC=A1=E6=8F=90=E4=BA=A4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java | 6 ++++++ .../java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index f25404e..5a14ad7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :设备作业任务明细 @@ -57,5 +59,9 @@ public class MesEquTaskDetail extends BaseBean { @ApiParam("维修标识") private Integer repairFlag; + @Transient + @ApiParam(value ="点检保养记录") + private List equTaskStandardRecordList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java index d93bbd5..e26b0c3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java @@ -31,7 +31,7 @@ import java.util.List; @Api("用户信息model") public class EquTaskNotifyUserModel extends BaseBean { - @ApiParam(value ="人员ID") + @ApiParam(value ="账户ID") private Long userId; @Column(name="USER_NAME_RDD") From 09cff08e1e1b04ad5f2f225ecffbe6c77dd5042f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 23 Oct 2019 20:59:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E9=9C=80=E6=B1=821086=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=8C=E7=AC=AC2=E6=AC=A1=E6=8F=90=E4=BA=A4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 893994e..15ae3e1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -330,7 +330,7 @@ public class MesEnumUtil { public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN { EMAIL(10, "邮件"), - USERPHONE(10, "手机号"); + USERPHONE(20, "手机号"); private int value; private String description; From 0c016485518e4fb08bfee0c0e963afefef4b13b1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 24 Oct 2019 13:25:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1088?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesEquTaskDetail.java | 21 ++++++- .../pojo/mes/bean/MesEquTaskRepairRecord.java | 68 ++++++++++++++++++++++ .../MesEquTaskRepairRecordRepository.java | 16 +++++ 3 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index 5a14ad7..dfd7e1b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -60,8 +60,27 @@ public class MesEquTaskDetail extends BaseBean { private Integer repairFlag; @Transient - @ApiParam(value ="点检保养记录") + @ApiParam(value = "点检保养记录") private List equTaskStandardRecordList; + @Transient + @ApiParam(value = "工位") + private String workCellCode; + + @Transient + @ApiParam(value = "生产线") + private String workCenterCode; + + @Transient + @ApiParam(value = "故障现象") + private String fpCode; + + @Transient + @ApiParam(value = "故障原因") + private String fcCode; + + @Transient + @ApiParam(value = "处理方法") + private String fmCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java new file mode 100644 index 0000000..f5720a9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java @@ -0,0 +1,68 @@ +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; + +/** + * @Description :设备维修作业记录 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_TASK_REPAIR_RECORD") +@Api("设备维修作业记录") +public class MesEquTaskRepairRecord extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("作业任务编号") + private String taskNo; + + @Column(name = "TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name = "FP_CODE") + @ApiParam("故障现象") + private String fpCode; + + @Column(name = "FC_CODE") + @ApiParam("故障原因") + private String fcCode; + + @Column(name = "FM_CODE") + @ApiParam("处理方法") + private String fmCode; + + @Column(name = "FINAL_RESULT") + @ApiParam("整体结果") + private Integer finalResult; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.java new file mode 100644 index 0000000..f4c1308 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.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.MesEquTaskRepairRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskRepairRecordRepository extends BaseRepository { +}