From 3dca11a963f31d3b33f4e88d4579f34473ef1359 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 30 Jul 2019 19:39:35 +0800 Subject: [PATCH 1/2] add a hql --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 f3b9ffa..6ca0761 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 @@ -346,6 +346,23 @@ public class MesHqlPack { } /** + * MES 上传文件FastDfs封装 + * @param mesESOP + * @return + */ + public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode); + if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())){ + DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(mesESOP.getPartNo())){ + DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean); + } + + return packBean; + } + + /** * MES工序信息查询条件封装 * @param process * @return From d826c47d5afd1006c90fb743987fb1a010dd2bc9 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 5 Aug 2019 13:47:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86mesEvent=20pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java index c442bb9..9fe1a36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java @@ -40,6 +40,10 @@ public class MesEvent extends BaseBean { @ApiParam("事件类型") private Integer eventType; + @Column(name="BUTTON_CODE") + @ApiParam("按钮代码") + private String buttonCode; + public int getEventTypeVal() { return this.eventType == null ? 0 : this.eventType; }