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 list = emisTmsScanRecordService.selectEmisTmsScanRecordList(emisTmsScanRecord); return getDataTable(list); }