From 83c2a3e2afbda5ca50a6f24ccc2f6000199442d7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 3 Jun 2024 13:01:43 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisTmsScanRecordController.java  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
index de44187ca..d8e04bf27 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
@@ -11,10 +11,7 @@
 
 package com.xdadan.erp.web.emis;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson.JSON;
@@ -232,6 +229,19 @@ public class EmisTmsScanRecordController extends BaseController
     public TableDataInfo list(EmisTmsScanRecord emisTmsScanRecord)
     {
         startPage();
+        if(!StringUtils.isEmpty(emisTmsScanRecord.getBillCode())){
+            String[] billCodeSortList = emisTmsScanRecord.getBillCode().split(",");
+            if(billCodeSortList.length>1){
+                emisTmsScanRecord.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList));
+            }
+        }
+
+        if(!StringUtils.isEmpty(emisTmsScanRecord.getOrderSn())){
+            String[] orderSnSortList = emisTmsScanRecord.getOrderSn().split(",");
+            if(orderSnSortList.length>1){
+                emisTmsScanRecord.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
+            }
+        }
         List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(emisTmsScanRecord);
         return getDataTable(list);
     }