From 5413fc259c1cf24b9cfaa4890d122ece5d444035 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 6 Aug 2020 12:48:32 +0800 Subject: [PATCH] =?UTF-8?q?pcn=20=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 10 ++++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) 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 8040d62..be00964 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 @@ -4378,6 +4378,16 @@ public class MesPcnEnumUtil { return tmp; } + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + 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 index d95ebc1..ae079bb 100644 --- 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 @@ -65,7 +65,7 @@ public class IfDefectData extends BaseBean implements Serializable { @Column(name = "DEFECT_ACTION_TYPE") @ApiParam("不良处理类型") - private Integer defectActionType; + private String defectActionType; @Column(name = "QTY") @ApiParam("数量") 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 fbd81ad..f5f986b 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 @@ -82,7 +82,7 @@ public class MesDefectRecord extends BaseBean implements Serializable { @Column(name = "DEFECT_ACTION_TYPE") @ApiParam("不良处理类型") - private Integer defectActionType; + private String defectActionType; @Transient private List mesDefectList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 0fe7b90..44080c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -148,6 +148,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("生产批次") private String lotNo; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1")