From 3212335687efa8304cd810b0816bd85fe70d1323 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Jun 2024 12:41:06 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

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 f0398741d..8fdb72d19 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
@@ -393,19 +393,28 @@ public class EmisBaseService {
       */
      public EmisDestination calcDestSiteByBase(String country,String lineCode, String province, String city, String county, String address) {
 
-
+         EmisDestination destination=null;
          // 获取 areaId
          Long areaId = null;
 
+         // 根据区获取目的地
+         if(!StringUtils.isEmpty(county)) {
+             EmisRegion regionCounty = getRegionByCode(county);
+             if (regionCounty != null) {
+                 areaId = regionCounty.getAreaId();
+             }
+         }
+
+
          // 根据城市获取目的地
-         if(!StringUtils.isEmpty(city)) {
+         if(areaId==null && !StringUtils.isEmpty(city)) {
              EmisRegion regionCity = getRegionByCode(city);
              if (regionCity != null) {
                  areaId = regionCity.getAreaId();
              }
          }
 
-         // 根据城市获取目的地
+         // 根据省获取目的地
          if(areaId==null && !StringUtils.isEmpty(province)){
              EmisRegion regionProvice= getRegionByCode(province);
              if(regionProvice!=null){
@@ -413,7 +422,20 @@ public class EmisBaseService {
              }
          }
 
-         return getDestinationByCountryOrAreaId(country,areaId);
+         // 根据大区获取目的网点
+         if(areaId!=null) {
+             EmisDestination queryEmisDestination = new EmisDestination();
+             queryEmisDestination.setCountryAreaId(areaId);
+             queryEmisDestination.setStatus(1);
+             List<EmisDestination> destinationList = emisDestinationMapper.selectEmisDestinationList(queryEmisDestination);
+             if (!CollectionUtil.isEmpty(destinationList)) {
+                 destination=destinationList.get(0);
+             }
+         }
+
+         return destination;
+
+//         return getDestinationByCountryOrAreaId(country,areaId);
 
      }