md
This commit is contained in:
parent
243bd9c91b
commit
9216d20143
@ -747,20 +747,19 @@ public class EmisWaybillController extends EmisBaseController
|
|||||||
list = emisWaybillService.selectWaitGotOrderList(emisWaybill);
|
list = emisWaybillService.selectWaitGotOrderList(emisWaybill);
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
// 如果不带查询本人开单的数据
|
|
||||||
if(StringUtils.isEmpty(emisWaybill.getBillCode())){
|
|
||||||
try {
|
|
||||||
emisWaybill.setRegisterManCode(getLoginUser().getUser().getEmpCode());
|
|
||||||
}catch(Exception ex){
|
|
||||||
ex.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 查询已取消 和转单的订单
|
// 查询已取消 和转单的订单
|
||||||
if( "3".equals(waybillStatType) || "4".equals(waybillStatType) ){
|
if( "3".equals(waybillStatType) || "4".equals(waybillStatType) ){
|
||||||
list = emisWaybillService.selectOrderList(emisWaybill);
|
list = emisWaybillService.selectOrderList(emisWaybill);
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|
// 如果不带查询本人开单的数据
|
||||||
|
// if(StringUtils.isEmpty(emisWaybill.getBillCode())){
|
||||||
|
// try {
|
||||||
|
// emisWaybill.setRegisterManCode(getLoginUser().getUser().getEmpCode());
|
||||||
|
// }catch(Exception ex){
|
||||||
|
// ex.printStackTrace();
|
||||||
|
// }
|
||||||
|
// }
|
||||||
list = emisWaybillService.selectEmisWaybillList(emisWaybill);
|
list = emisWaybillService.selectEmisWaybillList(emisWaybill);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user