From 5df98962586e7a24fc04c12221bcf5538e229d76 Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Mon, 12 Aug 2019 07:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=EF=BC=8C=20=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=9F=EF=BC=8C=20=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=20pcn=E8=8A=82=E7=82=B9=E5=9F=BA=E7=A1=80=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: crish <570360737@qq.com>
---
 .../cn/estsh/i3plus/pojo/mes/bean/MesRepair.java   |  2 +-
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 72 +++++++++++++++++++++-
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java
index 16550fd..98ecaa6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java
@@ -34,7 +34,7 @@ public class MesRepair extends BaseBean {
 
     @Column(name="REPAIR_NAME")
     @ApiParam("维修名称")
-    private String repariName;
+    private String repairName;
 
     @Column(name="REPAIR_TYPE")
     @ApiParam("维修类型")
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 1d85548..8c80036 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
@@ -26,7 +26,6 @@ public class MesHqlPack {
     public static DdlPackBean getAllBaseData(String organizeCode) {
         DdlPackBean packBean = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
         return packBean;
     }
@@ -45,6 +44,9 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesPcn.getAreaCode())) {
             DdlPreparedPack.getStringLikerPack(mesPcn.getAreaCode(), "areaCode", packBean);
         }
+        if (mesPcn.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesPcn.getIsValid(), "isValid", packBean);
+        }
         return packBean;
     }
     /**
@@ -160,6 +162,9 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) {
             DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
         }
+        if (mesWorkOrder.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean);
+        }
 
         // 时间段查询
 //        DdlPreparedPack.timeBuilder(
@@ -195,6 +200,10 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(mesQueueOrder.getOrderNo(), "orderNo", packBean);
         }
 
+        if (mesQueueOrder.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesQueueOrder.getIsValid(), "isValid", packBean);
+        }
+
         // 只查询创建状态的队列
         DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean);
 
@@ -362,6 +371,67 @@ public class MesHqlPack {
     }
 
     /**
+     * MES 报废信息查询
+     * @param mesScrap
+     * @return
+     */
+    public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesScrap.getScrapCode())){
+            DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesScrap.getScrapName())){
+            DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean);
+        }
+        if (mesScrap.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesScrap.getIsValid(), "isValid", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES PCN系统配置信息条件查询
+     * @param mesConfig
+     * @return
+     */
+    public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesConfig.getCfgCode())){
+            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesConfig.getCfgName())){
+            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
+        }
+        if (mesConfig.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 维修信息条件查询
+     * @param mesRepair
+     * @return
+     */
+    public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesRepair.getRepairCode())){
+            DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesRepair.getRepairName())){
+            DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean);
+        }
+        if (mesRepair.getRepairType() != null){
+            DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean);
+        }
+        if (mesRepair.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesRepair.getIsValid(), "isValid", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
      * MES 上传文件FastDfs封装
      * @param mesESOP
      * @return