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-17 10:59:36 +08:00
parent 2a6116c973
commit 36f182d567
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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