From e4d6a498283a2d941fa0eda90e11398db7e15aa5 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 12 Aug 2024 00:12:02 +0800 Subject: [PATCH] md --- .../xdadan/erp/web/emis/EmisWaybillController.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index b0b7aaed0..674f33722 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -782,20 +782,24 @@ public class EmisWaybillController extends EmisBaseController { startPage(); + List list = null; // 如果单号不为空，则去除其他参数 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(","); if(billCodeSortList.length>1){ - emisWaybill.setParams(null); - emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList)); + queryEmisWaybill.setParams(null); + queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList)); } + list = emisWaybillService.selectPrintWaybillList(queryEmisWaybill); }else{ // 设置通用权限查询参数 setPrivParams(emisWaybill); + list = emisWaybillService.selectPrintWaybillList(emisWaybill); } - List list = emisWaybillService.selectPrintWaybillList(emisWaybill); return getDataTable(list); }