From f7686c71ac53f0d1bbd439bc0c898c86f7d68e34 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 10 十一月 2025 16:39:10 +0800
Subject: [PATCH] 优化代码
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Manual.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Manual.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Manual.cs"
index 56e84de..6aa9dd9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Manual.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Manual.cs"
@@ -115,7 +115,7 @@
}
else if (TaskOutboundTypes.Contains(task.TaskType))
{
- if (task.TaskState != TaskOutStatusEnum.SC_OutExecuting.ObjToInt())
+ if (task.TaskState != TaskOutStatusEnum.SC_OutGetFinish.ObjToInt())
throw new Exception("浠诲姟鐘舵�佷笉绛変簬鍫嗗灈鏈哄嚭搴撴墽琛屼腑");
}
else if (task.TaskType == TaskRelocationTypeEnum.Relocation.ObjToInt())
@@ -153,19 +153,17 @@
{
if (task.TaskState < TaskInStatusEnum.SC_InFinish.ObjToInt())
{
- task.TaskState = TaskInStatusEnum.SC_InExecuting.ObjToInt();
- UpdateData(task);
- StackCraneTaskCompleted(task.TaskNum);
+ task.TaskState = TaskInStatusEnum.SC_InFinish.ObjToInt();
+ ToWMSCompletedTask(task);
}
AddTask_Hty(task, TaskOperateTypeEnum.ManualCompletion);
}
else if (TaskOutboundTypes.Contains(task.TaskType))
{
- if (task.TaskState < TaskOutStatusEnum.SC_OutFinish.ObjToInt())
+ if (task.TaskState < TaskOutStatusEnum.OutFinish.ObjToInt())
{
- task.TaskState = TaskOutStatusEnum.SC_OutExecuting.ObjToInt();
- UpdateData(task);
- StackCraneTaskCompleted(task.TaskNum);
+ task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
+ ToWMSCompletedTask(task);
}
AddTask_Hty(task, TaskOperateTypeEnum.ManualCompletion);
}
@@ -173,21 +171,20 @@
{
if (task.TaskState < TaskRelocationStatusEnum.SC_RelocationFinish.ObjToInt())
{
- task.TaskState = TaskRelocationStatusEnum.SC_RelocationExecuting.ObjToInt();
- UpdateData(task);
- StackCraneTaskCompleted(task.TaskNum);
+ task.TaskState = TaskRelocationStatusEnum.SC_RelocationFinish.ObjToInt();
+ ToWMSCompletedTask(task);
}
AddTask_Hty(task, TaskOperateTypeEnum.ManualCompletion);
}
else if (task.TaskType == TaskOtherTypeEnum.RelocationCar.ObjToInt())
{
- task.TaskState = TaskCarStatusEnum.SC_CarFinish.ObjToInt();
- UpdateData(task);
+ task.TaskState = TaskCarStatusEnum.RelocationCarFinish.ObjToInt();
+ AddTask_Hty(task, TaskOperateTypeEnum.ManualCompletion);
}
else if (task.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt())
{
- task.TaskState = CarChargingTaskEnum.CarChargingSC_CarFinish.ObjToInt();
- UpdateData(task);
+ task.TaskState = CarChargingTaskEnum.CarChargingFinish.ObjToInt();
+ AddTask_Hty(task, TaskOperateTypeEnum.ManualCompletion);
}
return WebResponseContent.Instance.OK();
}
@@ -206,7 +203,10 @@
try
{
if (task.TaskType == TaskOtherTypeEnum.RelocationCar.ObjToInt() || task.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt())
+ {
AddTask_Hty(task, TaskOperateTypeEnum.ManualDeletion);
+ return WebResponseContent.Instance.OK();
+ }
if (!TaskInboundTypes.Contains(task.TaskType))
throw new Exception("鏃犳潈闄�");
if (task.TaskState > TaskInStatusEnum.Line_InExecuting.ObjToInt() && !string.IsNullOrEmpty(task.TargetAddress))
--
Gitblit v1.9.3