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-01 23:52:24 +08:00
parent 46e32175ba
commit ec743f5a12
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -615,6 +615,7 @@ public class EmisWaybillController extends EmisBaseController
}
@Log(title = "APP获取运单数据", businessType = BusinessType.OTHER)
@JacksonFilter(include= {
"id","orderSn","billCode","orderStatus","waybillStatus",
"orderType","sendDate","customerCode","customerName",
@ -641,14 +642,7 @@ public class EmisWaybillController extends EmisBaseController
// 设置通用权限查询参数
setPrivParams(emisWaybill);
// 如果不带查询本人开单的数据
if(StringUtils.isEmpty(emisWaybill.getBillCode())){
try {
emisWaybill.setRegisterManCode(getLoginUser().getUser().getEmpCode());
}catch(Exception ex){
ex.printStackTrace();
}
}
List<EmisWaybill> list = null;
// 如果单号不为空，则去除其他参数
@ -668,6 +662,16 @@ public class EmisWaybillController extends EmisBaseController
// 获取未接单数据
list = emisWaybillService.selectWaitGotOrderList(emisWaybill);
}else{
// 如果不带查询本人开单的数据
if(StringUtils.isEmpty(emisWaybill.getBillCode())){
try {
emisWaybill.setRegisterManCode(getLoginUser().getUser().getEmpCode());
}catch(Exception ex){
ex.printStackTrace();
}
}
// 设置通用权限查询参数
list = emisWaybillService.selectEmisWaybillList(emisWaybill);
}