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-09-08 23:24:36 +08:00
parent ecc8d2d0b3
commit 3fa67eb556
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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