From 7bb60b8f6e43508fbfe60d4ddc9e2f5f88c77a41 Mon Sep 17 00:00:00 2001
From: Dominic_Xiao <1003069915@qq.com>
Date: Tue, 10 Nov 2020 15:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=A1=E6=96=AF=E9=A9=AC?=
 =?UTF-8?q?=E4=B8=89=E4=B8=AA=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9D=97=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 63 ++++++++++++++++++++++
 1 file changed, 63 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 dac64cf..845b2c4 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
@@ -3540,4 +3540,67 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * MES容器位置查询条件封装
+     *
+     * @param mesContainerLocation
+     * @return
+     */
+    public static DdlPackBean getMesContainerLocation(MesContainerLocation mesContainerLocation) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesContainerLocation, mesContainerLocation.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesContainerLocation.getOrganizeCode())) {
+            DdlPreparedPack.getStringLikerPack(mesContainerLocation.getOrganizeCode(), "organizeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesContainerLocation.getCtCode())) {
+            DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtCode(), "ctCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesContainerLocation.getCtLocationNo())) {
+            DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtLocationNo(), "ctLocationNo", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES产品容器容量配置查询条件封装
+     *
+     * @param mesPartContainerCapacity
+     * @return
+     */
+    public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesPartContainerCapacity.getOrganizeCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getOrganizeCode(), "organizeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtCode(), "ctCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtLocationNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtLocationNo(), "ctLocationNo", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES客户条码规则查询条件封装
+     *
+     * @param mesCustomerSnRule
+     * @return
+     */
+    public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) {
+            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) {
+            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean);
+        }
+        return packBean;
+    }
 }