aike/emis-api-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-12-04 12:38:12 +08:00
parent 97c0ace75a
commit 71e079f19b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java
View File

@ -169,6 +169,10 @@ public class CommonController extends BaseController
{ {
try { try {
AddressParseResult addressParseResult = emisRegionService.parseAddress(content); AddressParseResult addressParseResult = emisRegionService.parseAddress(content);
if(addressParseResult==null){
return AjaxResult.error("地址解析失败");
}
return AjaxResult.success("解析成功",addressParseResult); return AjaxResult.success("解析成功",addressParseResult);
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();

3
emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
View File

@ -276,7 +276,7 @@ public class WaybillController extends BaseController
try { try {
if(StringUtils.isEmpty(waybillOrder.getBillCode()) ){ if(StringUtils.isEmpty(waybillOrder.getBillCode()) ){
waybillOrder.setBillCode(emisElectronicSitePagService.realMatchWaybill(waybillOrder.getSendSiteCode(),"T7080")); waybillOrder.setBillCode(emisElectronicSitePagService.realMatchWaybill(waybillOrder.getSendSiteCode(), "T7080"));
} }
EmisWaybill emisWaybillSave = waybillOrder.toDb(); EmisWaybill emisWaybillSave = waybillOrder.toDb();
@ -342,7 +342,6 @@ public class WaybillController extends BaseController
try { try {
EmisWaybill emisWaybillSave = waybillOrder.toDb(); EmisWaybill emisWaybillSave = waybillOrder.toDb();
if(emisWaybillSave.getTotalVolume()==null){ if(emisWaybillSave.getTotalVolume()==null){
emisWaybillSave.setTotalVolume(BigDecimal.ZERO); emisWaybillSave.setTotalVolume(BigDecimal.ZERO);
} }