From a5793589686613ffe0430668596f844eae607e50 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 3 Dec 2019 16:50:13 +0800 Subject: [PATCH] =?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; }