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-09-02 00:09:55 +08:00
parent ebfdc95637
commit 0aea75c29a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -646,6 +646,8 @@ public class EmisWaybillController extends EmisBaseController
List<EmisWaybill> list = null; List<EmisWaybill> list = null;
// 如果单号不为空，则去除其他参数 // 如果单号不为空，则去除其他参数
String waybillStatType= MapUtils.getString(emisWaybill.getParams(),"waybillStatType","");
if(!StringUtils.isEmpty(emisWaybill.getBillCode())){ if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
EmisWaybill queryEmisWaybill =new EmisWaybill(); EmisWaybill queryEmisWaybill =new EmisWaybill();
@ -654,15 +656,18 @@ public class EmisWaybillController extends EmisBaseController
if(billCodeSortList.length>1){ if(billCodeSortList.length>1){
queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList)); queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
} }
list = emisWaybillService.selectEmisWaybillList(queryEmisWaybill); if( "1".equals(waybillStatType)){
list = emisWaybillService.selectWaitGotOrderList(queryEmisWaybill);
}
else {
list = emisWaybillService.selectEmisWaybillList(queryEmisWaybill);
}
}else{ }else{
String waybillStatType= MapUtils.getString(emisWaybill.getParams(),"waybillStatType","");
if( "1".equals(waybillStatType)){ if( "1".equals(waybillStatType)){
// 获取未接单数据 // 获取未接单数据
list = emisWaybillService.selectWaitGotOrderList(emisWaybill); list = emisWaybillService.selectWaitGotOrderList(emisWaybill);
}else{ }else{
// 如果不带查询本人开单的数据 // 如果不带查询本人开单的数据
if(StringUtils.isEmpty(emisWaybill.getBillCode())){ if(StringUtils.isEmpty(emisWaybill.getBillCode())){
try { try {