From 981438c2a25fc8099e0a5b88f4761e52d5507ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Wed, 9 Dec 2020 17:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=9012997=2019048-=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E8=A1=A5=E6=89=93=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0=E4=BA=8C?=
 =?UTF-8?q?=E6=A3=80=E7=AE=B1=E6=A0=87=E7=AD=BE-20201204=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java  |  6 ++++
 .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java     | 40 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
index f35d6ef..e1ab379 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
@@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author: Wynne.Lu
@@ -190,6 +192,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("汇总数量")
     private Integer gatherQty = 0;
 
+    @Transient
+    @ApiParam("包装编号集合")
+    private List<String> packageNoList = new ArrayList<>();
+
     public MesPackage() {
     }
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
index 37bdaec..15049c3 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
@@ -719,4 +719,44 @@ public class MesPcnHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 按条件分页查询包装条码查询数据
+     *
+     * @param mesPackage
+     * @return
+     */
+    public static DdlPackBean getPackageSn(MesPackage mesPackage) {
+
+        DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesPackage.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesPackage.getPackLevel())) {
+            DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesPackage.getWorkOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+
+        if(!CollectionUtils.isEmpty(mesPackage.getPackageNoList())){
+            DdlPreparedPack.getInPackList(mesPackage.getPackageNoList(), "packageNo", packBean);
+        }
+
+        DdlPreparedPack.getStringLikerPack(mesPackage.getFixLotNo(), "fixLotNo", packBean);
+
+        // 时间段查询
+        DdlPreparedPack.timeBuilder(
+                mesPackage.getCreateDateTimeStart(),
+                mesPackage.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+
+        return packBean;
+    }
 }