From a5793589686613ffe0430668596f844eae607e50 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 3 Dec 2019 16:50:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1257?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=97=B6=E9=97=B4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) 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 5bfb46b..cef7003 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 @@ -179,7 +179,7 @@ public class MesPcnEnumUtil { } /** - * pcn 是否是关键件 + * MesProdBindRecord 是否是关键件 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_IS_BIND_KEY { 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 9a81548..02de63d 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 @@ -129,6 +129,14 @@ public class MesProduceSn extends BaseBean { @ApiParam("返回信息") private String resultMsg; + @Transient + @ApiParam("下线开始时间") + private String outWorkCenterStartTime; + + @Transient + @ApiParam("下线结束时间") + private String outWorkCenterEndTime; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 6810a1d..9f115b3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1876,6 +1876,10 @@ public class MesHqlPack { mesProduceSn.getCreateDateTimeStart(), mesProduceSn.getCreateDateTimeEnd(), "createDatetime", packBean, true); + DdlPreparedPack.timeBuilder( + mesProduceSn.getOutWorkCenterStartTime(), + mesProduceSn.getOutWorkCenterEndTime(), + "outWorkCenterTime", packBean, true); return packBean; } From d835ef1bb57372de5b21c0c773a06e35254a6f9e Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 3 Dec 2019 17:40:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1273?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=E6=A0=87=E5=87=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=A3=80=E6=B5=8B=E9=A1=B9=E7=B1=BB=E5=9E=8B=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 cf2bec1..994cf63 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 @@ -161,7 +161,8 @@ public class MesEnumUtil { DEFECT("DEFECT", "缺陷"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), - SCRAP("SCRAP", "报废原因"); + SCRAP("SCRAP", "报废原因"), + QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 2ef1cb0..60bea0a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -60,4 +60,8 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("频率") private String checkFrequency; + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + } From 4025a0963b1d28724785b8f72e160af9c8344fdd Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 3 Dec 2019 17:51:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1273?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=E5=A2=9E=E5=8A=A0=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E9=A1=B9=E7=B1=BB=E5=9E=8B1=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 48a1c26..5bc5ca1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -73,10 +73,14 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测值") private String checkValue; + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + public MesQcCheckStandard() { } - public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName) { + public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { this.partNo = partNo; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; @@ -86,5 +90,6 @@ public class MesQcCheckStandard extends BaseBean { this.checkGuide = checkGuide; this.checkFrequency = checkFrequency; this.partName = partName; + this.checkItemType = checkItemType; } } From 5b7f268b916115ed5dbfc65a786d0f4d831a3437 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 3 Dec 2019 18:17:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1274=20=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=99=AE=E9=81=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/mes/StationRequestBean.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index 0cfa2c7..2c1d0f7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -76,4 +76,26 @@ public class StationRequestBean implements Serializable { @ApiParam("工步列表") private List stepList; + @Override + public String toString() { + return "StationRequestBean{" + + "scanInfo='" + scanInfo + '\'' + + ", serialNumber='" + serialNumber + '\'' + + ", partNo='" + partNo + '\'' + + ", organizeCode='" + organizeCode + '\'' + + ", organizeName='" + organizeName + '\'' + + ", workCenterCode='" + workCenterCode + '\'' + + ", workCellCode='" + workCellCode + '\'' + + ", routeCode='" + routeCode + '\'' + + ", processCode='" + processCode + '\'' + + ", clientInfo='" + clientInfo + '\'' + + ", userInfo='" + userInfo + '\'' + + ", buttonCode='" + buttonCode + '\'' + + ", stepCode='" + stepCode + '\'' + + ", busiType='" + busiType + '\'' + + ", workOrderNo='" + workOrderNo + '\'' + + ", tray='" + tray + '\'' + + ", finishCount=" + finishCount + + '}'; + } }