aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-12 00:12:02 +08:00
parent 817a2dff9e
commit e4d6a49828
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -782,20 +782,24 @@ public class EmisWaybillController extends EmisBaseController
{ {
startPage(); startPage();
List<EmisWaybill> list = null;
// 如果单号不为空，则去除其他参数 // 如果单号不为空，则去除其他参数
if(!StringUtils.isEmpty(emisWaybill.getBillCode())){ if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
emisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode()));
EmisWaybill queryEmisWaybill =new EmisWaybill();
queryEmisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode()));
String[] billCodeSortList = emisWaybill.getBillCode().split(","); String[] billCodeSortList = emisWaybill.getBillCode().split(",");
if(billCodeSortList.length>1){ if(billCodeSortList.length>1){
emisWaybill.setParams(null); queryEmisWaybill.setParams(null);
emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList)); queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
} }
list = emisWaybillService.selectPrintWaybillList(queryEmisWaybill);
}else{ }else{
// 设置通用权限查询参数 // 设置通用权限查询参数
setPrivParams(emisWaybill); setPrivParams(emisWaybill);
list = emisWaybillService.selectPrintWaybillList(emisWaybill);
} }
List<EmisWaybill> list = emisWaybillService.selectPrintWaybillList(emisWaybill);
return getDataTable(list); return getDataTable(list);
} }