diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
index e263eae23..a8f950410 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
@@ -247,6 +247,12 @@ public class EmisCustomerUserController extends EmisBaseController
                 return AjaxResult.error("月结卡号已存在");
             }
 
+            // 判断是否开通OMS
+            if("1".equals(emisCustomerUser.getBlOpenOms())){
+                // 给客户授权角色
+
+            }
+
             return toAjax(emisCustomerUserService.updateEmisCustomerUser(emisCustomerUser));
         } catch (DuplicateKeyException e) {
             e.printStackTrace();
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountryArea.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountryArea.java
index fed33cc86..14fd10d08 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountryArea.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountryArea.java
@@ -43,6 +43,11 @@ public class EmisCountryArea extends BaseEntity
     private String countryCode;
     /* 国际名称 */
     private String countryName;
+    /* 服务网点 */
+    private String siteCode;
 
+//    扩展字段
+//    服务网点名称
+    private String siteName;
 
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index b9a1c74df..f9e6353b6 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -893,8 +893,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         boolean blUnPack=false;
         Map countryMap = new HashMap();
 
+        Map billCodeMap = new HashMap();
+
         String destCountry=null;
 
+        // 同批次主单子单不允许混装
+
         // 子单号处理
         for (String scanBillCode : billCodeArr) {
             // 返回原始数据返回
@@ -997,19 +1001,19 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                 }
             }
 
-            if(destCountry==null){
-                destCountry=emisWaybill.getReceiveCountry();
-            }
-            else{
-                // 不允许有不同国家的货混装
-                if( !destCountry.equals(emisWaybill.getReceiveCountry()) ){
-                    scanResultItem.setResult("fail");
-                    scanResultItem.setMessage("不同国家的货不允许混装");
-                    scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
-                    itemList.add(scanResultItem);
-                    return itemList;
-                }
-            }
+//            if(destCountry==null){
+//                destCountry=emisWaybill.getReceiveCountry();
+//            }
+//            else{
+//                // 不允许有不同国家的货混装
+//                if( !destCountry.equals(emisWaybill.getReceiveCountry()) ){
+//                    scanResultItem.setResult("fail");
+//                    scanResultItem.setMessage("不同国家的货不允许混装");
+//                    scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
+//                    itemList.add(scanResultItem);
+//                    return itemList;
+//                }
+//            }
 
             // 记录总票数
             if(!mainBillMap.containsKey(mainBillCode)){
diff --git a/emis-biz/src/main/resources/mapper/EmisCountryAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisCountryAreaMapper.xml
index 3728aa248..5c30628e7 100644
--- a/emis-biz/src/main/resources/mapper/EmisCountryAreaMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCountryAreaMapper.xml
@@ -10,23 +10,26 @@
         <result property="nameEn"    column="name_en"    />
         <result property="countryCode"    column="country_code"    />
         <result property="countryName"    column="country_name"    />
+        <result property="siteCode"    column="site_code"    />
 
-
+        <association property="siteName"    column="site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
 
     </resultMap>
 
     <sql id="selectEmisCountryAreaVo">
-        select id, name, name_en, country_code, country_name, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_country_area
+        select id, name, name_en, country_code, country_name, site_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_country_area
     </sql>
 
     <select id="selectEmisCountryAreaList" parameterType="EmisCountryArea" resultMap="EmisCountryAreaResult">
         <include refid="selectEmisCountryAreaVo"/>
         <where>
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="nameEn != null  and nameEn != ''"> and name_en like concat('%', #{nameEn}, '%')</if>
             <if test="countryCode != null  and countryCode != ''"> and country_code like concat('%', #{countryCode}, '%')</if>
             <if test="countryName != null  and countryName != ''"> and country_name like concat('%', #{countryName}, '%')</if>
+            <if test="siteCode != null  and siteCode != ''"> and site_code like concat('%', #{siteCode}, '%')</if>
             <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="tenantId != null  and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
@@ -40,13 +43,34 @@
         order by create_time desc
     </select>
 
+    <select id="checkUnique" parameterType="EmisCountryArea"  resultType="int">
+		select count(1) from  emis_country_area
+		where del_flag='0'
+           and id = #{id}
+           and name = #{name}
+           and name_en = #{nameEn}
+           and country_code = #{countryCode}
+           and country_name = #{countryName}
+           and site_code = #{siteCode}
+           and remark = #{remark}
+           and tenant_id = #{tenantId}
+           and del_flag = #{delFlag}
+           and create_by = #{createBy}
+           and create_time = #{createTime}
+           and update_by = #{updateBy}
+           and update_time = #{updateTime}
+           and create_site = #{createSite}
+           and update_site = #{updateSite}
+		limit 1
+	</select>
+
     <select id="selectEmisCountryAreaById" parameterType="Long" resultMap="EmisCountryAreaResult">
-        select id, name, name_en, country_code, country_name, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, name, name_en, country_code, country_name, site_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_country_area a
         where a.id = #{id}
     </select>
 
-    <insert id="insertEmisCountryArea" parameterType="EmisCountryArea">
+    <insert id="insertEmisCountryArea" parameterType="EmisCountryArea" useGeneratedKeys="true" keyProperty="id">
         insert into emis_country_area
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -54,6 +78,7 @@
             <if test="nameEn != null and nameEn != ''">name_en,</if>
             <if test="countryCode != null and countryCode != ''">country_code,</if>
             <if test="countryName != null and countryName != ''">country_name,</if>
+            <if test="siteCode != null and siteCode != ''">site_code,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="tenantId != null and tenantId != ''">tenant_id,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
@@ -70,6 +95,7 @@
             <if test="nameEn != null and nameEn != ''">#{nameEn},</if>
             <if test="countryCode != null and countryCode != ''">#{countryCode},</if>
             <if test="countryName != null and countryName != ''">#{countryName},</if>
+            <if test="siteCode != null and siteCode != ''">#{siteCode},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@@ -89,6 +115,7 @@
             <if test="nameEn != null and nameEn != ''">name_en = #{nameEn},</if>
             <if test="countryCode != null and countryCode != ''">country_code = #{countryCode},</if>
             <if test="countryName != null and countryName != ''">country_name = #{countryName},</if>
+            <if test="siteCode != null and siteCode != ''">site_code = #{siteCode},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>