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 4edb1e451..91d363226 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 @@ -2656,9 +2656,10 @@ public class EmisBaseService { emisRegion.setRegionName(name); emisRegion.setParentCode(parentCode); - // 非身份则需要判断国家 + // 非省份则需要判断国家 if(StringUtils.isEmpty(parentCode)){ emisRegion.setCountryCode(countryCode); + emisRegion.setRegionType(1); } List list=emisRegionMapper.selectEmisRegionList(emisRegion); if(!CollectionUtils.isEmpty(list)) { 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 e1ed48526..5fd68bf10 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 @@ -665,6 +665,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb if(receiveCountryCode==null){ throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "收件国家不正确"); } + String rcvProviceCode=getChildRegionCodeByName(receiveCountryCode,null,emisWaybillSave.getReceiveProvince()); if(rcvProviceCode==null){ throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "收件省不正确");