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 15:33:59 +08:00
parent 2b14ab2fe9
commit 74d0e71042
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -505,14 +505,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 queryEmisWaybill =new EmisWaybill(); emisWaybill.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)); emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
} }
list = emisWaybillService.selectEmisWaybillList(queryEmisWaybill); list = emisWaybillService.selectEmisWaybillList(emisWaybill);
}else{ }else{
// 设置通用权限查询参数 // 设置通用权限查询参数
list = emisWaybillService.selectEmisWaybillList(emisWaybill); list = emisWaybillService.selectEmisWaybillList(emisWaybill);
@ -532,25 +531,31 @@ public class EmisWaybillController extends EmisBaseController
startPage(); startPage();
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.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.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
} }
list = emisWaybillService.selectOrderList(emisWaybill);
}else{
setPrivParams(emisWaybill);
list = emisWaybillService.selectOrderList(emisWaybill);
} }
if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){ // if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
emisWaybill.setOrderSn(WaybillHelper.formatQueryValue(emisWaybill.getOrderSn())); // emisWaybill.setOrderSn(WaybillHelper.formatQueryValue(emisWaybill.getOrderSn()));
String[] orderSnSortList = emisWaybill.getOrderSn().split(","); // String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
if(orderSnSortList.length>1){ // if(orderSnSortList.length>1){
emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList)); // emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
} // }
} // }
List<EmisWaybill> list = emisWaybillService.selectOrderList(emisWaybill);
return getDataTable(list); return getDataTable(list);
} }
@ -662,9 +667,8 @@ public class EmisWaybillController extends EmisBaseController
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 = queryEmisWaybill.getBillCode().split(",");
if(billCodeSortList.length>1){ if(billCodeSortList.length>1){
// 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);