From bacab3fb88a7fdba2ea0fb182f74148016502f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 20 Mar 2020 10:54:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90MES=5F=E6=96=B0=E5=A2=9E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=B7=A5=E8=A3=85=E5=85=B3=E7=B3=BB=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E8=A3=85=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95pojo=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 74 ++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesEquipmentTooling.java | 74 ++++++++++++++++++++ .../pojo/mes/bean/MesToolingActionRecord.java | 79 ++++++++++++++++++++++ .../repository/MesEquipmentToolingRepository.java | 17 +++++ .../MesToolingActionRecordRepository.java | 17 +++++ 5 files changed, 261 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentToolingRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingActionRecordRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index ea58f6e..94d1b28 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -3097,4 +3097,78 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * mes_设备工装类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EQUIPMENT_TOOLING_TOOLING_TYPE { + + WORK_CLOTHES(10, "工装"), + CHECKING_TOOL(20, "检具"), + MOULD(30, "模具"); + + private int value; + private String description; + + EQUIPMENT_TOOLING_TOOLING_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * mes_工装操作记录表的操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_TYPE { + + REPLACE(10, "更换"), + WAREHOUSING(20, "入库"), + RECEIVE(30, "领用"); + + private int value; + private String description; + + ACTION_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java new file mode 100644 index 0000000..2df7f2e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java @@ -0,0 +1,74 @@ +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 java.io.Serializable; + +/** + * @Description :MES_设备工装关系 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-03-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQUIPMENT_TOOLING") +@Api("MES_设备工装关系") +public class MesEquipmentTooling extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971369479107711L; + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "TOOLING_NO") + @ApiParam("工装编号") + private String toolingNo; + + @Column(name = "TOOLING_CODE") + @ApiParam("工装代码") + private String toolingCode ; + + @Column(name = "TOOLING_NAME") + @ApiParam("工装名称") + private String toolingName; + + @Column(name = "TOOLING_TYPE") + @ApiParam("工装类型") + private Integer toolingType; + + @Column(name = "USE_COUNT") + @ApiParam("使用次数") + private Integer useCount; + + @Column(name = "START_TIME") + @ApiParam("更换开始时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("更换结束时间") + private String endTime; + + + public Integer getToolingType() { + return this.toolingType == null ? 0 : this.toolingType; + } + + public Integer getUseCount() { + return this.useCount == null ? 0 : this.useCount; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java new file mode 100644 index 0000000..ee236fc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java @@ -0,0 +1,79 @@ +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 java.io.Serializable; + +/** + * @Description :MES_工装操作记录 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-03-20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TOOLING_ACTION_RECORD") +@Api("MES_工装操作记录") +public class MesToolingActionRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971369479107712L; + + @Column(name = "TOOLING_NO") + @ApiParam("工装编号") + private String toolingNo; + + @Column(name = "ACTION_TYPE") + @ApiParam("操作类型") + private Integer actionType; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "TOOLING_CODE") + @ApiParam("工装代码") + private String toolingCode ; + + @Column(name = "TOOLING_NAME") + @ApiParam("工装名称") + private String toolingName; + + @Column(name = "TOOLING_TYPE") + @ApiParam("工装类型") + private Integer toolingType; + + @Column(name = "USE_COUNT") + @ApiParam("使用次数") + private Integer useCount; + + @Column(name = "START_TIME") + @ApiParam("更换开始时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("更换结束时间") + private String endTime; + + + public Integer getToolingType() { + return this.toolingType == null ? 0 : this.toolingType; + } + + public Integer getUseCount() { + return this.useCount == null ? 0 : this.useCount; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentToolingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentToolingRepository.java new file mode 100644 index 0000000..173e73a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentToolingRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentTooling; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentToolingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingActionRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingActionRecordRepository.java new file mode 100644 index 0000000..54ae9a0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingActionRecordRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentTooling; +import cn.estsh.i3plus.pojo.mes.bean.MesToolingActionRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesToolingActionRecordRepository extends BaseRepository { +}