From 7c7fb30e1a5302d9b6fd1e7dfb50b88c44504c25 Mon Sep 17 00:00:00 2001
From: "yiming.gu" <yiming.gu@estsh.com>
Date: Fri, 17 May 2019 10:56:54 +0800
Subject: [PATCH] =?UTF-8?q?MES=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../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 34a5535..0e9ac7f 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
@@ -263,6 +263,23 @@ public class MesHqlPack {
     }
 
     /**
+     * MES设备信息查询条件封装
+     * @param mesEquipment
+     * @return
+     */
+    public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode);
+        if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){
+            DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){
+            DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
      * 流程查询条件封装
      *
      * @param mesRoute