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 a5a1cff4a..a23d8b5be 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
@@ -241,6 +241,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         boolean isNew = true;
         EmisWaybill emisWaybillOld = null;
 
+        // 下单网点
+        String sendSiteCode=SecurityUtils.getLoginUser().getUser().getOwnerSiteCode();
+        emisWaybillSave.setSendSiteCode(sendSiteCode);
+
         // 如果没有单号就生成单号，如果有单号需要判断是否重复
         if( !StringUtils.isEmpty(emisWaybillSave.getBillCode()) ) {
             boolean isExists = this.checkWaybillIsExists(emisWaybillSave.getBillCode());
@@ -248,10 +252,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                 throw new EmisBizError(EmisBizErrorType.EXISTS, "运单号重复");
             }
         }else{
-            // 下单网点
-            String sendSiteCode=SecurityUtils.getLoginUser().getUser().getOwnerSiteCode();
-            emisWaybillSave.setSendSiteCode(sendSiteCode);
-
             // 生成新的运单号
             String waybillNo = emisElectronicSitePagService.realMatchWaybill(sendSiteCode,"T7080");
             emisWaybillSave.setBillCode(waybillNo);
diff --git a/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml b/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
index a7c48824e..4c0906864 100644
--- a/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
@@ -19,7 +19,6 @@
         <result property="zipCode"    column="zip_code"    />
         <result property="orderNum"    column="order_num"    />
 
-
 <!--        <result property="countryName"    column="country_name"    />-->
         <association property="countryName"    column="country_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>