From 536bc8ae0e64b68e553feb1b4dd43a5db2e5ccc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= <mcc890916@hotmail.com>
Date: Thu, 29 Aug 2024 08:59:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DS.WMS.Core/Op/Dtos/TaskInteraction/TaskRequest.cs      | 6 ++++++
 .../DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs    | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskRequest.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskRequest.cs
index d423262e..5dad15f1 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskRequest.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskRequest.cs
@@ -2,6 +2,8 @@
 using System.Runtime.Serialization;
 using DS.Module.Core;
 using DS.WMS.Core.Op.Entity;
+using DS.WMS.Core.Op.Method.TaskInteraction;
+using Masuit.Tools.Systems;
 
 namespace DS.WMS.Core.Op.Dtos.TaskInteraction
 {
@@ -51,6 +53,10 @@ namespace DS.WMS.Core.Op.Dtos.TaskInteraction
             {
                 yield return new ValidationResult($"参数 {nameof(TaskTypeName)} 值不在有效枚举范围之内");
             }
+            else if (TaskService.IsOrderType(TaskType) && BusinessType == null)
+            {
+                yield return new ValidationResult($"任务类型为【{TaskType.GetDescription()}】时，参数 {nameof(BusinessType)} 不能为空");
+            }
         }
     }
 }
diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs
index e7a84a7b..8bc67da0 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs
@@ -4,7 +4,6 @@ using DS.Module.Core.Data;
 using DS.Module.Core.Helpers;
 using DS.Module.DjyRulesEngine;
 using DS.WMS.Core.Fee.Interface;
-using DS.WMS.Core.Fee.Method;
 using DS.WMS.Core.Flow.Dtos;
 using DS.WMS.Core.Flow.Entity;
 using DS.WMS.Core.Flow.Interface;
@@ -150,7 +149,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
             }
 
             var task = await GetQuery(request.BusinessId, request.BusinessType, request.TaskType).FirstAsync();
-            if (task != null && task.TaskStatus != TaskStatusEnum.Cancel)
+            if (task != null && task.TaskStatus != TaskStatusEnum.Pending && task.TaskStatus != TaskStatusEnum.Cancel)
                 return DataResult.FailedWithDesc(nameof(MultiLanguageConst.TaskExists));
 
             DataResult result = DataResult.Success;