审核类任务返回错误提示

ds-wms-service/DS.WMS.Core/Application/Dtos/InvoiceApplicationDto.cs

@@ -176,11 +176,6 @@ namespace DS.WMS.Core.Application.Dtos
         /// 未结算金额
         /// </summary>
         public string UnsettledAmount => UnsettledList == null ? string.Empty : string.Join(" ", UnsettledList);
-
-        /// <summary>
-        /// 是否已审核（仅用于查询）
-        /// </summary>
-        public bool? IsAudited { get; set; }
     }
 
     public class CurrencyAmount

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

@@ -4,10 +4,10 @@ using DS.WMS.Core.Application.Interface;
 using DS.WMS.Core.Fee.Dtos;
 using DS.WMS.Core.Fee.Method;
 using DS.WMS.Core.Flow.Dtos;
-using DS.WMS.Core.Flow.Entity;
 using DS.WMS.Core.Flow.Interface;
 using DS.WMS.Core.Op.Dtos.TaskInteraction;
 using DS.WMS.Core.Op.Interface.TaskInteraction;
+using Masuit.Tools.Systems;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace DS.WMS.Core.Application.Method
@@ -150,6 +150,9 @@ namespace DS.WMS.Core.Application.Method
         /// <returns></returns>
         public async Task<DataResult> UpdateStatusAsync(FlowCallback callback)
         {
+            if (callback.AuditType != AuditType)
+                return DataResult.Failed($"回调工作流类型：{callback.AuditType.GetDescription()} 与实例工作流类型：{AuditType.GetDescription()} 不一致");
+
             var app = await TenantDb.Queryable<TEntity>().Where(x => x.Id == callback.BusinessId)
                 .Select(x => new TEntity
                 {

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

@@ -423,11 +423,10 @@ namespace DS.WMS.Core.Application.Method
                 return result;
 
             List<TEntity> entities = new(idArray.Length);
-            bool hasAuthorized = await taskService.HasAuthorizedAsync();
             await TenantDb.Ado.BeginTranAsync();
             try
             {
-                if (hasAuthorized)
+                if (await taskService.HasAuthorizedAsync())
                 {
                     for (int i = 0; i < list.Count; i++)
                     {
@@ -439,13 +438,12 @@ namespace DS.WMS.Core.Application.Method
                             TaskTitle = $"【{auditType.GetDescription()}】{item.ApplicationNO}"
                         };
                         result = await taskService.CreateTaskAsync(req);
+                        if (!result.Succeeded)
+                            return result;
 
-                        if (result.Succeeded)
-                        {
-                            var entity = new TEntity { Id = req.BusinessId };
-                            OnSubmitApproval(entity);
-                            entities.Add(entity);
-                        }
+                        var entity = new TEntity { Id = req.BusinessId };
+                        OnSubmitApproval(entity);
+                        entities.Add(entity);
                     }
                 }
                 else

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

@@ -105,10 +105,6 @@ namespace DS.WMS.Core.Application.Method
 
         protected override async Task OnUpdateStatusAsync(FlowCallback callback, InvoiceApplication application)
         {
-            var auditType = callback.AuditType;
-            if (auditType != TaskBaseTypeEnum.APPLICATION_INVOICE_AUDIT)
-                return;
-
             if (callback.FlowStatus == FlowStatusEnum.Approve)
             {
                 application.Status = InvoiceApplicationStatus.AuditPassed;

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

@@ -319,9 +319,9 @@ namespace DS.WMS.Core.Application.Method
             if (dto != null)
             {
                 dto.CreateByName = await Db.Queryable<SysUser>().Where(x => x.Id == dto.CreateBy).Select(x => x.UserName).FirstAsync();
+                dto.SaleDeptName = await Db.Queryable<SysOrg>().Where(x => x.Id == dto.SaleDeptId).Select(x => x.OrgName).FirstAsync();
 
                 dto.InvoiceDetails = await TenantDb.Queryable<InvoiceDetail>().Where(x => x.ApplicationId == dto.Id && x.Category == DetailCategory.InvoiceApplication).ToListAsync();
-
                 dto.Details = await TenantDb.Queryable<ApplicationDetail>().LeftJoin<FeeRecord>((d, f) => d.RecordId == f.Id)
                     .Where(d => d.ApplicationId == id).Select((d, f) => new InvoiceApplicationDetailDto
                     {

ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/ITaskService.cs

@@ -112,6 +112,6 @@ namespace DS.WMS.Core.Op.Interface.TaskInteraction
         /// <param name="remark">备注</param>
         /// <param name="taskTypes">任务类型，不指定任务类型则删除全部任务</param>
         /// <returns></returns>
-        Task<DataResult> Delete(long id, BusinessType? businessType, string? remark = null, params TaskBaseTypeEnum[] taskTypes);
+        Task<DataResult> DeleteAsync(long id, BusinessType? businessType, string? remark = null, params TaskBaseTypeEnum[] taskTypes);
     }
 }

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

@@ -1032,46 +1032,38 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
         /// <param name="remark">备注</param>
         /// <param name="taskTypes">任务类型，不指定任务类型则删除全部任务</param>
         /// <returns></returns>
-        public async Task<DataResult> Delete(long id, BusinessType? businessType, string? remark = null, params TaskBaseTypeEnum[] taskTypes)
+        public async Task<DataResult> DeleteAsync(long id, BusinessType? businessType, string? remark = null, params TaskBaseTypeEnum[] taskTypes)
         {
             if (!await HasAuthorizedAsync())
                 return DataResult.SuccessedWithDesc(nameof(MultiLanguageConst.ModuleUnauthorized));
 
             string[]? typeNames = taskTypes?.Select(x => x.ToString()).ToArray();
 
+            int rows = 0;
             await TenantDb.Ado.BeginTranAsync();
             try
             {
-                //long userId = long.Parse(User.UserId);
-                //await Db.Updateable(new FlowInstance
-                //{
-                //    Id = task.FlowId.Value,
-                //    DeleteBy = long.Parse(User.UserId),
-                //    DeleteTime = DateTime.Now,
-                //    Deleted = true
-                //}).UpdateColumns(x => new { x.DeleteBy, x.DeleteTime, x.Deleted }).ExecuteCommandAsync();
-
-                await Db.Deleteable<FlowInstance>().Where(x => x.BusinessId == id)
+                rows = await Db.Deleteable<FlowInstance>().Where(x => x.BusinessId == id)
                     .WhereIF(businessType.HasValue, x => x.BusinessType == businessType)
                     .WhereIF(taskTypes != null && taskTypes.Length > 0, x => taskTypes.Contains(x.AuditType.Value))
                     .ExecuteCommandAsync();
 
-                await TenantDb.Deleteable<TaskBaseAllocation>().Where(x => SqlFunc.Subqueryable<TaskBaseInfo>().Where(
+                rows += await TenantDb.Deleteable<TaskBaseAllocation>().Where(x => SqlFunc.Subqueryable<TaskBaseInfo>().Where(
                     y => x.TaskId == y.Id && y.TASK_SOURCE == "WORK_FLOW" && y.OUT_BS_NO == id)
                     .WhereIF(typeNames != null && typeNames.Length > 0, x => typeNames.Contains(x.TASK_TYPE))
                     .Any()).ExecuteCommandAsync();
 
-                await TenantDb.Deleteable<TaskBaseInfo>().Where(x => x.TASK_SOURCE == "WORK_FLOW" && x.OUT_BS_NO == id)
+                rows += await TenantDb.Deleteable<TaskBaseInfo>().Where(x => x.TASK_SOURCE == "WORK_FLOW" && x.OUT_BS_NO == id)
                     .WhereIF(typeNames != null && typeNames.Length > 0, x => typeNames.Contains(x.TASK_TYPE))
                     .ExecuteCommandAsync();
 
-                await TenantDb.Deleteable<BusinessTask>().Where(x => x.BusinessId == id)
+                rows += await TenantDb.Deleteable<BusinessTask>().Where(x => x.BusinessId == id)
                     .WhereIF(businessType.HasValue, x => x.BusinessType == businessType)
                     .WhereIF(typeNames != null && typeNames.Length > 0, x => taskTypes.Contains(x.TaskType))
                     .ExecuteCommandAsync();
 
                 if (string.IsNullOrEmpty(remark))
-                    remark = "删除任务" + (typeNames != null && typeNames.Length > 0 ? $"【{string.Join(",", typeNames)}】" : string.Empty);
+                    remark = "删除任务" + (typeNames != null && typeNames.Length > 0 ? $"【{string.Join(",", typeNames)}】，受影响行数：" + rows : string.Empty);
 
                 await LogService.WriteLogAsync(new BusinessTaskLog
                 {

ds-wms-service/DS.WMS.Core/Settlement/Entity/SettlementBase.cs

@@ -23,13 +23,16 @@ namespace DS.WMS.Core.Settlement.Entity
         public DateTime SettlementDate { get; set; }
 
         /// <summary>
-        /// 结算方式
+        /// 结算方式ID
         /// </summary>
-        [SugarColumn(ColumnDescription = "结算方式", IsNullable = true)]
+        [SugarColumn(ColumnDescription = "结算方式ID", IsNullable = true)]
         public long? SettlementTypeId { get; set; }
 
+        /// <summary>
+        /// 结算方式
+        /// </summary>
         [Navigate(NavigateType.OneToOne, nameof(SettlementTypeId))]
-        public CodeStlMode SettlementType { get; set; }
+        public CodeStlMode? SettlementType { get; set; }
 
         /// <summary>
         /// 结算类型

ds-wms-service/DS.WMS.Core/Settlement/Interface/IInvoiceSettlementService.cs

@@ -0,0 +1,25 @@
+using DS.Module.Core;
+using DS.WMS.Core.Application.Dtos;
+
+namespace DS.WMS.Core.Settlement.Interface
+{
+    /// <summary>
+    /// 发票结算
+    /// </summary>
+    public interface IInvoiceSettlementService
+    {
+        /// <summary>
+        /// 获取待结算的发票申请列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<DataResult<List<InvoiceApplicationDto>>> GetInvoiceListAsync(PageRequest request);
+
+        /// <summary>
+        /// 获取发票申请费用明细
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        Task<DataResult<List<ApplicationDetailDto>>> GetInvoiceDetailsAsync(params long[] ids);
+    }
+}

ds-wms-service/DS.WMS.Core/Settlement/Method/InvoiceSettlementService.cs

@@ -1,16 +1,20 @@
 using DS.Module.Core;
-using DS.WMS.Core.Application.Dtos;
-using DS.WMS.Core.Settlement.Entity;
 using DS.Module.Core.Extensions;
+using DS.WMS.Core.Application.Dtos;
 using DS.WMS.Core.Application.Entity;
+using DS.WMS.Core.Code.Entity;
 using DS.WMS.Core.Fee.Entity;
+using DS.WMS.Core.Op.Entity;
+using DS.WMS.Core.Settlement.Entity;
+using DS.WMS.Core.Settlement.Interface;
+using DS.WMS.Core.Sys.Entity;
 
 namespace DS.WMS.Core.Settlement.Method
 {
     /// <summary>
     /// 发票结算
     /// </summary>
-    public class InvoiceSettlementService : SettlementService<PaymentSettlement>
+    public class InvoiceSettlementService : SettlementService<PaymentSettlement>, IInvoiceSettlementService
     {
         /// <summary>
         /// 初始化
@@ -25,7 +29,7 @@ namespace DS.WMS.Core.Settlement.Method
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public async Task<DataResult<List<InvoiceApplicationDto>>> GetApplicationListAsync(PageRequest request)
+        public async Task<DataResult<List<InvoiceApplicationDto>>> GetInvoiceListAsync(PageRequest request)
         {
             var whereList = request.GetConditionalModels(Db);
             var result = await TenantDb.Queryable<InvoiceApplication>()
@@ -33,19 +37,57 @@ namespace DS.WMS.Core.Settlement.Method
                 .InnerJoin<FeeRecord>((a, d, f) => d.RecordId == f.Id &&
                     (f.Amount > 0 && d.OriginalAmount - d.OriginalSettlementAmount <= f.Amount - f.SettlementAmount - f.OrderAmount + f.OrderSettlementAmount) ||
                     (f.Amount < 0 && d.OriginalAmount - d.OriginalSettlementAmount >= f.Amount - f.SettlementAmount - f.OrderAmount + f.OrderSettlementAmount))
-                .Select(x => new InvoiceApplicationDto
+                .Select((a, d, f) => new InvoiceApplicationDto
                 {
 
                 }, true).MergeTable().Where(whereList).ToQueryPageAsync(request.PageCondition);
 
             if (result.Data?.Count > 0)
             {
+                //关联用户名称
+                var userIds = result.Data.Select(x => x.CreateBy)
+                    .Distinct();
+                var users = await Db.Queryable<SysUser>().Where(x => userIds.Contains(x.Id)).Select(x => new { x.Id, x.UserName }).ToListAsync();
+
+                var orgIds = result.Data.Select(x => x.SaleDeptId).Distinct().ToList();
+                var orgs = await Db.Queryable<SysOrg>().Where(x => orgIds.Contains(x.Id)).Select(x => new { x.Id, x.OrgName }).ToListAsync();
 
+                foreach (var item in result.Data)
+                {
+                    item.CreateByName = users.Find(x => x.Id == item.CreateBy)?.UserName;
+                    item.SaleDeptName = orgs.Find(x => x.Id == item.SaleDeptId)?.OrgName;
+                }
             }
 
             return result;
         }
 
+        /// <summary>
+        /// 获取发票申请费用明细
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public async Task<DataResult<List<ApplicationDetailDto>>> GetInvoiceDetailsAsync(params long[] ids)
+        {
+            var query1 = TenantDb.Queryable<ApplicationDetail>()
+                .InnerJoin<FeeRecord>((d, f) => d.RecordId == f.Id && f.BusinessType == BusinessType.OceanShippingExport &&
+                    (f.Amount > 0 && d.OriginalAmount - d.OriginalSettlementAmount <= f.Amount - f.SettlementAmount - f.OrderAmount + f.OrderSettlementAmount) ||
+                    (f.Amount < 0 && d.OriginalAmount - d.OriginalSettlementAmount >= f.Amount - f.SettlementAmount - f.OrderAmount + f.OrderSettlementAmount))
+                .LeftJoin<SeaExport>((d, f, s) => f.BusinessId == s.Id)
+                .Where((d, f, s) => ids.Contains(d.ApplicationId))
+                .Select((d, f, s) => new ApplicationDetailDto
+                {
+                    ClientName = s.CustomerName,
+                    Voyage = s.Voyno,
+                    SourceName = s.SourceName,
+                }, true);
 
+
+
+            var list = await TenantDb.UnionAll(query1).ToListAsync();
+            var result = DataResult<List<ApplicationDetailDto>>.Success(list);
+            result.Count = list.Count;
+            return result;
+        }
     }
 }

ds-wms-service/DS.WMS.FeeApi/Controllers/InvoiceSettlementController.cs

@@ -0,0 +1,47 @@
+using DS.Module.Core;
+using DS.Module.Core.Data;
+using DS.WMS.Core.Application.Dtos;
+using DS.WMS.Core.Settlement.Interface;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DS.WMS.FeeApi.Controllers
+{
+    /// <summary>
+    /// 发票结算API
+    /// </summary>
+    public class InvoiceSettlementController : ApiController
+    {
+        readonly IInvoiceSettlementService _service;
+
+        /// <summary>
+        /// 初始化
+        /// </summary>
+        /// <param name="service"></param>
+        public InvoiceSettlementController(IInvoiceSettlementService service)
+        {
+            _service = service;
+        }
+
+        /// <summary>
+        /// 获取待结算的发票申请列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost, Route("GetInvoiceList")]
+        public async Task<DataResult<List<InvoiceApplicationDto>>> GetInvoiceListAsync(PageRequest request)
+        {
+            return await _service.GetInvoiceListAsync(request);
+        }
+
+        /// <summary>
+        /// 获取发票申请费用明细
+        /// </summary>
+        /// <param name="idModel"></param>
+        /// <returns></returns>
+        [HttpPost, Route("GetInvoiceDetails")]
+        public async Task<DataResult<List<ApplicationDetailDto>>> GetInvoiceDetailsAsync(IdModel idModel) 
+        {
+            return await _service.GetInvoiceDetailsAsync(idModel.Ids);
+        }
+    }
+}

ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>D:\Publish\DS8\FeeApi</_PublishTargetUrl>
-    <History>True|2024-09-14T07:48:22.9374486Z||;True|2024-09-14T15:42:19.0503983+08:00||;True|2024-09-14T11:51:53.3339222+08:00||;True|2024-09-14T11:41:38.3542237+08:00||;True|2024-09-14T11:19:13.1037012+08:00||;True|2024-09-13T14:31:12.4598160+08:00||;True|2024-09-13T10:44:56.1241214+08:00||;False|2024-09-13T10:44:26.6088271+08:00||;False|2024-09-13T10:44:06.1615137+08:00||;False|2024-09-13T10:43:19.2432517+08:00||;False|2024-09-13T10:38:18.1663387+08:00||;True|2024-09-06T18:49:17.9435308+08:00||;True|2024-09-06T17:01:39.6646353+08:00||;True|2024-09-06T10:27:36.9990456+08:00||;True|2024-09-06T09:48:23.4236094+08:00||;True|2024-09-05T13:57:23.8452431+08:00||;True|2024-09-05T10:21:34.6675149+08:00||;True|2024-09-05T09:12:44.5610882+08:00||;True|2024-09-04T10:07:38.3707398+08:00||;True|2024-09-04T09:52:47.0574599+08:00||;True|2024-09-03T16:41:23.7516960+08:00||;True|2024-09-03T15:22:31.8718097+08:00||;True|2024-09-03T10:01:09.7656702+08:00||;False|2024-09-03T09:46:46.8956531+08:00||;True|2024-09-02T17:07:41.0268500+08:00||;True|2024-09-02T13:50:22.0203254+08:00||;True|2024-09-02T13:34:23.3441546+08:00||;True|2024-08-30T11:25:14.7431645+08:00||;True|2024-08-29T16:38:26.3491372+08:00||;True|2024-08-29T16:32:31.8580864+08:00||;False|2024-08-29T16:30:41.4763198+08:00||;True|2024-08-09T09:18:05.8484398+08:00||;True|2024-08-09T08:45:38.7858906+08:00||;True|2024-08-05T11:37:07.3133020+08:00||;True|2024-07-24T16:45:58.2272340+08:00||;True|2024-07-24T15:48:52.0128987+08:00||;True|2024-07-23T17:41:01.7494842+08:00||;True|2024-07-23T17:25:11.8773492+08:00||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;</History>
+    <History>True|2024-09-18T01:08:59.1152574Z||;True|2024-09-14T15:48:22.9374486+08:00||;True|2024-09-14T15:42:19.0503983+08:00||;True|2024-09-14T11:51:53.3339222+08:00||;True|2024-09-14T11:41:38.3542237+08:00||;True|2024-09-14T11:19:13.1037012+08:00||;True|2024-09-13T14:31:12.4598160+08:00||;True|2024-09-13T10:44:56.1241214+08:00||;False|2024-09-13T10:44:26.6088271+08:00||;False|2024-09-13T10:44:06.1615137+08:00||;False|2024-09-13T10:43:19.2432517+08:00||;False|2024-09-13T10:38:18.1663387+08:00||;True|2024-09-06T18:49:17.9435308+08:00||;True|2024-09-06T17:01:39.6646353+08:00||;True|2024-09-06T10:27:36.9990456+08:00||;True|2024-09-06T09:48:23.4236094+08:00||;True|2024-09-05T13:57:23.8452431+08:00||;True|2024-09-05T10:21:34.6675149+08:00||;True|2024-09-05T09:12:44.5610882+08:00||;True|2024-09-04T10:07:38.3707398+08:00||;True|2024-09-04T09:52:47.0574599+08:00||;True|2024-09-03T16:41:23.7516960+08:00||;True|2024-09-03T15:22:31.8718097+08:00||;True|2024-09-03T10:01:09.7656702+08:00||;False|2024-09-03T09:46:46.8956531+08:00||;True|2024-09-02T17:07:41.0268500+08:00||;True|2024-09-02T13:50:22.0203254+08:00||;True|2024-09-02T13:34:23.3441546+08:00||;True|2024-08-30T11:25:14.7431645+08:00||;True|2024-08-29T16:38:26.3491372+08:00||;True|2024-08-29T16:32:31.8580864+08:00||;False|2024-08-29T16:30:41.4763198+08:00||;True|2024-08-09T09:18:05.8484398+08:00||;True|2024-08-09T08:45:38.7858906+08:00||;True|2024-08-05T11:37:07.3133020+08:00||;True|2024-07-24T16:45:58.2272340+08:00||;True|2024-07-24T15:48:52.0128987+08:00||;True|2024-07-23T17:41:01.7494842+08:00||;True|2024-07-23T17:25:11.8773492+08:00||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportTaskController.cs

@@ -221,7 +221,7 @@ namespace DS.WMS.OpApi.Controllers
         [HttpPost, Route("Delete")]
         public async Task<DataResult> Delete(long id, BusinessType? businessType, TaskBaseTypeEnum? taskType = null)
         {
-            return await taskService.Delete(id, businessType, "API请求删除任务", taskType.HasValue ? [taskType.Value] : []);
+            return await taskService.DeleteAsync(id, businessType, "API请求删除任务", taskType.HasValue ? [taskType.Value] : []);
         }
     }
 }