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:27:41 +08:00
parent bb71b12c10
commit 400c02b7b3
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,23 +498,41 @@ public class EmisWaybillController extends EmisBaseController
setPrivParams(emisWaybill); setPrivParams(emisWaybill);
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.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList)); queryEmisWaybill.setParams(null);
queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
} }
list = emisWaybillService.selectPrintWaybillList(queryEmisWaybill);
}else{
// 设置通用权限查询参数
list = emisWaybillService.selectPrintWaybillList(emisWaybill);
} }
if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
emisWaybill.setOrderSn(WaybillHelper.formatQueryValue(emisWaybill.getOrderSn()));
String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
if(orderSnSortList.length>1){
emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
}
}
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill); // if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
// emisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode()));
// String[] billCodeSortList = emisWaybill.getBillCode().split(",");
// if(billCodeSortList.length>1){
// emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
// }
// }
// if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
// emisWaybill.setOrderSn(WaybillHelper.formatQueryValue(emisWaybill.getOrderSn()));
// String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
// if(orderSnSortList.length>1){
// emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
// }
// }
// List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
return getDataTable(list); return getDataTable(list);
} }