From 037e898cd262fa06a286e155320b4ca667a22ba5 Mon Sep 17 00:00:00 2001 From: songss Date: Mon, 28 Sep 2020 19:38:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A7=E5=88=B6=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesControlPlan.java | 55 ++++++++++ .../i3plus/pojo/mes/bean/MesQualityStandard.java | 118 +++++++++++++++++++++ .../pojo/mes/model/MesDbCheckRecordModel.java | 11 +- .../pojo/mes/model/MesProductDataDefectModel.java | 9 ++ .../mes/repository/MesControlPlanRepository.java | 12 +++ .../repository/MesQualityStandardRepository.java | 12 +++ 6 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java new file mode 100644 index 0000000..4a3b70e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: MES控制计划-主表 + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTROL_PLAN") +@Api("中航控制计划主表") +public class MesControlPlan extends BaseBean implements Serializable { + //1. 主表字段：“产线”、“产品”、“客户”、“版本号”、“是否生效”、“状态（编辑中、待审核、已审核）”组成。（主表命名“控制计划”） + private static final long serialVersionUID = 1454433409471781390L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + +// @Column(name = "WORK_CELL_CODE") +// @ApiParam("工作单元代码") +// private String workCellCode; + + @Column(name = "product_name") + @ApiParam("产品名称") + private String productName; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "VERSION") + @ApiParam("版本号") + private String version; + + @Column(name = "EDIT_TYPE") + @ApiParam("编辑状态") + private Integer editType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java new file mode 100644 index 0000000..d8fbcef --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -0,0 +1,118 @@ +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.math.BigDecimal; + +/** + * @Description: MES质量标准-明细表（主表：控制计划MES_CONTROL_PLAN） + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUALITY_STANDARD") +@Api("中航质量标准明细表") +public class MesQualityStandard extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1454433409471781390L; + + @Column(name = "CONTROL_PLAN_ID") + @ApiParam("控制计划表主键ID") + private Long controlPlanId; + + @Column(name = "VERSION") + @ApiParam("版本") + private String version; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer CHECK_TYPE; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Column(name = "IS_CONCESSION") + @ApiParam("是否允许让步") + private String isConcession; + + @Column(name = "CHECK_INTERVAL") + @ApiParam("间隔时间") + private String checkInterval; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @Column(name = "NUMBER_FLAG") + @ApiParam("个数标识") + private String numberFlag; + + @Column(name = "QTY") + @ApiParam("检测数量") + private Integer qty; + + //任务单类型,动态枚举 + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String CHECK_ORDER_TYPE; + + //数据来源：10=手工录入，20=PLC，30=DB + @Column(name = "DATA_SOURCE") + @ApiParam("数据来源") + private String DATA_SOURCE; + + //检验值类型：10=字符串，20=数值 + @Column(name = "CHECK_VALUE_TYPE") + @ApiParam("检验值类型") + private String CHECK_VALUE_TYPE; + + @Column(name = "DIFFERENCE_MAX_LIMIT") + @ApiParam("公差上限") + private BigDecimal differenceMaxLimit; + + @Column(name = "DIFFERENCE_MIN_LIMIT") + @ApiParam("公差下限") + private BigDecimal differenceMinLimit; + + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测项") + private Integer IS_KEY_CHECK_ITEM; + + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String CHECK_CFG_NO; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java index 1fa374a..5d5f06c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java @@ -10,6 +10,9 @@ import lombok.Data; */ @Data public class MesDbCheckRecordModel { + @ApiParam("主键") + private Long id; + @ApiParam("过程条码") private String serialNumber; @@ -25,11 +28,15 @@ public class MesDbCheckRecordModel { @ApiParam("缺陷原因") private String defectDesc; - public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String defectType, String defectDesc) { + @ApiParam("生产记录表主键ID") + private Long productDataId; + + public MesDbCheckRecordModel(Long id, String serialNumber, String partNo, String partDesc, String defectDesc, Long productDataId) { + this.id = id; this.serialNumber = serialNumber; this.partNo = partNo; this.partDesc = partDesc; - this.defectType = defectType; this.defectDesc = defectDesc; + this.productDataId = productDataId; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java index fec884f..d825602 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java @@ -41,4 +41,13 @@ public class MesProductDataDefectModel { this.defectDesc = defectDesc; this.offlineTime = offlineTime; } + + public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String defectDesc, String offlineTime) { + this.orderNo = orderNo; + this.partNo = partNo; + this.partDesc = partDesc; + this.productSn = productSn; + this.defectDesc = defectDesc; + this.offlineTime = offlineTime; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java new file mode 100644 index 0000000..ab6c93c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesControlPlan; + +/** + * @Description: + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +public interface MesControlPlanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java new file mode 100644 index 0000000..0693f9c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQualityStandard; + +/** + * @Description: + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +public interface MesQualityStandardRepository extends BaseRepository { +}