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 2025-01-05 21:49:44 +08:00
parent 9065cfc4d2
commit 243bd9c91b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

2
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -892,8 +892,6 @@
<if test="createSite != null and createSite != ''"> and a.create_site=#{createSite}</if>
<if test="updateSite != null and updateSite != ''"> and a.update_site=#{updateSite}</if>
<if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
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} )