重复创建任务问题修复

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

@@ -130,7 +130,6 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
             TenantDb.QueryFilter.Clear<IOrgId>();
         }
 
-
         /// <summary>
         /// 创建关联任务
         /// </summary>
@@ -154,13 +153,20 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
             if (task != null && task.TaskStatus != TaskStatusEnum.Cancel)
                 return DataResult.FailedWithDesc(nameof(MultiLanguageConst.TaskExists));
 
+            DataResult result = DataResult.Success;
             if (request.TaskType == TaskBaseTypeEnum.WAIT_ORDER_AUDIT)
             {
-                var result = await CheckRulesAsync(request.BusinessId, request.BusinessType.Value, RuleEngineType.COMMON_ORDER_AUDIT);
+                result = await CheckRulesAsync(request.BusinessId, request.BusinessType.Value, RuleEngineType.COMMON_ORDER_AUDIT);
                 if (!result.Succeeded)
                     return result;
             }
 
+            if (useTransaction)
+                await TenantDb.Ado.BeginTranAsync();
+            try
+            {
+                if (task == null)
+                {
                     long tenatId = long.Parse(User.TenantId);
                     string tenatName = Db.Queryable<SysTenant>().Where(x => x.Id == tenatId).Select(x => x.Name).First();
                     var info = new TaskManageOrderMessageInfo
@@ -229,12 +235,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
                     }
                     info.Main.TaskDesp = info.Main.TaskDesp ?? info.Main.TaskTitle;
 
-            if (useTransaction)
-                await TenantDb.Ado.BeginTranAsync();
-
-            try
-            {
-                DataResult result = await ManagerService.InitTaskJob(info);
+                    result = await ManagerService.InitTaskJob(info);
                     if (!result.Succeeded)
                         return result;
 
@@ -255,6 +256,14 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
 
                     await TenantDb.Insertable(task).ExecuteCommandAsync();
 
+                    result = await OnTaskCreated(task);
+                    if (!result.Succeeded)
+                        return result;
+
+                    //记录日志
+                    await LogService.WriteLogAsync(task);
+                }
+
                 //审核任务需创建工作流
                 if (AuditTaskTypes.Contains(request.TaskType))
                 {
@@ -263,13 +272,6 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
                         return result;
                 }
 
-                result = await OnTaskCreated(task);
-                if (!result.Succeeded)
-                    return result;
-
-                //记录日志
-                await LogService.WriteLogAsync(task);
-
                 if (useTransaction)
                     await TenantDb.Ado.CommitTranAsync();
 

ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\Code\DS\ds8-solution-pro\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\Source\Repos\DS8\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
   </PropertyGroup>