1

REBORN.Module.UserModule/EmployeeModule.cs

@@ -13,6 +13,7 @@ using REBORN.Model.Extend;
 using REBORN.Model.Extend.Finance;
 using REBORN.Model.File;
 using REBORN.Repository;
+using REBORN.Repository.Dmc;
 using REBORN.Repository.Finance;
 using REBORN.Repository.Million;
 using REBORN.Repository.User;
@@ -41,6 +42,10 @@ namespace REBORN.Module.UserModule
         /// </summary>
         private RB_ClientBankAccountRepository clientBankAccountRepository = new RB_ClientBankAccountRepository();
         /// <summary>
+        /// 地接供应商 类型
+        /// </summary>
+        private Rb_Supplier_TypeRepository supplier_TypeRepository = new Rb_Supplier_TypeRepository();
+        /// <summary>
         /// 财务日志
         /// </summary>
         private RB_Finance_InfoChange_LogRepository finance_InfoChange_LogRepository = new RB_Finance_InfoChange_LogRepository();
@@ -1006,7 +1011,17 @@ namespace REBORN.Module.UserModule
         /// <param name="bAId"></param>
         public Model.Entity.Finance.RB_ClientBankAccount GetEmpBackAccount(int bAId)
         {
-            return clientBankAccountRepository.GetEntity(bAId);
+            var model = clientBankAccountRepository.GetEntity(bAId);
+            if (model != null)
+            {
+                //默认 老春的新版 供应商 都=1    supplier_Type表 抓关联关系
+                if (model.Type == Common.Enum.Finance.ClientTypeEnum.HotelSupplier)
+                {
+                    var smodel = supplier_TypeRepository.GetSupplierTypeListRepository((model.ObjID ?? 0).ToString(), model.RB_Group_Id ?? 0).FirstOrDefault();
+                    model.Type = smodel.Type;//随便赋值
+                }
+            }
+            return model;
         }
 
         /// <summary>

REBORN.Services.UserService/EmployeeService.cs

@@ -1146,6 +1146,20 @@ namespace REBORN.Services.UserService
             dmodel.RB_BranchName = userInfo.BranchName;
             dmodel.RB_CreateByName = userInfo.emName;
             dmodel.Status = 0;
+            #region 特殊处理 Type
+
+            if (dmodel.Type == Common.Enum.Finance.ClientTypeEnum.HotelSupplier ||
+                dmodel.Type == Common.Enum.Finance.ClientTypeEnum.TicketSupplier ||
+                dmodel.Type == Common.Enum.Finance.ClientTypeEnum.CarSupplier ||
+                dmodel.Type == Common.Enum.Finance.ClientTypeEnum.VisaSupplier ||
+                dmodel.Type == Common.Enum.Finance.ClientTypeEnum.PlaneTicketSupplier ||
+                dmodel.Type == Common.Enum.Finance.ClientTypeEnum.Travel ||
+                dmodel.Type == Common.Enum.Finance.ClientTypeEnum.OtherSupplier) {
+                //统一处理  根据供应商类型 type来区分 供应商，因为 一个供应商对应多个类型
+                dmodel.Type = Common.Enum.Finance.ClientTypeEnum.HotelSupplier;
+            }
+
+            #endregion
             bool flag = employeemodule.SetEmpBankAccount(dmodel, isOtherEdit, out int ClientId, out string msg);
             if (flag)
             {