优化

yanjinhui

2026-02-26 be291df6dd14039ff58e8c6554a053db4b573954

优化

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs

@@ -99,7 +99,14 @@
        /// ä»»åŠ¡åºŸæ­¢
        /// </summary>
        [Description("任务废止")]
        Cancel
        Cancel,

             /// <summary>
             /// wms取消任务
             /// </summary>
        [Description("WMS取消任务")]
        WMSCancel,

        #endregion

        #region æµ·åº·AGV其他任务状态

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/UpdateGALAXISTaskGrade.cs

@@ -22,7 +22,7 @@
        /// <summary>
        /// ä»»åŠ¡åº“区
        /// </summary>
        public string district { get; set; }
        public string district { get; set; } = "cy";
        /// <summary>
        /// æ–°çš„优先级
        /// </summary>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -26,6 +26,7 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.TaskInfo;
@@ -144,7 +145,7 @@
            {
                Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
                if (dt_Task == null) throw new Exception("未查询到任务号相关任务");
              

                // åˆ¤æ–­å½“前任务是否为凯乐士任务
                bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound ||
                                    dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
@@ -153,13 +154,13 @@
                //海康
                bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
                //这里将状态改变了198取消任务
                dt_Task.TaskType = TaskOutStatusEnum.OutCancel.ObjToInt();
                dt_Task.TaskType = TaskStatusEnum.WMSCancel.ObjToInt();
                if (isGALAXISTask)
                {
                    var KLS = new CancelGALAXISTask 
                    { 
                        taskId= dt_Task.WMSTaskNum,
                        reportTime=DateTime.Now.ToString()
                    var KLS = new CancelGALAXISTask
                    {
                        taskId = dt_Task.WMSTaskNum,
                        reportTime = DateTime.Now.ToString()
                    };
                    Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelGALAXISTask));
                    if (apiInfo == null) throw new Exception("未找到凯乐士AGV任务下发接口配置信息！请检查接口配置");
@@ -167,11 +168,16 @@
                    GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
                    if (agvContent.success == true && agvContent.code == 0)
                    {
                       BaseDal.UpdateData(dt_Task);
                       return content.OK("取消任务成功", dt_Task);
                        //直接移入历史
                        BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.自动完成);
                        return content.OK("取消任务成功", dt_Task);
                    }
                    else
                    {
                        return content.Error($"任务失败{agvContent.data.returnInfo}");

                    }
                }
                content.Error("取消任务失败");
            }
            catch (Exception ex)
            {
@@ -221,12 +227,15 @@
                    GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
                    if (agvContent.success == true && agvContent.code == 0)
                    {
                        BaseDal.UpdateData(dt_Task);
                        return  content.OK("修改任务优先级成功", dt_Task);

                        return content.OK("修改任务优先级成功", dt_Task);
                    }
                    else {
                        return content.Error($"任务失败{agvContent.data.returnInfo}");
                    }
                }
                #endregion
                content.Error("修改任务优先级失败");
               
            }
            catch (Exception ex)
            {