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 f73b730ba..493d7f3ad 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 @@ -505,12 +505,11 @@ public class EmisWaybillController extends EmisBaseController List list = null; // 如果单号不为空,则去除其他参数 if(!StringUtils.isEmpty(emisWaybill.getBillCode())){ - EmisWaybill queryEmisWaybill =new EmisWaybill(); queryEmisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode())); String[] billCodeSortList = emisWaybill.getBillCode().split(","); if(billCodeSortList.length>1){ - queryEmisWaybill.setParams(null); +// queryEmisWaybill.setParams(null); queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList)); } list = emisWaybillService.selectEmisWaybillList(queryEmisWaybill); @@ -519,24 +518,6 @@ public class EmisWaybillController extends EmisBaseController 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 list = emisWaybillService.selectEmisWaybillList(emisWaybill); return getDataTable(list); } @@ -683,7 +664,7 @@ public class EmisWaybillController extends EmisBaseController queryEmisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode())); String[] billCodeSortList = emisWaybill.getBillCode().split(","); if(billCodeSortList.length>1){ - queryEmisWaybill.setParams(null); +// queryEmisWaybill.setParams(null); queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList)); } list = emisWaybillService.selectEmisWaybillList(queryEmisWaybill); @@ -829,7 +810,7 @@ public class EmisWaybillController extends EmisBaseController queryEmisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode())); String[] billCodeSortList = emisWaybill.getBillCode().split(","); if(billCodeSortList.length>1){ - queryEmisWaybill.setParams(null); +// queryEmisWaybill.setParams(null); queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList)); } list = emisWaybillService.selectPrintWaybillList(queryEmisWaybill);