From b17cf60ac6392e504bfcacd9f587272f30c9794b Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 15 Apr 2020 21:42:54 +0800 Subject: [PATCH 01/10] =?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 02/10] =?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 03/10] =?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 04/10] =?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; } From 10fc6ded8d50d35d24a56e489bce73d5cf58d2db Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 16 Apr 2020 19:26:07 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E3=80=901558=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86-=E6=B3=B0=E5=9B=BD?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java index 921c69f..d7ca7a5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java @@ -17,7 +17,7 @@ import lombok.Data; public class MesWorkOrderModel { @ApiParam("工单号") - @AnnoOutputColumn(required = false) + @AnnoOutputColumn private String orderNo; @ApiParam("物料号") From ec1d8a2ff3a100848081d7e64f6ef72b6d678281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sat, 18 Apr 2020 10:23:40 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/template/BasImportTemplate.java | 79 +++++++++++++++++ .../bean/template/BasImportTemplateDetails.java | 98 ++++++++++++++++++++++ .../pojo/wms/modelbean/BasBeanFieldModel.java | 33 ++++++++ .../BasImportTemplateDetailsRepository.java | 17 ++++ .../repository/BasImportTemplateRepository.java | 17 ++++ 5 files changed, 244 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java new file mode 100644 index 0000000..48936bc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.wms.bean.template; + +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; +import java.util.List; + +/** + * @Description : 导入模板信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-16 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_IMPORT_TEMPLATE") +@Api("导入模板信息") +public class BasImportTemplate extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592889L; + @Column(name="TEMPLATE_CODE") + @ApiParam("模板代码") + private String templateCode; + + @Column(name="TEMPLATE_NAME") + @ApiParam("模板名称") + private String templateName; + + @Column(name="TEMPLATE_DESC") + @ApiParam("模板描述") + private String templateDesc; + + @Column(name="GROUP_NAME") + @ApiParam("分组名称") + private String groupName; + + /** + * 10-单表，20-多表 + */ + @Column(name="IMPORT_TYPE") + @ApiParam(value = "导入类型", example = "0") + private Integer importType; + + /** + * 10-全覆盖，20-差异更新，30-重复不导入 + */ + @Column(name="UPDATE_TYPE") + @ApiParam(value = "更新类型", example = "0") + private Integer updateType; + + @Column(name="UNION_PK") + @ApiParam("联合主键") + private String unionPk; + + @Column(name="RELATION_FIELD") + @ApiParam("关联字段") + private String relationField; + + @Column(name="SCRIPT_NO") + @ApiParam("脚本编号") + private String scriptNo; + + @Transient + @ApiParam("模板明细列表") + private List templateDetailsList; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java new file mode 100644 index 0000000..aa6bba6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java @@ -0,0 +1,98 @@ +package cn.estsh.i3plus.pojo.wms.bean.template; + +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 : siliter.yuan + * @CreateDate : 2020-04-16 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_IMPORT_TEMPLATE_DETAILS") +@Api("导入模板明细信息") +public class BasImportTemplateDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592999L; + @Column(name="TEMPLATE_CODE") + @ApiParam("模板代码") + private String templateCode; + + @Column(name="TABLE_NAME") + @ApiParam("表名称") + private String tableName; + + @Column(name="FIELD_CODE") + @ApiParam("字段英文名称") + private String fieldCode; + + @Column(name="FIELD_ALIAS") + @ApiParam("字段别名") + private String fieldAlias; + + @Column(name="LABEL_CODE") + @ApiParam("标签代码") + private String labelCode; + + @Column(name="LABEL_NAME") + @ApiParam("标签名称") + private String labelName; + + @Column(name="DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + + /** + * 数据格式 文本、整数、小数、日期 + */ + @Column(name="DATA_FORAMT") + @ApiParam("数据格式") + private String dataFormat; + + /** + * 1-是，2-否 + */ + @Column(name="IS_REQUIRE") + @ApiParam(value = "是否必填", example = "0") + private Integer isRequire; + + @Column(name="DECIMAIL_SPLIT") + @ApiParam("十进制分隔符") + private String decimalSplit; + + @Column(name="THOUSANDS_SPLIT") + @ApiParam("千分位分隔符") + private String thousandsSplit; + + // YYYY-MM-DD/DD-MM-YY/YYYY-MM-DD HH:mm:ss + @Column(name="DATE_FORMAT") + @ApiParam("日期格式") + private String dateFormat; + + @Column(name="REMARK") + @ApiParam("备注") + private String remark; + + @Column(name="SEQ") + @ApiParam(value = "序号", example = "0") + private Integer seq; + + @Column(name="MAX_LENGTH") + @ApiParam(value = "最大长度", example = "0") + private Integer maxLength; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java new file mode 100644 index 0000000..ba1b3be --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @description 数据库实例字段模型 + * @author siliter.yuan + * @date 2020/04/16 + */ +@Data +@Api("数据库实例字段模型") +public class BasBeanFieldModel { + + @ApiParam("表明") + private String tableName; + + @ApiParam("字段英文名称") + private String fieldEnName; + + @ApiParam("字段类型") + public String fieldType; + + @ApiParam("字段描述") + private String fieldDesc; + + @ApiParam("实例类名") + public String entityName; + + @ApiParam("实例字段名称") + public String propertyName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateDetailsRepository.java new file mode 100644 index 0000000..31250fa --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 导入模板明细数据操作仓库 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-16 10:00 + * @Modify: + **/ +@Repository +public interface BasImportTemplateDetailsRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateRepository.java new file mode 100644 index 0000000..43201d5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate; +import org.springframework.stereotype.Repository; + +/** + * @Description : 导入模板数据操作仓库 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-16 10:00 + * @Modify: + **/ +@Repository +public interface BasImportTemplateRepository extends BaseRepository { + +} From 0a14b533d7a08d6571b5f954bf9099268d44744b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 18 Apr 2020 11:04:32 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BB=BB=E5=8A=A11659=20=E8=BF=94?= =?UTF-8?q?=E5=B7=A5=E8=BF=94=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/BypassModel.java | 32 ++++++++++++++++++++++ .../estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java | 9 ++++++ 2 files changed, 41 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java new file mode 100644 index 0000000..2e7cfef --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author wangjie + * @date 2020/4/9 18:00 + * @desc + */ +@Data +public class BypassModel { + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("Bypass编码") + private String bypassCode; + + @ApiParam("检测项") + private String businessValue; + + @ApiParam("是否确认，1=已确认，2=未确认") + private String isVerify; + + @ApiParam("生产数据ID") + private Long productDataId; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java index b043598..9672b1d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java @@ -12,6 +12,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; /** @@ -41,4 +42,12 @@ public class PtlAreaRoute extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型") private Integer routeType; + + @Transient + @ApiParam("区域代码") + private String areaName; + + @Transient + @ApiParam("流程名称") + private String routeName; } From 7505087392d42c68fe0b316f265f3e2701c1c79e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 18 Apr 2020 12:09:01 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E3=80=90mes=20=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E9=85=8D=E6=96=B9=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E5=92=8C?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=BB=B4=E6=8A=A4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 +++++++++++++++++++++- .../i3plus/pojo/mes/model/MesPartFormulaModel.java | 43 ++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 10 +++++ .../i3plus/pojo/model/mes/ExcelImportModel.java | 45 +++++++++++++++++++++ .../i3plus/pojo/model/mes/ImportErrorModel.java | 35 ++++++++++++++++ 5 files changed, 178 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.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..ffa26ae 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 @@ -1804,7 +1804,8 @@ public class MesEnumUtil { MES_PROCESS(400, "工序信息"), MES_KPSN_RULE(410, "关键件条码校验规则"), MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"), - MES_PART_BOM_IMPORT(430, "散件BOM导入"); + MES_PART_BOM_IMPORT(430, "散件BOM导入"), + MES_PART_FORMULA_IMPORT(440, "产品配方导入"); private int value; private String description; @@ -4847,4 +4848,47 @@ public class MesEnumUtil { } } + /** + * 配方类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_FORMULA_TYPE { + DEVICE_SEMAPHORE(10, "设备信号"); + + private int value; + private String description; + + PART_FORMULA_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PART_FORMULA_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(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/model/MesPartFormulaModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java new file mode 100644 index 0000000..635c74d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** +* @Description : 生产配方模板 +* @Reference : +* @author: jessica.chen +* @date: 2020/4/16 17:10 +* @Modify: +*/ + +@Data +@Api(value="生产配方模板",description = "生产配方模板") +public class MesPartFormulaModel extends BaseBean { + + private static final long serialVersionUID = 2167743108452607620L; + + @ApiParam(value = "组号") + @AnnoOutputColumn + private String groupNo; + + @ApiParam(value = "组内名称") + @AnnoOutputColumn + private String groupName; + + @ApiParam(value = "原材料物料号") + @AnnoOutputColumn(required = false) + private String partNo; + + @ApiParam(value = "编号") + @AnnoOutputColumn + private String orderNo; + + @ApiParam(value = "下标值") + @AnnoOutputColumn + private Integer index; + +} 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..904ff2f 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 @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; @@ -2400,4 +2401,13 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesPartFormula(MesPartFormula mesPartFormula) { + DdlPackBean packBean = getAllBaseData(mesPartFormula.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesPartFormula.getPartNo(), "partNo", packBean); + DdlPreparedPack.getNumEqualPack(mesPartFormula.getFormulaType(), "formulaType", packBean); + DdlPreparedPack.getStringLikerPack(mesPartFormula.getFormulaContent(), "formulaContent", packBean); + DdlPreparedPack.getNumEqualPack(mesPartFormula.getIsValid(), "isValid", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java new file mode 100644 index 0000000..e0de0f3 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.model.mes; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author: wangjie + * @CreateDate: 2019/8/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("mes导入结果model") +public class ExcelImportModel implements Serializable { + + @ApiParam("结果") + private boolean result; + + @ApiParam("成功行数量") + private int successRowNum; + + @ApiParam("失败行数量") + private int failRowNum; + + @ApiParam("错误信息集合") + private List ImportErrorModels; + + @ApiParam("错误的行号") + private String errorRows; + + @ApiParam("导入数据集合") + private List excelList; + + @ApiParam("导入进度") + private String importSpeed; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java new file mode 100644 index 0000000..85c63bd --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.model.mes; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/8/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("mes导入异常结果model") +public class ImportErrorModel implements Serializable { + + @ApiParam("错误的行号") + private int rowNum; + + @ApiParam("错误数量") + private int errorNum; + + @ApiParam("错误列号") + private String cellNum; + + @ApiParam("错误描述") + private String errorInfo; + +} From 8fe5574c6723f2d9deebb6ea22b05d30d53ed0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 18 Apr 2020 14:26:36 +0800 Subject: [PATCH 09/10] =?UTF-8?q?part=E5=AE=9E=E4=BD=93=E4=B8=AD@Column(na?= =?UTF-8?q?me=20=3D=20"=E4=BA=A7=E5=93=81=E7=94=9F=E4=BA=A7=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B")=E6=94=B9=E4=B8=BA@Column(name=20=3D=20"PPT=5FCODE")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 4995b43..b65531b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -88,8 +88,8 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("产品编码匹配类型") private Integer productMatchType; - @Column(name = "产品生产类型") - @ApiParam("产品类型名称") + @Column(name = "PPT_CODE") + @ApiParam("产品类型代码") private String pptCode; @Column(name = "PART_TRAIT") From 36b4e67020c6f3a780c390355b6de2f7eab92595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sat, 18 Apr 2020 16:01:29 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BB=BA=E6=A8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/template/BasImportTemplate.java | 12 ++++------ .../bean/template/BasImportTemplateDetails.java | 21 ++++++++++++++++- .../pojo/wms/modelbean/BasBeanFieldModel.java | 6 ++++- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 27 ++++++++++++++++++++++ 4 files changed, 56 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java index 48936bc..81f5de7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java @@ -61,18 +61,14 @@ public class BasImportTemplate extends BaseBean{ @ApiParam(value = "更新类型", example = "0") private Integer updateType; - @Column(name="UNION_PK") - @ApiParam("联合主键") - private String unionPk; - - @Column(name="RELATION_FIELD") - @ApiParam("关联字段") - private String relationField; - @Column(name="SCRIPT_NO") @ApiParam("脚本编号") private String scriptNo; + @Column(name="START_ROW") + @ApiParam(value = "起始行", example = "0") + private Integer startRow; + @Transient @ApiParam("模板明细列表") private List templateDetailsList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java index aa6bba6..d45be01 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java @@ -72,7 +72,7 @@ public class BasImportTemplateDetails extends BaseBean{ private Integer isRequire; @Column(name="DECIMAIL_SPLIT") - @ApiParam("十进制分隔符") + @ApiParam("小数点分隔符") private String decimalSplit; @Column(name="THOUSANDS_SPLIT") @@ -95,4 +95,23 @@ public class BasImportTemplateDetails extends BaseBean{ @Column(name="MAX_LENGTH") @ApiParam(value = "最大长度", example = "0") private Integer maxLength; + + @Column(name="RELATION_TABLE") + @ApiParam("关联表名") + private String relationTable; + + @Column(name="RELATION_FIELD") + @ApiParam("关联字段") + private String relationField; + + /** + * 是否主键 1-是，2-否 + */ + @Column(name="IS_PK") + @ApiParam(value = "是否主键", example = "0") + private Integer isPk; + + @Column(name="SHEET_NAME") + @ApiParam("工作薄名称") + private String sheetName; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java index ba1b3be..7b2421c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; import lombok.Data; /** @@ -13,9 +14,12 @@ import lombok.Data; @Api("数据库实例字段模型") public class BasBeanFieldModel { - @ApiParam("表明") + @ApiParam("表名") private String tableName; + @ApiParam("表描述") + private String tableDesc; + @ApiParam("字段英文名称") private String fieldEnName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 745b319..8829dc7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -11,6 +11,8 @@ import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction; import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin; +import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate; +import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; @@ -3082,4 +3084,29 @@ public class WmsHqlPack { return result; } + + /** + * 导入模板信息分页查询条件 + * @param template + * @return + */ + public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result); + DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result); + getStringBuilderPack(template, result); + return result; + } + + /** + * 导入模板明细信息分页查询条件 + * @param details + * @return + */ + public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result); + getStringBuilderPack(details, result); + return result; + } }