From 35256ce6d0226c23f31306df7c609d96755d2871 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 10 三月 2026 18:55:26 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
index 7d10a8f..99bb24d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
@@ -71,10 +71,10 @@
if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,浠诲姟缂栧彿銆恵hIKROBOT.robotTaskCode}銆�");
switch (hIKROBOT.extra.values.method)
{
- case "start":
+ case "end":
TaskCompleted(task, deviceTypeEnum);
break;
- case "end":
+ case "outbin":
TaskFromCompleted(task, deviceTypeEnum);
break;
default:
@@ -106,14 +106,21 @@
}
else if (Rgv.messageType == 10)
{
- if (task.TaskState == (int)TaskStatusEnum.TakeFinish && Rgv.content.status == 4)
+ if(Rgv.content.status == 4)
{
- task.TaskState = (int)TaskStatusEnum.CheckShapeing;
- BaseDal.UpdateData(task);
- }
- else if (task.TaskState == (int)TaskStatusEnum.Puting && Rgv.content.status == 4)
- {
- TaskCompleted(task, deviceTypeEnum);
+ if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
+ {
+ task.TaskState = (int)TaskStatusEnum.CheckShapeing;
+ BaseDal.UpdateData(task);
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Puting)
+ {
+ TaskCompleted(task, deviceTypeEnum);
+ }
+ else if(task.TaskType == (int)TaskTypeEnum.CPOutbound || task.TaskType == (int)TaskTypeEnum.CPMoveInventory)//鍑哄簱銆佺Щ搴撳畬鎴�
+ {
+ TaskCompleted(task, deviceTypeEnum);
+ }
}
}
}
--
Gitblit v1.9.3