This commit is contained in:
linfso 2024-06-25 17:45:54 +08:00
parent ed68f36916
commit 7ff3a9251d

View File

@ -112,10 +112,19 @@ public class EmisWaybillController extends EmisBaseController
billCode=WaybillHelper.formatQueryValue(billCode);
if(!StringUtils.isEmpty(billCode) ){
waybillOrder = emisWaybillService.getWaybillOrderByBillCode(billCode);
boolean isExists=emisBaseService.checkWaybillIsExists(billCode);
if(!isExists){
return AjaxResult.error("运单不存在");
}
String mainBillCode=emisBaseService.getMainBillCode(billCode);
waybillOrder = emisWaybillService.getWaybillOrderByBillCode(mainBillCode);
if(waybillOrder==null){
return AjaxResult.error("运单不存在");
}
// 返回子单信息
waybillOrder.setBillCode(billCode);
}else if(!StringUtils.isEmpty(orderSn)){
waybillOrder = emisWaybillService.getWaybillOrderByOrderSn(orderSn);
if(waybillOrder==null){