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 d513d0d..0a084aa 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 @@ -3101,8 +3101,77 @@ public class MesEnumUtil { return tmp; } } + /** + * mes-pcn 审理质检单类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PCN_QC_ORDER_TYPE{ + INCOMING_TYPE(10,"来料质检任务单"), + COOPERATION_TYPE(20,"外协件质检任务单"); + + private Integer value; + private String description; + + MES_PCN_QC_ORDER_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer 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; + } + } /** + * mes-pcn 审理单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PCN_AUDIT_STATUS{ + WAIT_AUDIT ("0","待审理"), + CONDUCT_AUDIT("1","审理中"), + COMPLETE_AUDIT("2","审理完毕"); + + private String value; + private String description; + + MES_PCN_AUDIT_STATUS(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; + } + } + /** * mes工步类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectTypeAudit.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectTypeAudit.java new file mode 100644 index 0000000..66b3a90 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectTypeAudit.java @@ -0,0 +1,159 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.model.DefectTypeHandleModel; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.util.List; + +/** + * @author FutureSoldiers + * @create 2021-08-16 14:09 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "Mes_DEFECT_TYPE_AUDIT") +@Api("MES_不合格品审理单") +public class MesDefectTypeAudit extends BaseBean { + private static final long serialVersionUID = 2462824203612421416L; + + @Column(name="DEPARTMENT_NAME") + @ApiParam(value ="部门名称") + private String departmentName; + + @Column(name="DEPARTMENT_CODE") + @ApiParam(value ="部门代码") + private String departmentCode; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "RECEIVE_DATE") + @ApiParam("收货日期") + private String receiveDate; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("提交数量") + private Double qty = 0D; + + @Column(name = "SAMPLE_QTY") + @ApiParam("检验数量") + private double sampleQty; + + @Column(name = "FAIL_QTY") + @ApiParam("不合格数量") + private Double failQty; + + @Column(name = "FAIL_REASON") + @ApiParam("不合格原因") + private String failReason; + + @Column(name = "QC_USER") + @ApiParam("检验员") + private String qcUser; + + @Column(name = "QC_DATE") + @ApiParam(value = "检验日期") + private String qcDate; + + @Column(name = "QC_TIME") + @ApiParam(value = "检验时间") + private String qcTime; + + @Column(name = "STO_NO") + @ApiParam(value = "炉批号") + private String stono; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工位") + private String workCellCode; + + @Column(name = "SRC_LOT_NO") + @ApiParam(value = "收货批次") + private String srcLotNo; + + + @ApiParam(value = "退回数量") + private String returnedQty; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "产线") + private String workCenterCode; + + @Column(name = "CUSTOMER") + @ApiParam(value = "客户") + private String customer; + + /** + * 0 待审理 1 审理中 2 审理完毕 + */ + @Column(name = "AUDIT_STATUS") + @ApiParam(value = "审理状态") + private String auditStatus; + + /** + * 10 供应商质量问题报告 20 原材料不合格审理单 30 自制件不合格审理单 40 客户退回不合格审理单 + */ + @Column(name = "AUDIT_ORDER_TYPE") + @ApiParam("审理单类型") + private Integer auditOrderType; + + @Column(name = "REPEAT_HAPPEN") + @ApiParam(value = "是否重复发生 1 是 2 否") + private String repeatHappen; + + @Column(name = "SUPPLIER_MEASURES") + @ApiParam(value = "供应商遏制措施") + private String supplierMeasures; + + @Column(name = "REASON") + @ApiParam(value = "原因分析") + private String reason; + + @Column(name = "CORRECT_METHOD") + @ApiParam(value = "纠正措施") + private String correctMethod; + + @Column(name = "COMPLATE_DATETIME") + @ApiParam(value = "完成时间") + private String complateDatetime; + + @Column(name = "DEFECT_TYPE_HANDLE") + @ApiParam(value = "不合格品处理") + private String defectTypeHandle; + + @Transient + @ApiParam(value = "所有不合格品处理") + private List defectTypeHandles; + + @Transient + @ApiParam(value = "质检员/日期") + private String qcUserDate; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderReject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderReject.java new file mode 100644 index 0000000..285104b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderReject.java @@ -0,0 +1,128 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @author FutureSoldiers + * @create 2021-08-12 14:45 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "Mes_Qc_Order_Reject") +@Api("MES_检验不合格审批单") +public class MesQcOrderReject extends BaseBean { + private static final long serialVersionUID = 2462824203686021416L; + + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "QC_ORDER_NO") + @ApiParam("检验单号") + private String qcOrderNo; + + @Column(name = "RECEIVE_DATE") + @ApiParam("收货日期") + private String receiveDate; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("收货数量") + private Double qty = 0D; + + @Column(name = "SAMPLE_QTY") + @ApiParam("检验数量") + private double sampleQty; + + @Column(name = "STO_NO") + @ApiParam("炉批号") + private String stono; + + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "SRC_LOT_NO") + @ApiParam("收货批次") + private String srcLotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String checkOrderType; + + // 10 来料任务质检单 20 外协件任务质检单 + @Column(name = "QC_ORDER_TYPE") + @ApiParam("质检单类型") + private Integer qcOrderType; + + @Column(name = "IF_QUALIFIED ") + @ApiParam("是否合格") + private String ifQualified; + + @Column(name = "FAIL_QTY") + @ApiParam("不合格数量") + private Double failQty; + + + @Column(name = "FAIL_REASON") + @ApiParam("不合格原因") + private String failReason; + + @Column(name = "QUALITY_ENGINEER") + @ApiParam("质量工程师") + private String qualityEngineer; + + + @Column(name = "QC_USER") + @ApiParam("检验员") + private String qcUser; + + @Column(name = "QC_DATE") + @ApiParam(value = "检验日期") + private String qcDate; + + @Column(name = "QC_TIME") + @ApiParam(value = "检验时间") + private String qcTime; + + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeHandleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeHandleModel.java new file mode 100644 index 0000000..5a3f9e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeHandleModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * 不合格品处理 + * @author FutureSoldiers + * @create 2021-08-16 14:51 + */ +@Data +public class DefectTypeHandleModel { + + @ApiParam(value = "问题分类") + private String topicCategory; + + @ApiParam(value = "处理结果") + private String handleVerdict; + @ApiParam(value = "岗位名称") + private String parentName; + + @ApiParam(value = "处理时间") + private String handleDateTime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectTypeAuditRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectTypeAuditRepository.java new file mode 100644 index 0000000..1e29d38 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectTypeAuditRepository.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDefectTypeAudit; + +/** + * @author FutureSoldiers + * @create 2021-08-16 17:08 + */ +public interface MesDefectTypeAuditRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRejectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRejectRepository.java new file mode 100644 index 0000000..15b9bb9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRejectRepository.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderReject; + +/** + * @author FutureSoldiers + * @create 2021-08-12 16:20 + */ +public interface MesQcOrderRejectRepository extends BaseRepository { +}