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 03d96652f..ef3022d3e 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 @@ -730,6 +730,7 @@ public class EmisWaybillController extends EmisBaseController if(billCodeSortList.length>1){ queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList)); } + if( "1".equals(waybillStatType)){ list = emisWaybillService.selectWaitGotOrderList(queryEmisWaybill); } @@ -755,9 +756,9 @@ public class EmisWaybillController extends EmisBaseController } } - // 查询已取消的订单 - if( "3".equals(waybillStatType)){ - list = emisWaybillService.selectEmisWaybillList(emisWaybill); + // 查询已取消 和转单的订单 + if( "3".equals(waybillStatType) || "4".equals(waybillStatType) ){ + list = emisWaybillService.selectOrderList(emisWaybill); } else{ list = emisWaybillService.selectEmisWaybillList(emisWaybill); diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 89690acec..7b4e071ec 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -892,8 +892,6 @@ and a.create_site=#{createSite} and a.update_site=#{updateSite} - - and a.bill_code in ( select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and ewpi.`problem_type` is not null and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )