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 c91e8b0..321e7da 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 @@ -3650,7 +3650,8 @@ public class MesEnumUtil { QUALIFIED(10, "合格"), DEFECTED(20, "不合格"), SCRAPED(30, "报废"), - DISMANTLED(40, "已拆解"); + DISMANTLED(40, "已拆解"), + PRE_CHECK(50, "待检测"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index e92e50f..ccf6bc4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -717,7 +717,8 @@ public class MesPcnEnumUtil { QUALIFIED(10, "合格"), DEFECTED(20, "不合格"), SCRAPED(30, "报废"), - DISMANTLED(40, "已拆解"); + DISMANTLED(40, "已拆解"), + PRE_CHECK(50, "待检测"); private int value; private String description; @@ -4257,4 +4258,61 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 不良品处理类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BAD_HANDLE_TYPE { + BACK_SPRAY(10, "BACK_SPRAY", "返喷"), + SCRAPPED(20, "SCRAPPED", "报废"), + POLISH(30, "POLISH", "抛光"), + DETERMINED(40, "DETERMINED", "待定"); + + private int value; + private String code; + private String description; + + BAD_HANDLE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java new file mode 100644 index 0000000..d95ebc1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java @@ -0,0 +1,90 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :不良信息接口表 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_DEFECT_DATA") +@Api("不良信息接口数据") +public class IfDefectData extends BaseBean implements Serializable { + private static final long serialVersionUID = 4320604250440221049L; + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serailNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private Integer defectActionType; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Lob + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_TYPE") + @ApiParam("动作代码") + private String actionType; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index cb0f1b4..a4a2dca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -48,6 +48,10 @@ public class MesDefect extends BaseBean implements Serializable { @ApiParam("项目代码") private String prodCfgTypeCode; + @Column(name = "DEFECT_FLAG_VALUE") + @ApiParam("缺陷标识值") + private String defectFlagValue; + @Transient @ApiParam("缺陷类型名称") private String defectTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 793563e..fbd81ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -81,6 +80,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("备注") private String memo; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private Integer defectActionType; + @Transient private List mesDefectList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java new file mode 100644 index 0000000..ae0de27 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 条码解绑实体 + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class PackageSnModel { + + @ApiParam("包装条码") + private String packageNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("批次") + private String lotNo; + + @ApiParam("创建人") + private String createUser; + + @ApiParam("创建时间") + private String createDateTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java new file mode 100644 index 0000000..80c483b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import java.util.List; + +/** + * @Author: siliter.yuan + * @CreateDate: 2020/6/28 8:06 PM + * @Description: + **/ +@Data +@Api("涂装检测MODEL") +public class PaintCheckModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("颜色") + private String color; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("界面编号") + private String windowNo; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("缺陷描述") + private String defectDesc; + + @ApiParam("缺陷标识值") + private String defectFlagValue; + + @ApiParam("不良品处理类型") + private Integer defectActionType; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("界面组件参数数据") + List windowModuleParamList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java index f1f7d53..9ab41c8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java @@ -46,4 +46,7 @@ public class PaintOnLineModel { @ApiParam("圈数") private Integer rounds; + + @ApiParam("过程条码") + private String serialNumber; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.java new file mode 100644 index 0000000..6e3b966 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfDefectData; +import org.springframework.stereotype.Repository; + +/** + * @Description : if不良信息接口 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 16:49 + * @Modify: + **/ +@Repository +public interface IfDefectDataRepository extends BaseRepository { + +}