From 88676143aeceaeec3bd108f9cd609c4f3470ba96 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 30 七月 2025 15:07:32 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/成品仓/AGV_CPExtend.cs |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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..bc39089 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,14 +29,14 @@
                     {
                         try
                         {
-                            if (task.TaskType == TaskTypeEnum.OutProduct.ObjToInt())
+                            if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                                 task.CurrentAddress = GetAGVAddress(task.CurrentAddress);
                             else
                                 task.NextAddress = GetAGVAddress(task.NextAddress);
                             AgvTaskDTO taskDTO = new AgvTaskDTO()
                             {
                                 TaskCode = task.AgvTaskNum,
-                                ReqCode = DateTime.Now.ToString("yyyyMMdd") + task.AgvTaskNum,
+                                ReqCode = DateTime.Now.ToString("yyMMdd") + task.AgvTaskNum,
                                 TaskTyp = task.TaskType < TaskTypeEnum.Inbound.ObjToInt() ? "CPC" : "CPR",
                                 ctnrCode = task.PalletCode,
                                 PositionCodePath = new List<CodePath>()
@@ -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);
@@ -98,7 +104,7 @@
                             AgvTaskDTO taskDTO = new AgvTaskDTO()
                             {
                                 TaskCode = task.AgvTaskNum,
-                                ReqCode = DateTime.Now.ToString("yyyyMMdd") + task.AgvTaskNum,
+                                ReqCode = DateTime.Now.ToString("yyMMdd") + task.AgvTaskNum,
                                 TaskTyp = "CP",
                                 ctnrCode = task.PalletCode,
                                 PositionCodePath = new List<CodePath>()

--
Gitblit v1.9.3