From 95cb313ff26b52468f89ab0e72e58ab5e44d2218 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 22 Jul 2025 14:43:33 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=20-=20=E6=9C=88=E7=BB=93?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=95=8C=E9=9D=A2=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=20=20=20=E6=9C=88=E7=BB=93?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=AF=BC=E5=85=A5=E9=AA=8C=E9=87=8D=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91bug=E4=BF=AE=E5=A4=8D=20=20=E4=BF=AE=E6=94=B9=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95selectOne=20bug=E4=BF=AE=E5=A4=8D=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7phone=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=AA=E5=AF=BC=E5=85=A5=E6=98=BE=E7=A4=BA=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=20=20?=
 =?UTF-8?q?=E6=9C=89=E8=99=9A=E6=8B=9F=E5=8D=95=E7=BB=91=E5=AE=9A=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB=E7=9A=84=E4=B8=8D=E5=85=81=E8=AE=B8=E9=9D=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/domain/EmisCustomerUser.java     |  7 +++++
 .../erp/emis/service/EmisBaseService.java     |  6 +----
 .../impl/EmisTmsScanRecordServiceImpl.java    | 18 +++++++++++++
 .../mapper/EmisCustomerUserMapper.xml         | 26 +++++++++++++------
 4 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java
index a379e2b50..2b876a79c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java
@@ -126,6 +126,10 @@ public class EmisCustomerUser extends BaseEntity
     private String payee;
     /* 销售联系人 */
     private String salesmen;
+    /* 销售支持 */
+    private String salesSupport;
+    /* 销售主管 */
+    private String salesExecutive;
     /* 数据来源 */
     private String dataFrom;
     /* 是否开通oms */
@@ -174,6 +178,9 @@ public class EmisCustomerUser extends BaseEntity
     /* 专属业务员 */
     private String opEmpName;
 
+    /* 是否是导入操作，1：是 */
+    private String blImport;
+
 //    最近下单时间
      @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date lastOrderTime;
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 63c531b98..a7383d097 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
@@ -3439,13 +3439,9 @@ public class EmisBaseService {
              emisCustomerUserMapper.insertEmisCustomerUser(emisCustomerUser);
              // 插入角色
              emisCustomerUserMapper.insertSysOmsUserRole(emisCustomerUser.getId());
-
-             redissonService.unlock("EMIS_CREATE_USER_LOCK");
              return emisCustomerUser;
-         }catch(Exception ex){
+         } finally {
              redissonService.unlock("EMIS_CREATE_USER_LOCK");
-             ex.printStackTrace();
-             return emisCustomerUser;
          }
      }
 
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 4f64543d6..6ffa354e2 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
@@ -1915,6 +1915,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             // 获取主单号
             String mainBillCode = getMainBillCode(scanBillCode);
 
+            // 有虚拟单绑定关系的不允许面单删除
+            checkVirtual(problemType, mainBillCode);
+
             // bug:1454,未开单不允许扫描
             boolean isGot = checkWaybillIsGot(mainBillCode);
             if (!isGot) {
@@ -2023,6 +2026,21 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         return itemList;
     }
 
