1 财务单抬头

REBORN.CacheManager/User/RbBranchMongoCache.cs

@@ -88,6 +88,7 @@ namespace REBORN.CacheManager.User
                        .Set(d => d.B2BShow, branch.B2BShow)
                        .Set(d => d.StandardCurrencyId, branch.StandardCurrencyId)
                        .Set(d => d.StandardCurrencyName, branch.StandardCurrencyName)
+                       .Set(d => d.FinanceTitle, branch.FinanceTitle)
                    ;
                 try
                 {

REBORN.Model/Entity/User/RB_Branch.cs

@@ -267,5 +267,10 @@ namespace REBORN.Model.Entity
         /// 本位币名称
         /// </summary>
         public string StandardCurrencyName { get; set; }
+
+        /// <summary>
+        /// 财务单据抬头 （没有就使用集团名称）
+        /// </summary>
+        public string FinanceTitle { get; set; }
     }
 }
\ No newline at end of file

REBORN.Module.PlatformModule/BranchModule.cs

@@ -193,6 +193,7 @@ namespace REBORN.Module.PlatformModule
                 bmodel.ServiceFee = demodel.ServiceFee;
                 bmodel.StandardCurrencyId = demodel.StandardCurrencyId;
                 bmodel.StandardCurrencyName = demodel.StandardCurrencyName;
+                bmodel.FinanceTitle = demodel.FinanceTitle;
                 flag = respository.Update(bmodel);
                 if (flag)
                 {
@@ -266,6 +267,7 @@ namespace REBORN.Module.PlatformModule
                     IsFreeFee=demodel.IsFreeFee,
                     ServiceFee=demodel.ServiceFee,
                     StandardCurrencyId=demodel.StandardCurrencyId,
+                    FinanceTitle = demodel.FinanceTitle
                 };
                 flag = respository.Insert(bmodel) > 0;
                 branchMCache.Set(bmodel);

REBORN.Services.FinanceService/FinancialService.cs

@@ -1862,6 +1862,7 @@ namespace REBORN.Services.FinanceService
                     KingdeeClientBankAccountList = clientBankAccountRepository.GetList(new RB_ClientBankAccount() { RB_Group_Id = userInfo.RB_Group_id }, "", model.KingdeeClientID.ToString());
                 }
                 if (model.vorcherInos == null || !model.vorcherInos.Any()) { model.vorcherInos.Add(new RB_Voucher_Extend() { ID = 0, Type = VoucherEnum.Picture, VoucherType = 0, Content = "" }); }
+                model.RB_GroupName = new CacheManager.User.RbBranchMongoCache().GetBranch(model.RB_Branch_Id.Value)?.FinanceTitle ?? "";//集团使用配置的
                 var obj = new
                 {
                     model.FrID,
@@ -2329,6 +2330,7 @@ namespace REBORN.Services.FinanceService
                 {
                     KingdeeClientBankAccountList = clientBankAccountRepository.GetList(new RB_ClientBankAccount() { RB_Group_Id = userInfo.RB_Group_id }, "", model.KingdeeClientID.ToString());
                 }
+                model.RB_GroupName = new CacheManager.User.RbBranchMongoCache().GetBranch(model.RB_Branch_Id.Value)?.FinanceTitle ?? "";//集团使用配置的
                 obj = new
                 {
                     model.FrID,

REBORN.Services.PlatformService/BranchService.cs

@@ -66,6 +66,12 @@ namespace REBORN.Services.PlatformService
                     list = list.Where(x => x.Id != 1250).ToList();
                 }
             }
+            if (list.Where(x=> string.IsNullOrEmpty(x.FinanceTitle)).Any()) {
+                string GroupName = CacheManager.User.RbGroupCache.GetGroup(userInfo.RB_Group_id)?.GroupName ?? "";
+                foreach (var item in list.Where(x => string.IsNullOrEmpty(x.FinanceTitle))) {
+                    item.FinanceTitle = GroupName;
+                }
+            }
             return ApiResult.Success("", list);
         }
 
@@ -112,6 +118,7 @@ namespace REBORN.Services.PlatformService
                 dmodel.IsFreeFee,
                 dmodel.ServiceFee,
                 dmodel.StandardCurrencyId,
+                dmodel.FinanceTitle,
                 TravelLogo = Config.GetFileUrl(dmodel.TravelLogo)
             });
         }