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 b2a2d97..a92a66d 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 @@ -6724,4 +6724,37 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PENDING_REPORT_TYPE { + + IDENTIFICATION_TYPE(10, "鉴定类型"), + FAILURE_MODE(20, "失效模式"); + + private int value; + private String description; + + PENDING_REPORT_TYPE(int value, String description) { + this.value = value; + this.description = 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; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java index 15c072a..ddec01b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -80,4 +80,8 @@ public class IfPackage extends BaseBean implements Serializable { @Column(name = "SYNC_STATUS") @ApiParam("同步状态") private Integer syncStatus; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; } \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index cc831dc..1b18a01 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -128,4 +128,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "SYNC_FLAG") @ApiParam("同步标识(同步工具使用)") private Integer syncFlag; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index d0ed327..12566dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -117,6 +117,22 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("入库时间") private String inLocationTime; + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式代码名称") + private String patternName; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + + @Column(name = "IS_RETURN") + @ApiParam("是否回传") + private Integer isReturn; + @Transient @ApiParam("封箱状态") private String sealStatus; @@ -211,6 +227,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; + @Transient + @ApiParam("临时条码集合") + private List mesTemporarySnRecordList = new ArrayList<>(); + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index a9c9324..2275812 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -69,11 +69,15 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码4") private String packageNo4; + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + @Transient @ApiParam("批次") private String lotNo; - @Transient + @Column(name = "PRODUCT_SN") @ApiParam("产品条码") private String productSn;