+    private void checkVirtual(String problemType, String mainBillCode) throws EmisBizError {
+        if ("151".equals(problemType)) {
+            EmisWaybill emisWaybill = emisWaybillMapper.selectEmisWaybillByBillCode(mainBillCode);
+            if (Objects.isNull(emisWaybill)) {
+                return;
+            }
+            if ("1".equals(emisWaybill.getBlVirtual())) {
+                throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR, "该运单已绑定主单，请先解绑");
+            }
+            if (StringUtils.isNotBlank(emisWaybill.getVirtualRemark())) {
+                throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR, "该运单已绑定虚拟单，请先解绑");
+            }
+        }
+    }
+
     /**
      * 填充公共数据
      * @param emisTmsScanRecord
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
index a7082495c..48c4ed901 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
@@ -59,6 +59,8 @@
         <result property="settleDay"    column="settle_day"    />
         <result property="status"    column="status"    />
         <result property="orderNum"    column="order_num"    />
+        <result property="salesSupport" column="sales_support"/>
+        <result property="salesExecutive" column="sales_executive"/>
 
         <result property="custNo"    column="monthly_pay_code"    />
         <result property="custName"    column="customer_name"    />
@@ -88,7 +90,7 @@
 
 
     <sql id="selectEmisCustomerUserVo">
-        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user
+        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, sales_support, sales_executive, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user
     </sql>
 
 <!--    or FIND_IN_SET(#{ownerSite},biz_site)-->
@@ -161,6 +163,8 @@
             <if test="creditPeriodType != null  and creditPeriodType != ''"> and credit_period_type=#{creditPeriodType}</if>
             <if test="creditPeriod != null "> and credit_period = #{creditPeriod}</if>
             <if test="settleDay != null "> and settle_day = #{settleDay}</if>
+            <if test="salesSupport != null  and salesSupport != ''"> and sales_support = #{salesSupport}</if>
+            <if test="salesExecutive != null  and salesExecutive != ''"> and sales_executive = #{salesExecutive}</if>
 
             <choose>
                 <when test="payee != null  and payee != '' and salesmen != null  and salesmen != ''">
@@ -180,7 +184,7 @@
     </select>
 
     <select id="selectEmisCustomerUserById" parameterType="Long" resultMap="EmisCustomerUserResult">
-        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, sales_support, sales_executive, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_customer_user a
         where a.id = #{id}
     </select>
@@ -241,6 +245,8 @@
             <if test="settleDay != null">settle_day,</if>
             <if test="status != null and status != ''">status,</if>
             <if test="orderNum != null and orderNum != ''">order_num,</if>
+            <if test="salesSupport != null and salesSupport != ''">sales_support,</if>
+            <if test="salesExecutive != null and salesExecutive != ''">sales_executive,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
@@ -304,6 +310,8 @@
             <if test="settleDay != null">#{settleDay},</if>
             <if test="status != null and status != ''">#{status},</if>
             <if test="orderNum != null and orderNum != ''">#{orderNum},</if>
+            <if test="salesSupport != null and salesSupport != ''">#{salesSupport},</if>
+            <if test="salesExecutive != null and salesExecutive != ''">#{salesExecutive},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -371,6 +379,8 @@
             <if test="settleDay != null">settle_day = #{settleDay},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
+            <if test="salesSupport != null and salesSupport != ''">sales_support = #{salesSupport},</if>
+            <if test="salesExecutive != null and salesExecutive != ''">sales_executive = #{salesExecutive},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
@@ -418,25 +428,25 @@
 <!--    </select>-->
 
     <select id="selectEmisCustomerUserByPhone" parameterType="string" resultMap="EmisCustomerUserResult">
-        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, sales_support, sales_executive, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_customer_user a
-        where a.phone = #{phone}
+        where a.del_flag='0' and a.phone = #{phone}
     </select>
 
     <select id="selectCustomerByCustomerCode" parameterType="string" resultMap="EmisCustomerUserResult">
-        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, sales_support, sales_executive, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_customer_user a
-        where a.customer_code = #{customerCode}
+        where a.del_flag='0' and a.customer_code = #{customerCode}
     </select>
 
     <select id="selectMonthCustomerByName" parameterType="string" resultMap="EmisCustomerUserResult">
-        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, sales_support, sales_executive, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_customer_user a
         where a.del_flag='0' and a.customer_type='2' and a.customer_name = #{customerName}
     </select>
 
     <select id="selectMonthCustomerByMonthlyPayCode" parameterType="string" resultMap="EmisCustomerUserResult">
-        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, sales_support, sales_executive, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_customer_user a
         where a.del_flag='0' and a.customer_type='2'  and a.monthly_pay_code= #{monthlyPayCode}
     </select>