From 316077d26334245b274fb3820cc75c03545434fb Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Fri, 17 May 2019 10:48:59 +0800 Subject: [PATCH] =?UTF-8?q?MES=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=B7=A5=E4=BD=9C=E5=8D=95=E5=85=83=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesRouteProcessCell.java | 5 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index 64027fc..a2b7c6d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -38,4 +38,9 @@ public class MesRouteProcessCell extends BaseBean { @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + } 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 4fb3075..ccfbde1 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 @@ -343,4 +343,27 @@ public class MesHqlPack { return packBean; } + + /** + * MES工序工作单元对应关系查询条件封装 + * @param routeProcessCell + * @return + */ + public static DdlPackBean getMesRouteProcessCell(MesRouteProcessCell routeProcessCell, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(routeProcessCell, organizeCode); + if (StringUtils.isNotEmpty(routeProcessCell.getRouteCode())){ + DdlPreparedPack.getStringEqualPack(routeProcessCell.getRouteCode(), "routeCode", packBean); + } + if (StringUtils.isNotEmpty(routeProcessCell.getProcessCode())){ + DdlPreparedPack.getStringEqualPack(routeProcessCell.getProcessCode(), "processCode", packBean); + } + if (StringUtils.isNotEmpty(routeProcessCell.getWorkCellCode())){ + DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCellCode(), "workCellCode", packBean); + } + if (StringUtils.isNotEmpty(routeProcessCell.getWorkCenterCode())){ + DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCenterCode(), "workCenterCode", packBean); + } + + return packBean; + } }