From b17cf60ac6392e504bfcacd9f587272f30c9794b Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 15 Apr 2020 21:42:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1571=20?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=8A=A5=E5=8A=9F=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 16 ++++++++++++++++ .../estsh/i3plus/pojo/mes/model/EsProductDataModule.java | 1 - .../cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 13 +++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 5d8e27c..3ceba82 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -85,4 +85,20 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "PRODUCE_CATEGORY_CODE") + @ApiParam("产品位置") + private String produceCategoryCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "JIT_LOT_NO") + @ApiParam("JIT队列批次") + private String jitLotNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java index bd38834..151b5ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; -//import com.sun.tools.javac.util.List; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index a624677..8667491 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -79,6 +79,11 @@ public class QueueOrderModel implements Serializable { @ApiParam("产品类型名称") private String pptCode; + @ApiParam("JIT队列批次") + private String jitLotNo; + @ApiParam("vin") + private String vinCode; + public QueueOrderModel() { } @@ -234,4 +239,12 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.organizeCode = organizeCode; } + + public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode) { + this.id = id; + this.queueGroupNo = queueGroupNo; + this.jitLotNo = jitLotNo; + this.vinCode = vinCode; + this.organizeCode = organizeCode; + } } From 89a9946432da740db9a2c100b0460c69b6d767a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 16 Apr 2020 11:32:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 146 +++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesEquFaultCause.java | 44 +++++++ .../i3plus/pojo/mes/bean/MesEquFaultMethod.java | 44 +++++++ .../pojo/mes/bean/MesEquFaultPhenomenon.java | 44 +++++++ .../estsh/i3plus/pojo/mes/bean/MesEquipment.java | 4 + .../estsh/i3plus/pojo/mes/bean/MesFaultCause.java | 9 +- .../estsh/i3plus/pojo/mes/bean/MesFaultMethod.java | 9 +- .../i3plus/pojo/mes/bean/MesFaultPhenomenon.java | 15 +-- .../cn/estsh/i3plus/pojo/mes/bean/MesLocate.java | 44 +++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 42 +++--- .../i3plus/pojo/mes/bean/MesSpActionRecord.java | 52 ++++++++ .../estsh/i3plus/pojo/mes/bean/MesSparePart.java | 52 ++++++++ .../i3plus/pojo/mes/bean/MesSparePartDetail.java | 69 ++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesZones.java | 40 ++++++ .../mes/repository/MesEquFaultCauseRepository.java | 14 ++ .../repository/MesEquFaultMethodRepository.java | 14 ++ .../MesEquFaultPhenomenonRepository.java | 14 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 75 ++++++++++- 18 files changed, 687 insertions(+), 44 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java 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 66938b2..85c0088 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 @@ -4847,4 +4847,150 @@ public class MesEnumUtil { } } + /** + * 作业校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_MODEL { + NO_CHECK(10, "不校验"), + CHECK(20, "校验设备就绪信号"); + + private int value; + private String description; + + CHECK_MODEL(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; + } + } + + /** + * PLC类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_TYPE { + STANDARD(10, "标准"), + EQU_OPERATION_SIGNLE(20, "设备作业信号"); + + private int value; + private String description; + + PLC_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; + } + } + + /** + * 备件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SP_TYPE { + + VULNERABLE_PART("10", "易损件"), + KEY_PART("20", "关键件"), + STANDARD_PART("30", "标准件"); + + private String value; + private String description; + + SP_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 备件明细状态 + */ + /** + * 备件操作记录-操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SPARE_PART_DETAIL_STATUS{ + IN_LIBRARY(10, "在库"), + USE(20, "领用"), + SCRAPED(30, "报废"); + + private int value; + private String description; + + SPARE_PART_DETAIL_STATUS(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/MesEquFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java new file mode 100644 index 0000000..d631542 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java @@ -0,0 +1,44 @@ +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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_FAULT_CAUSE") +@Api("MES_设备故障原因") +public class MesEquFaultCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825283741375978L; + @Column(name = "FC_CODE") + @ApiParam("故障原因代码") + private String fcCode; + + @Column(name = "FC_NAME") + @ApiParam("故障原因描述") + private String fcName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java new file mode 100644 index 0000000..2d65481 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java @@ -0,0 +1,44 @@ +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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_FAULT_METHOD") +@Api("MES_设备故障处理措施") +public class MesEquFaultMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1366849727309967125L; + @Column(name = "FM_CODE") + @ApiParam("故障方法代码") + private String fmCode; + + @Column(name = "FM_NAME") + @ApiParam("故障方法描述") + private String fmName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java new file mode 100644 index 0000000..44fcf64 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java @@ -0,0 +1,44 @@ +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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_FAULT_PHENOMENON") +@Api("MES_设备故障现象") +public class MesEquFaultPhenomenon extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4373435091738791300L; + @Column(name = "FP_CODE") + @ApiParam("故障现象代码") + private String fpCode; + + @Column(name = "FP_NAME") + @ApiParam("故障现象描述") + private String fpName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index 15f8628..b33ac9b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -81,6 +81,10 @@ public class MesEquipment extends BaseBean implements Serializable { @ApiParam("连接类型") private Integer connectType; + @Column(name = "CHECK_MODEL") + @ApiParam("作业校验模式") + private Integer checkModel; + @Column(name = "MEMO") @ApiParam("备注") private String memo; 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 213bebc..a78fc9f 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 @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_CAUSE") -@Api("mes设备故障原因表") +@Api("mes故障原因表") public class MesFaultCause extends BaseBean implements Serializable { private static final long serialVersionUID = 1229825197241375978L; @@ -38,7 +38,8 @@ public class MesFaultCause extends BaseBean implements Serializable { @ApiParam("故障原因描述") private String fcName; - @Column(name = "PARENT_FC_CODE") - @ApiParam("父阶原因代码") - private String parentFcCode; + // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段 + @Column(name = "FC_TYPE") + @ApiParam("故障原因类型编码") + private String fcType; } 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 7cdfd96..4a0e758 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 @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_METHOD") -@Api("mes设备故障方法表") +@Api("MES_故障处理措施") public class MesFaultMethod extends BaseBean implements Serializable { private static final long serialVersionUID = -1366849757709967125L; @@ -38,7 +38,8 @@ public class MesFaultMethod extends BaseBean implements Serializable { @ApiParam("故障方法描述") private String fmName; - @Column(name = "PARENT_FM_CODE") - @ApiParam("父阶故障代码") - private String parentFmCode; + // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段 + @Column(name = "FM_TYPE") + @ApiParam("故障措施类型编码") + private String fmType; } 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 9c36828..d66b12b 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 @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_PHENOMENON") -@Api("mes设备故障现象表") +@Api("mes故障现象表") public class MesFaultPhenomenon extends BaseBean implements Serializable { private static final long serialVersionUID = 4373435095236791300L; @@ -38,15 +38,8 @@ public class MesFaultPhenomenon extends BaseBean implements Serializable { @ApiParam("故障现象描述") private String fpName; - @Column(name = "PARENT_FP_CODE") - @ApiParam("父阶现象代码") - private String parentFpCode; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - + // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段 @Column(name = "FP_TYPE") - @ApiParam("故障现象类型") - private Integer fpType; + @ApiParam("故障现象类型编码") + private String fpType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java new file mode 100644 index 0000000..52d1380 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java @@ -0,0 +1,44 @@ +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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_LOCATE") +@Api("MES_库位") +public class MesLocate extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825295729375298L; + @Column(name = "LOCATE_NO") + @ApiParam("库位编号") + private String locateNo; + + @Column(name = "LOCATE_NAME") + @ApiParam("库位名称") + private String locateName; + + @Column(name = "ZONE_NO") + @ApiParam("存储区代码") + private String zoneNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index dc419c2..4d2fc73 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -54,6 +54,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("通道") private String channel; + @Column(name = "DEVICE") + @ApiParam("终端") + private String device; + @Column(name = "TAG_NAME") @ApiParam("标签名称") private String tagName; @@ -70,14 +74,26 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("分组名称") private String groupName; - @Column(name = "DEVICE") - @ApiParam("驱动") - private String device; + @Column(name = "ANALYSIS_RULE") + @ApiParam("解析规则") + private String analysisRule; + + @Column(name = "IS_ANALYSIS") + @ApiParam("是否解析") + private String isAnalysis; + + @Column(name = "PLC_CFG") + @ApiParam("PLC配置") + private String plcCfg; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode; + @Column(name = "WORK_CENTER_CODE") @ApiParam("生产线") private String workCenterCode; @@ -86,18 +102,6 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("工位") private String workCellCode; - @Column(name = "PLC_CFG") - @ApiParam("PLC的值的设定") - private String plcCfg; - - @Column(name = "ANALYSIS_RULE") - @ApiParam("解析规则") - private String analysisRule; - - @Column(name = "IS_ANALYSIS") - @ApiParam("是否解析") - private String isAnalysis; - @Column(name = "FEED_VALUE") @ApiParam("反馈值") private String feedValue; @@ -114,6 +118,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("空间索引") private Integer nameSpaceIndex = 2; + @Column(name = "PLC_TYPE") + @ApiParam("PLC类型") + private Integer plcType; + @Column(name = "USER_NAME") @ApiParam("用户名") private String userName; @@ -130,10 +138,6 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("OPC值") private List opcValue; - @Column(name = "TOOLING_CODE ") - @ApiParam("工装代码") - private String toolingCode; - @Transient @ApiParam("标签数据") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java new file mode 100644 index 0000000..e331486 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java @@ -0,0 +1,52 @@ +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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SP_ACTION_RECORD") +@Api("MES_备件操作记录") +public class MesSpActionRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1222647293041375978L; + @Column(name = "SP_NO") + @ApiParam("备件编号") + private String spNo; + + @Column(name = "ACTION_TYPE") + @ApiParam("操作类型") + private Integer actionType; + + @Column(name = "SP_CODE") + @ApiParam("备件代码") + private String spCode; + + @Column(name = "SP_NAME") + @ApiParam("备件名称") + private String spName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java new file mode 100644 index 0000000..793e49e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java @@ -0,0 +1,52 @@ +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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SPARE_PART") +@Api("MES_备件表") +public class MesSparePart extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825293041375978L; + @Column(name = "SP_CODE") + @ApiParam("备件代码") + private String spCode; + + @Column(name = "SP_NAME") + @ApiParam("备件名称") + private String spName; + + @Column(name = "SP_TYPE") + @ApiParam("备件类型") + private String spType; + + @Column(name = "SP_CATEGORY") + @ApiParam("备件类别") + private String spCategory; + + @Column(name = "USEFUL_LIFE") + @ApiParam("有效期") + private Integer usefulLife; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java new file mode 100644 index 0000000..aefb4cf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java @@ -0,0 +1,69 @@ +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; +import java.util.Date; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SPARE_PART_DETAIL") +@Api("MES_备件明细") +public class MesSparePartDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825292839375978L; + @Column(name = "SP_NO") + @ApiParam("备件编号") + private String spNo; + + @Column(name = "SP_CODE") + @ApiParam("备件代码") + private String spCode; + + @Column(name = "SP_NAME") + @ApiParam("备件名称") + private String spName; + + @Column(name = "ZONE_NO") + @ApiParam("存储区代码") + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam("库位编号") + private String locateNo; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "QTY") + @ApiParam("数量") + private Integer qty; + + @Column(name="RECEIVE_DATE") + @ApiParam(value ="接收日期") + private Date receiveDate; + + @Column(name="ENABLE_DATE") + @ApiParam(value ="启用日期") + private Date enableDate; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java new file mode 100644 index 0000000..845061d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java @@ -0,0 +1,40 @@ +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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ZONES") +@Api("MES_存储区") +public class MesZones extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825293041375298L; + @Column(name = "ZONE_NO") + @ApiParam("存储区代码") + private String zoneNo; + + @Column(name = "ZONE_NAME") + @ApiParam("存储区名称") + private String zoneName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java new file mode 100644 index 0000000..550230a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquFaultCause; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:08 + * @Modify: + **/ +public interface MesEquFaultCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java new file mode 100644 index 0000000..9c61d73 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquFaultMethod; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:07 + * @Modify: + **/ +public interface MesEquFaultMethodRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java new file mode 100644 index 0000000..dd0473e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquFaultPhenomenon; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:05 + * @Modify: + **/ +public interface MesEquFaultPhenomenonRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 2872139..a66acb5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1324,8 +1324,50 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) { DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmName(), "fmName", packBean); } - if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) { - DdlPreparedPack.getStringLikerPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean); + if (!StringUtils.isEmpty(mesFaultMethod.getFmType())) { + DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmType(), "fmType", packBean); + } + return packBean; + } + + /** + * MES 设备故障处理措施查询条件封装 + * + * @param mesEquFaultMethod + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquFaultMethod(MesEquFaultMethod mesEquFaultMethod, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultMethod, organizeCode); + if (!StringUtils.isEmpty(mesEquFaultMethod.getFmCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getFmCode(), "fmCode", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultMethod.getFmName())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getFmName(), "fmName", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultMethod.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getEquipmentCode(), "equipmentCode", packBean); + } + return packBean; + } + + /** + * MES 设备故障原因查询条件封装 + * + * @param mesEquFaultCause + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquFaultCause(MesEquFaultCause mesEquFaultCause, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultCause, organizeCode); + if (!StringUtils.isEmpty(mesEquFaultCause.getFcCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getFcCode(), "fcCode", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultCause.getFcName())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getFcName(), "fcName", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultCause.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getEquipmentCode(), "equipmentCode", packBean); } return packBean; } @@ -1345,8 +1387,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultCause.getFcName())) { DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcName(), "fcName", packBean); } - if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) { - DdlPreparedPack.getStringLikerPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean); + if (!StringUtils.isEmpty(mesFaultCause.getFcType())) { + DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcType(), "fcType", packBean); } return packBean; } @@ -1366,8 +1408,29 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) { DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); } - if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) { - DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean); + if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpType())) { + DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpType(), "fpType", packBean); + } + return packBean; + } + + /** + * MES 设备故障现象查询条件封装 + * + * @param mesEquFaultPhenomenon + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquFaultPhenomenon(MesEquFaultPhenomenon mesEquFaultPhenomenon, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultPhenomenon, organizeCode); + if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getFpCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getFpCode(), "fpCode", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getFpName())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getFpName(), "fpName", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getEquipmentCode(), "equipmentCode", packBean); } return packBean; } From e464b4d6991d0cdb3ccc9cc52e6ea30feb6297ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 16 Apr 2020 13:41:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=A4=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E5=AE=9E?= =?UTF-8?q?=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 76 ---------------------- .../cn/estsh/i3plus/pojo/mes/bean/MesLocate.java | 44 ------------- .../i3plus/pojo/mes/bean/MesSpActionRecord.java | 52 --------------- .../estsh/i3plus/pojo/mes/bean/MesSparePart.java | 52 --------------- .../i3plus/pojo/mes/bean/MesSparePartDetail.java | 69 -------------------- .../cn/estsh/i3plus/pojo/mes/bean/MesZones.java | 40 ------------ 6 files changed, 333 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java 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 85c0088..003c779 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 @@ -4917,80 +4917,4 @@ public class MesEnumUtil { } } - /** - * 备件类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SP_TYPE { - - VULNERABLE_PART("10", "易损件"), - KEY_PART("20", "关键件"), - STANDARD_PART("30", "标准件"); - - private String value; - private String description; - - SP_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * 备件明细状态 - */ - /** - * 备件操作记录-操作类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SPARE_PART_DETAIL_STATUS{ - IN_LIBRARY(10, "在库"), - USE(20, "领用"), - SCRAPED(30, "报废"); - - private int value; - private String description; - - SPARE_PART_DETAIL_STATUS(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/MesLocate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java deleted file mode 100644 index 52d1380..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java +++ /dev/null @@ -1,44 +0,0 @@ -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: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_LOCATE") -@Api("MES_库位") -public class MesLocate extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1229825295729375298L; - @Column(name = "LOCATE_NO") - @ApiParam("库位编号") - private String locateNo; - - @Column(name = "LOCATE_NAME") - @ApiParam("库位名称") - private String locateName; - - @Column(name = "ZONE_NO") - @ApiParam("存储区代码") - private String zoneNo; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java deleted file mode 100644 index e331486..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java +++ /dev/null @@ -1,52 +0,0 @@ -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: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SP_ACTION_RECORD") -@Api("MES_备件操作记录") -public class MesSpActionRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1222647293041375978L; - @Column(name = "SP_NO") - @ApiParam("备件编号") - private String spNo; - - @Column(name = "ACTION_TYPE") - @ApiParam("操作类型") - private Integer actionType; - - @Column(name = "SP_CODE") - @ApiParam("备件代码") - private String spCode; - - @Column(name = "SP_NAME") - @ApiParam("备件名称") - private String spName; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java deleted file mode 100644 index 793e49e..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java +++ /dev/null @@ -1,52 +0,0 @@ -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: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SPARE_PART") -@Api("MES_备件表") -public class MesSparePart extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1229825293041375978L; - @Column(name = "SP_CODE") - @ApiParam("备件代码") - private String spCode; - - @Column(name = "SP_NAME") - @ApiParam("备件名称") - private String spName; - - @Column(name = "SP_TYPE") - @ApiParam("备件类型") - private String spType; - - @Column(name = "SP_CATEGORY") - @ApiParam("备件类别") - private String spCategory; - - @Column(name = "USEFUL_LIFE") - @ApiParam("有效期") - private Integer usefulLife; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java deleted file mode 100644 index aefb4cf..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java +++ /dev/null @@ -1,69 +0,0 @@ -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; -import java.util.Date; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SPARE_PART_DETAIL") -@Api("MES_备件明细") -public class MesSparePartDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1229825292839375978L; - @Column(name = "SP_NO") - @ApiParam("备件编号") - private String spNo; - - @Column(name = "SP_CODE") - @ApiParam("备件代码") - private String spCode; - - @Column(name = "SP_NAME") - @ApiParam("备件名称") - private String spName; - - @Column(name = "ZONE_NO") - @ApiParam("存储区代码") - private String zoneNo; - - @Column(name = "LOCATE_NO") - @ApiParam("库位编号") - private String locateNo; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "QTY") - @ApiParam("数量") - private Integer qty; - - @Column(name="RECEIVE_DATE") - @ApiParam(value ="接收日期") - private Date receiveDate; - - @Column(name="ENABLE_DATE") - @ApiParam(value ="启用日期") - private Date enableDate; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java deleted file mode 100644 index 845061d..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java +++ /dev/null @@ -1,40 +0,0 @@ -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: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ZONES") -@Api("MES_存储区") -public class MesZones extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1229825293041375298L; - @Column(name = "ZONE_NO") - @ApiParam("存储区代码") - private String zoneNo; - - @Column(name = "ZONE_NAME") - @ApiParam("存储区名称") - private String zoneName; -} From 280385eb2081d5c8074401c676e0876beaa572bb Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 16 Apr 2020 18:59:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[bug:=208092=20SOP=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 20 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesProcess.java | 13 +++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 9 +++++---- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 3ceba82..040228e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -58,6 +58,26 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("特殊批次") private String fixLotNo; + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("原材料物料名称") + private String itemPartName; + + @Column(name = "ITEM_QTY") + @ApiParam("原材料用量") + private String itemQty; + + @Column(name = "ITEM_UNIT") + @ApiParam("原材料单位") + private String itemUnit; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + @Column(name = "ACTION_USER") @ApiParam("操作人") private String actionUser; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java index bc05708..661059a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -37,4 +38,16 @@ public class MesProcess extends BaseBean implements Serializable { @Column(name = "PROCESS_NAME") @ApiParam("工序名称") private String processName; + + @Transient + @ApiParam("生产线代码") + private String workCenterCode; + + @Transient + @ApiParam("工位代码") + private String workCellCode; + + @Transient + @ApiParam("流程代码") + private String routeCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index bea56af..a0a107d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -47,4 +44,8 @@ public class MesRoute extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型 10-扫描类型 20-监控类型") private Integer routeType; + + @Transient + @ApiParam("生产线") + private String workCenterCode; }