From c9114c9dae0dd6ad2ae62f0aa2764fd442818502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Thu, 11 Jun 2020 14:36:57 +0800
Subject: [PATCH] Fix Bug #8688

---
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 28 ++++++++++++++++++++++
 1 file changed, 28 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 eb1080b..de74501 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
@@ -2954,4 +2954,32 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+
+    /**
+     * 过程质量检测数据
+     *
+     * @param qcOrderDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQcOrderDetailData(MesQcOrderDetail qcOrderDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode);
+        if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
+            DdlPreparedPack.getStringRightLikerPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
+        }
+        if (qcOrderDetail.getCheckType() != null) {
+            DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrderDetail.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(qcOrderDetail.getSerialNumber(), "serialNumber", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    qcOrderDetail.getCreateDateTimeStart(),
+                    qcOrderDetail.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
 }