From 672483245c8bff55e5bcb0e3f2a613c9bd208147 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Sat, 13 Jun 2020 14:03:50 +0800
Subject: [PATCH] Fix #Bug 8904

---
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java    | 9 +++++++++
 .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java   | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
index 90a96f1..b3e82e2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
@@ -100,21 +100,30 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
     @ApiParam(value = "动作类型")
     private Integer actionType;
 
+    @Transient
     @ApiParam(value = "是否绑定关键件名称")
     private String isBindKeyName;
 
+    @Transient
     @ApiParam(value = "动作类型名称")
     private String actionTypeName;
 
+    @Transient
     @ApiParam("产品条码零件名称")
     private String partName;
 
+    @Transient
     @ApiParam("原材料零件名称")
     private String itemPartName;
 
+    @Transient
     @ApiParam("生产队列号")
     private String orderNo;
 
+    @Transient
+    @ApiParam("产品条码")
+    private String productSn;
+
 
     public int getIsFeedVal() {
         return this.isFeed == null ? 0 : this.isFeed;
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 07ac37c..481a9f1 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
@@ -10,8 +10,10 @@ import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.util.List;
 /**
  * @Description:
  * @Reference: Mes 条件封装
@@ -2003,11 +2005,14 @@ public class MesHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) {
+    public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode, List<String> serialNumbers) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode);
         if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) {
             DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean);
         }
+        if (!CollectionUtils.isEmpty(serialNumbers)) {
+            DdlPreparedPack.getInPackList(serialNumbers, "serialNumber", packBean);
+        }
         if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) {
             DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
         }