aike/emis-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-09-18 11:38:36 +08:00
parent f1300277ad
commit 826496fc2f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -2656,9 +2656,10 @@ public class EmisBaseService {
emisRegion.setRegionName(name); emisRegion.setRegionName(name);
emisRegion.setParentCode(parentCode); emisRegion.setParentCode(parentCode);
// 非身份则需要判断国家 // 非省份则需要判断国家
if(StringUtils.isEmpty(parentCode)){ if(StringUtils.isEmpty(parentCode)){
emisRegion.setCountryCode(countryCode); emisRegion.setCountryCode(countryCode);
emisRegion.setRegionType(1);
} }
List<EmisRegion> list=emisRegionMapper.selectEmisRegionList(emisRegion); List<EmisRegion> list=emisRegionMapper.selectEmisRegionList(emisRegion);
if(!CollectionUtils.isEmpty(list)) { if(!CollectionUtils.isEmpty(list)) {

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -665,6 +665,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
if(receiveCountryCode==null){ if(receiveCountryCode==null){
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "收件国家不正确"); throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "收件国家不正确");
} }
String rcvProviceCode=getChildRegionCodeByName(receiveCountryCode,null,emisWaybillSave.getReceiveProvince()); String rcvProviceCode=getChildRegionCodeByName(receiveCountryCode,null,emisWaybillSave.getReceiveProvince());
if(rcvProviceCode==null){ if(rcvProviceCode==null){
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "收件省不正确"); throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "收件省不正确");