diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 6bfcee012..02f1c5399 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -497,7 +497,6 @@ public class EmisBaseService { } } - // 根据城市获取 if( (sendAreaId==null || sendAreaId==0) && !StringUtils.isEmpty(city)) { EmisRegion regionCity = getRegionByCode(city); @@ -522,7 +521,6 @@ public class EmisBaseService { destination.setSiteCode(emisCountryArea.getSiteCode()); destination.setSiteName(emisCountryArea.getSiteName()); } - } return destination; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 11b46c51a..1dd84fd49 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -1348,9 +1348,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"收件地址不在服务区域"); } - // 寄件网点判断,若果没有寄件网点则使用南京分拨中心 + // 寄件网点判断,若果没有寄件网点则使用总部 if(!StringUtils.isEmpty(emisWaybillSave.getSendSiteCode())) { - emisWaybillSave.setSendSiteCode("25000"); + emisWaybillSave.setSendSiteCode("88888"); }