md
This commit is contained in:
parent
e86b16a668
commit
83c2a3e2af
@ -11,10 +11,7 @@
|
|||||||
|
|
||||||
package com.xdadan.erp.web.emis;
|
package com.xdadan.erp.web.emis;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
@ -232,6 +229,19 @@ public class EmisTmsScanRecordController extends BaseController
|
|||||||
public TableDataInfo list(EmisTmsScanRecord emisTmsScanRecord)
|
public TableDataInfo list(EmisTmsScanRecord emisTmsScanRecord)
|
||||||
{
|
{
|
||||||
startPage();
|
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);
|
List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(emisTmsScanRecord);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user