From ac8813cde64f7bf9882657416a1d102191aae960 Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期六, 19 七月 2025 17:32:59 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/成品仓/AGV_CPExtend.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/AGV_CPExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/AGV_CPExtend.cs"
index 2a6d1fb..67bb753 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/AGV_CPExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/AGV_CPExtend.cs"
@@ -29,7 +29,7 @@
{
try
{
- if (task.TaskType == TaskTypeEnum.OutProduct.ObjToInt())
+ if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
task.CurrentAddress = GetAGVAddress(task.CurrentAddress);
else
task.NextAddress = GetAGVAddress(task.NextAddress);
@@ -55,11 +55,15 @@
};
if (taskDTO.TaskTyp== "CPC")
{
- taskDTO.Priority = (24 - DateTime.Now.Hour).ToString();
+ taskDTO.Priority = task.Grade.ToString();
}
if (task.GroupId.IsNotEmptyOrNull())
{
taskDTO.GroupId=task.GroupId;
+ }
+ if (task.TaskType==TaskTypeEnum.OutMesRworkProduct.ObjToInt())
+ {
+ taskDTO.Priority = "127";
}
//鍙戦�丄GV浠诲姟
WebResponseContent content = _taskService.AgvSendTask(taskDTO, APIEnum.Agv_CPSendTask);
@@ -67,10 +71,12 @@
throw new Exception(content.Message);
if (taskDTO.TaskTyp == "CPC")
{
+ task.Dispatchertime = DateTime.Now;
_taskService.UpdateTask(task, TaskStatusEnum.AGV_Executing);
}
else
{
+ task.Dispatchertime = DateTime.Now;
_taskService.UpdateTask(task, TaskStatusEnum.AGV_Takeing);
}
Thread.Sleep(500);
--
Gitblit v1.9.3