This commit is contained in:
linfso 2024-04-23 07:33:49 +08:00
parent 8a19c60c2e
commit 4df2c5ce01

View File

@ -65,22 +65,26 @@ public class EmisWaybillController extends BaseController
EmisWaybill emisWaybill=null;
if(com.xdadan.erp.common.utils.StringUtils.isEmpty(billCode) && com.xdadan.erp.common.utils.StringUtils.isEmpty(orderSn) ){
if(StringUtils.isEmpty(billCode) && StringUtils.isEmpty(orderSn) ){
return AjaxResult.error("参数错误");
}
if(!com.xdadan.erp.common.utils.StringUtils.isEmpty(billCode) ){
if(!StringUtils.isEmpty(billCode) ){
emisWaybill = emisWaybillService.selectEmisWaybillByBillCode(billCode);
if(emisWaybill==null){
return AjaxResult.error("未找到该运单");
}
}else {
if (!StringUtils.isEmpty(orderSn)) {
emisWaybill = emisWaybillService.selectEmisWaybillByOrderSn(orderSn);
if (emisWaybill == null) {
return AjaxResult.error("未找到该运单");
}
}
}
if(!com.xdadan.erp.common.utils.StringUtils.isEmpty(orderSn) ) {
emisWaybill = emisWaybillService.selectEmisWaybillByOrderSn(orderSn);
if(emisWaybill==null){
return AjaxResult.error("未找到该运单");
}
if (emisWaybill == null) {
return AjaxResult.error("未找到该运单");
}
WaybillOrder waybillOrder = new WaybillOrder();