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-05-31 06:28:07 +08:00
parent 786bc841c2
commit 3a083867cf
1 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,14 +299,14 @@ public class EmisWaybillController extends BaseController
if(!StringUtils.isEmpty(emisWaybill.getBillCode())){ if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
String[] billCodeSortList = emisWaybill.getBillCode().split(","); String[] billCodeSortList = emisWaybill.getBillCode().split(",");
if(billCodeSortList.length>1){ if(billCodeSortList.length>1){
emisWaybill.getParams().put("billCodeSortList",billCodeSortList); emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
} }
} }
if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){ if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
String[] orderSnSortList = emisWaybill.getOrderSn().split(","); String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
if(orderSnSortList.length>1){ if(orderSnSortList.length>1){
emisWaybill.getParams().put("orderSnSortList",orderSnSortList); emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
} }
} }
@ -332,6 +332,20 @@ public class EmisWaybillController extends BaseController
emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName()); emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
} }
if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
String[] billCodeSortList = emisWaybill.getBillCode().split(",");
if(billCodeSortList.length>1){
emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
}
}
if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
if(orderSnSortList.length>1){
emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
}
}
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill); List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
return getDataTable(list); return getDataTable(list);
} }
@ -362,6 +376,21 @@ public class EmisWaybillController extends BaseController
emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode()); emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName()); emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
} }
if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
String[] billCodeSortList = emisWaybill.getBillCode().split(",");
if(billCodeSortList.length>1){
emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
}
}
if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
if(orderSnSortList.length>1){
emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
}
}
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill); List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
return getDataTable(list); return getDataTable(list);
} }
@ -380,6 +409,21 @@ public class EmisWaybillController extends BaseController
emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode()); emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName()); emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
} }
if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
String[] billCodeSortList = emisWaybill.getBillCode().split(",");
if(billCodeSortList.length>1){
emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
}
}
if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
if(orderSnSortList.length>1){
emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
}
}
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill); List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
return getDataTable(list); return getDataTable(list);
} }