From e18b6c727e7ca0b35138782a96c668628f3f1a65 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 10 Nov 2020 17:16:09 +0800 Subject: [PATCH 1/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 2/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; } From a300e6e2f8e1e1d533a4c80b24e14471f2eca53b Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 10 Nov 2020 19:30:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?idoc=20=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20erp=20=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/dbinterface/WmsInterfaceDataRecord.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java index 99798d6..1496c14 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -35,7 +35,8 @@ import javax.persistence.Table; @Index(columnList = "DEST_BEAN_NAME"), @Index(columnList = "SOFT_ADAPTOR_CODE"), @Index(columnList = "SID"), - @Index(columnList = "MOVE_TO_ERP_ID") + @Index(columnList = "MOVE_TO_ERP_ID"), + @Index(columnList = "ERP_DOC_NO") }) @Api("接口数据收发记录") public class WmsInterfaceDataRecord extends BaseBean { @@ -78,4 +79,17 @@ public class WmsInterfaceDataRecord extends BaseBean { @ApiParam("ERP文档编号") @Column(name = "ERP_DOC_NO") private String erpDocNo; + + @ApiParam("ERP状态代码") + @Column(name = "ERP_STATUS_CODE") + private String erpStatusCode; + + @ApiParam("ERP状态描述") + @Column(name = "ERP_STATUS_DESC") + private String erpStatusDesc; + + @ApiParam("ERP最后更新时间") + @Column(name = "ERP_LAST_MODIFY_TIME") + private String erpLastModifyTime; + } From c6031c2f2860f3672b82d7286396746e3e52e432 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 10 Nov 2020 21:33:19 +0800 Subject: [PATCH 4/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/WmsQCDetails.java | 9 ++++++--- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 2b75be8..f225d01 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -13,7 +11,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; /** * @Description : 质检单明细信息 @@ -61,6 +63,7 @@ public class WmsQCDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.QC_ITEM_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; @Column(name = "REMARK") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 60fb5e9..f2131f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -54,7 +54,7 @@ public class WmsQCMaster extends BaseBean { */ @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_STATUS.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MASTER_ORDER_STATUS") public Integer orderStatus;