邮件模板配置编辑bug修复

ds-wms-service/DS.WMS.Core/Application/Method/ApplicationService`1.cs

@@ -44,7 +44,7 @@ namespace DS.WMS.Core.Application.Method
         /// <returns></returns>
         public async Task<DataResult<TEntity>> SaveAsync(TEntity application)
         {
-            TEntity dbValue = null;
+            TEntity? dbValue = null;
             if (application.Id > 0)
             {
                 //修改需检查申请单状态
@@ -110,8 +110,6 @@ namespace DS.WMS.Core.Application.Method
                 {
                     detail.ApplicationId = application.Id;
                     var fee = fees.Find(x => x.Id == detail.RecordId);
-                    //detail.BusinessId = fee.BusinessId;
-                    //detail.BusinessType = fee.BusinessType;
                     detail.ExchangeRate = detail.ExchangeRate ?? fee.ExchangeRate;
                     detail.FeeId = fee.FeeId;
                     detail.FeeName = fee.FeeName;
@@ -189,7 +187,7 @@ namespace DS.WMS.Core.Application.Method
         /// <param name="application">提交的申请单</param>
         /// <param name="dbValue">数据库值，新增时为null</param>
         /// <returns></returns>
-        protected virtual DataResult EnsureApplication(TEntity application, TEntity dbValue)
+        protected virtual DataResult EnsureApplication(TEntity application, TEntity? dbValue)
         {
             return DataResult.Success;
         }

ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs

@@ -305,12 +305,9 @@ namespace DS.WMS.Core.Application.Method
                     CustomerAddTel = a.CustomerAddTel,
 
                     CustomerBankId = a.CustomerBankId,
-                    CustomerBankName = b1.BankName,
+                    CustomerBankName = b1.BankName + " " + b1.Account,
-                    CustomerAccount = b1.Account,
-
                     USDCustomerBankId = a.USDCustomerBankId,
-                    USDCustomerBankName = b2.BankName,
+                    USDCustomerBankName = b2.BankName + " " + b2.Account
-                    USDCustomerAccount = b2.Account
                 }).FirstAsync();
 
             if (dto != null)
@@ -434,14 +431,11 @@ namespace DS.WMS.Core.Application.Method
             return list;
         }
 
-        protected override DataResult EnsureApplication(InvoiceApplication application, InvoiceApplication dbValue)
+        protected override DataResult EnsureApplication(InvoiceApplication application, InvoiceApplication? dbValue)
         {
             if (dbValue != null && dbValue.Status != InvoiceApplicationStatus.Pending && dbValue.Status != InvoiceApplicationStatus.AuditRejected)
                 return DataResult.FailedWithDesc(nameof(MultiLanguageConst.ApplicationSaveStatusError));
 
-            if (application.Currency.IsNullOrEmpty())
-                application.Currency = FeeCurrency.RMB_CODE;
-
             return DataResult.Success;
         }
 

ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationService.cs

@@ -400,7 +400,7 @@ namespace DS.WMS.Core.Application.Method
         }
 
 
-        protected override DataResult EnsureApplication(PaymentApplication application, PaymentApplication dbValue)
+        protected override DataResult EnsureApplication(PaymentApplication application, PaymentApplication? dbValue)
         {
             if (dbValue != null)
             {

ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskMailService.cs

@@ -7,7 +7,7 @@ using DS.WMS.Core.Op.Interface.TaskInteraction;
 namespace DS.WMS.Core.Op.Method.TaskInteraction
 {
     /// <summary>
-    /// 邮件配置服务
+    /// 邮件模板配置服务
     /// </summary>
     public class TaskMailService : ServiceBase, ITaskMailService
     {
@@ -27,7 +27,8 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
         public async Task<DataResult<List<BusinessTaskMail>>> GetListAsync(PageRequest request)
         {
             var whereList = request.GetConditionalModels(Db);
-            return await TenantDb.Queryable<BusinessTaskMail>().Includes(x => x.Receiver).Includes(x => x.Sender).Includes(x => x.CC)
+            return await TenantDb.Queryable<BusinessTaskMail>()
+                .Includes(x => x.Receiver).Includes(x => x.Sender).Includes(x => x.CC)
                 .Where(whereList).ToQueryPageAsync(request.PageCondition);
         }
 
@@ -39,7 +40,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
         public async Task<DataResult<BusinessTaskMail>> GetAsync(long id)
         {
             var entity = await TenantDb.Queryable<BusinessTaskMail>()
-                .Includes(x => x.Receiver).Includes(x => x.Sender).Includes(x => x.Attachments).Includes(x => x.CC)
+                .Includes(x => x.Receiver).Includes(x => x.Sender).Includes(x => x.CC).Includes(x => x.Attachments)
                 .Where(x => x.Id == id).FirstAsync();
 
             return DataResult<BusinessTaskMail>.Success(entity);
@@ -53,8 +54,8 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
         public async Task<BusinessTaskMail> GetAsync(string name)
         {
             return await TenantDb.Queryable<BusinessTaskMail>()
-                .Includes(x => x.Receiver).Includes(x => x.Sender).Includes(x => x.Attachments).Includes(x => x.CC)
+                .Includes(x => x.Receiver).Includes(x => x.Sender).Includes(x => x.CC).Includes(x => x.Attachments)
-                .Where(x => x.Name == name).FirstAsync();
+                .Where(x => x.Name.Contains(name)).FirstAsync();
         }
 
         /// <summary>
@@ -73,11 +74,15 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
                     taskMail.Sender ??= new();
                     taskMail.CC ??= new();
 
-                    taskMail = await TenantDb.InsertNav(taskMail).Include(x => x.Receiver).Include(x => x.Sender).ExecuteReturnEntityAsync();
+                    taskMail = await TenantDb.InsertNav(taskMail)
+                        .Include(x => x.Receiver).Include(x => x.Sender).Include(x => x.CC)
+                        .ExecuteReturnEntityAsync();
                 }
                 else
                 {
-                    await TenantDb.UpdateNav(taskMail).Include(x => x.Receiver).Include(x => x.Sender).ExecuteCommandAsync();
+                    await TenantDb.UpdateNav(taskMail)
+                        .Include(x => x.Receiver).Include(x => x.Sender).Include(x => x.CC)
+                        .ExecuteCommandAsync();
                 }
 
                 if (taskMail.Attachments?.Count > 0)
@@ -86,8 +91,10 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
                     foreach (var item in list)
                         item.TaskMailId = taskMail.Id;
 
-                    await TenantDb.Deleteable<BusinessTaskAttachment>().Where(x => x.TaskMailId == taskMail.Id).ExecuteCommandAsync();
+                    //await TenantDb.Deleteable<BusinessTaskAttachment>().Where(x => x.TaskMailId == taskMail.Id).ExecuteCommandAsync();
-                    await TenantDb.Insertable(taskMail.Attachments).ExecuteCommandAsync();
+                    //await TenantDb.Insertable(taskMail.Attachments).ExecuteCommandAsync();
+
+                    await TenantDb.Storageable(taskMail.Attachments).DefaultAddElseUpdate().ExecuteCommandAsync();
                 }
 
                 await TenantDb.Ado.CommitTranAsync();
@@ -113,7 +120,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
             try
             {
                 await TenantDb.DeleteNav<BusinessTaskMail>(x => model.Ids.Contains(x.Id))
-                    .Include(x => x.Receiver).Include(x => x.Sender).Include(x => x.Attachments)
+                    .Include(x => x.Receiver).Include(x => x.Sender).Include(x => x.CC).Include(x => x.Attachments)
                     .ExecuteCommandAsync();
 
                 await TenantDb.Ado.CommitTranAsync();
@@ -127,6 +134,5 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
             }
         }
 
-
     }
 }