From ce63c161beb0864db9dc20ddb185d6eb4901dda6 Mon Sep 17 00:00:00 2001
From: jokelone <jokelone@yeah.net>
Date: Wed, 20 Nov 2019 17:55:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1211?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=EF=BC=9A?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E8=A1=A8=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 97 ++++++++++++++++++++++
 1 file changed, 97 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 a9c0fd4..897e791 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
@@ -1830,4 +1830,101 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 过程条码报表
+     * @param mesProduceSn
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesProduceSn(MesProduceSn mesProduceSn, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSn, organizeCode);
+        if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProduceSn.getWorkCellCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (mesProduceSn.getSnStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
+        }
+        if (mesProduceSn.getQcStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
+        }
+        DdlPreparedPack.timeBuilder(
+                mesProduceSn.getCreateDateTimeStart(),
+                mesProduceSn.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+        return packBean;
+    }
+
+    /**
+     * 物料追溯
+     * @param mesProdBindRecord
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode);
+        if (!StringUtils.isEmpty(mesProdBindRecord.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdBindRecord.getKpSn())) {
+            DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getKpSn(), "kpSn", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdBindRecord.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdBindRecord.getWorkCellCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (mesProdBindRecord.getIsBindKey() != null) {
+            DdlPreparedPack.getNumEqualPack(mesProdBindRecord.getIsBindKey(), "isBindKey", packBean);
+        }
+        if (mesProdBindRecord.getActionType() != null) {
+            DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getActionType(), "actionType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean);
+        }
+        DdlPreparedPack.timeBuilder(
+                mesProdBindRecord.getCreateDateTimeStart(),
+                mesProdBindRecord.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+        return packBean;
+    }
+
+    /**
+     * 物料追溯
+     * @param ifPackageDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getIfPackageDetail(IfPackageDetail ifPackageDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(ifPackageDetail, organizeCode);
+        if (!StringUtils.isEmpty(ifPackageDetail.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(ifPackageDetail.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(ifPackageDetail.getPackageNo())) {
+            DdlPreparedPack.getStringLikerPack(ifPackageDetail.getPackageNo(), "partNo", packBean);
+        }
+        DdlPreparedPack.timeBuilder(
+                ifPackageDetail.getCreateDateTimeStart(),
+                ifPackageDetail.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+        return packBean;
+    }
+
 }