From 7ec1bc61b029ceaba9c4d191d3eb9bacca841a11 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 10 Nov 2020 11:26:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 3d469ee..3dec39f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -114,7 +114,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam(value = "紧急程度") - private String urgentStatus; + private Integer urgentStatus; @Column(name = "SRC_NO") @ApiParam(value = "源单号") From 1ba56bc59a28e9e0436ac18c8d103c526333c512 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 10 Nov 2020 15:24:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 37 ++++++++++++++++++++++ .../pojo/mes/model/QcCheckDataResultModel.java | 7 ++-- 2 files changed, 41 insertions(+), 3 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 312c1f6..cee9cc7 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 @@ -3859,6 +3859,43 @@ public class MesPcnEnumUtil { } /** + * 产线管控-过程检验状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROCESS_INSPECTION { + NOT_CREATE(10, "未创建"), + CREATE(20, "创建"), + PROCESS(30, "执行中"), + COMPLETE(40, "完成"); + + private int value; + private String description; + + PROCESS_INSPECTION(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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; + } + } + + /** * 整体检测结果状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java index 405f089..58803e3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrder; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,19 +19,19 @@ public class QcCheckDataResultModel { private Integer isFirstCheck; @ApiParam("首检结果") - private List firstCheckResult; + private List firstCheckResult; @ApiParam("是否完成巡检") private Integer isOnSiteCheck; @ApiParam("巡检结果") - private List onSiteCheckResult; + private List onSiteCheckResult; @ApiParam("是否完成尾检") private Integer isEndCheck; @ApiParam("尾检结果") - private List endCheckResult; + private List endCheckResult; public QcCheckDataResultModel() { } From e18b6c727e7ca0b35138782a96c668628f3f1a65 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 10 Nov 2020 17:16:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?mgn-bj=E5=BC=BA=E5=88=B6=E5=B0=81=E7=AE=B1?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E9=87=8D=E7=BD=AE=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) 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 cee9cc7..28db666 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 @@ -5974,4 +5974,58 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 预装产线，工位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRE_WORK_CENTER_CODE { + OP10("OP10", "OP10"), + OP20A("OP20a", "OP20a"), + OP20B("OP20b", "OP20b"); + + private String code; + private String description; + + PRE_WORK_CENTER_CODE(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static PRE_WORK_CENTER_CODE getByCode(String code) { + for (PRE_WORK_CENTER_CODE workCenterCode : values()) { + if (workCenterCode.getCode().equals(code)) { + return workCenterCode; + } + } + return null; + } + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From 2df948207c57d7c243c795aa24afc94f0a9b8630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 10 Nov 2020 17:29:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java index 5380410..f755466 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java @@ -39,5 +39,5 @@ public class MesLineFaultRecord extends BaseBean implements Serializable { @Column(name = "FAULT_TIME") @ApiParam("故障时长（分）") - private Double faultTime; + private Long faultTime; }