From 71e079f19b4c4b868f0e03fabf424389f1731757 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 4 Dec 2024 12:38:12 +0800 Subject: [PATCH] md --- .../src/main/java/com/xdadan/erp/apiweb/CommonController.java | 4 ++++ .../main/java/com/xdadan/erp/apiweb/WaybillController.java | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java index 78b2286..076c463 100644 --- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java @@ -169,6 +169,10 @@ public class CommonController extends BaseController { try { AddressParseResult addressParseResult = emisRegionService.parseAddress(content); + if(addressParseResult==null){ + return AjaxResult.error("地址解析失败"); + } + return AjaxResult.success("解析成功",addressParseResult); }catch (Exception ex){ ex.printStackTrace(); diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java index 683699b..3305a1e 100644 --- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java @@ -276,7 +276,7 @@ public class WaybillController extends BaseController try { if(StringUtils.isEmpty(waybillOrder.getBillCode()) ){ - waybillOrder.setBillCode(emisElectronicSitePagService.realMatchWaybill(waybillOrder.getSendSiteCode(),"T7080")); + waybillOrder.setBillCode(emisElectronicSitePagService.realMatchWaybill(waybillOrder.getSendSiteCode(), "T7080")); } EmisWaybill emisWaybillSave = waybillOrder.toDb(); @@ -342,7 +342,6 @@ public class WaybillController extends BaseController try { EmisWaybill emisWaybillSave = waybillOrder.toDb(); - if(emisWaybillSave.getTotalVolume()==null){ emisWaybillSave.setTotalVolume(BigDecimal.ZERO); }