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 a01bd74..80629a6 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 @@ -705,7 +705,8 @@ public class MesEnumUtil { BOARD("BOARD", "看板类型"), EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"), EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"), - EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"); + EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"), + BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值"); private String 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 3c609c8..c6607a4 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 @@ -369,8 +369,12 @@ public class MesPcnEnumUtil { REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), - WC_CHECK("WC_CHECK", "开线检查项"); - + WC_CHECK("WC_CHECK", "开线检查项"), + BOARD("BOARD", "看板类型"), + EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"), + EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"), + EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"), + BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值"); private String value; private String description; 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 49363f3..65af226 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 @@ -99,4 +99,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "CT_NO") @ApiParam("容器编号") private String ctNo; + + @Column(name = "SN_TYPE") + @ApiParam("条码类型") + private String snType; } 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 b573418..c757007 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 @@ -110,6 +110,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("容器编号") private String ctNo; + @Column(name = "SN_TYPE") + @ApiParam("条码类型") + private String snType; + public MesPackage() { }