Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPu...

dengjunjie

2026-03-17 840e04a550be5647a50a015f686ffa45a5e272a9

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

@@ -209,9 +209,10 @@
            var KLS = new CancelGALAXISTask();
            CancelHIKROBOTTask cancelHIKROBOTTask = new CancelHIKROBOTTask();
            CancelSXCTake cancelSXCTake = new CancelSXCTake();
            var deviceName = "";
            try
            {
                Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
                Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode&&x.TaskType!=TaskTypeEnum.CPMoveInventory.ObjToInt());
                if (dt_Task == null) throw new Exception("未查询到任务号相关任务");

                // åˆ¤æ–­å½“前任务是否为凯乐士任务
@@ -226,6 +227,7 @@
                #region å‡¯ä¹å£«
                if (isGALAXISTask)
                {
                    deviceName= "凯乐士AGV";
                    KLS = new CancelGALAXISTask
                    {
                        taskId = dt_Task.WMSTaskNum,
@@ -253,6 +255,14 @@
                #region å››å‘车
                if (isAGV)
                {
                    deviceName = "四向车";
                    if (dt_Task.RGVTaskId==0)
                    {
                        BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.自动删除);
                        content.OK($"取消{dt_Task.WMSTaskNum}任务成功", dt_Task);
                    }
                    else
                    {
                    cancelSXCTake = new CancelSXCTake
                    {
                        taskID = dt_Task.RGVTaskId,
@@ -274,11 +284,13 @@
                        content.Error($"任务{dt_Task.WMSTaskNum}失败{fOURBOTReturn.data}");
                    }
                }
                }
                #endregion

                #region æµ·åº·
                if (isHK)
                {
                    deviceName = "海康机器人";
                    cancelHIKROBOTTask = new CancelHIKROBOTTask
                    {
                        robotTaskCode = dt_Task.WMSTaskNum,
@@ -310,30 +322,7 @@
            }
            finally
            {
                // åœ¨ finally ä¸­åˆ¤æ–­å“ªä¸ªå¯¹è±¡è¢«èµ‹å€¼äº†
                object logObject = null;
                string deviceName = "";

                if (KLS != null)
                {
                    logObject = KLS;
                    deviceName = "凯乐士AGV";
                }
                else if (cancelHIKROBOTTask != null)
                {
                    logObject = cancelHIKROBOTTask;
                    deviceName = "海康机器人";
                }
                else if (cancelSXCTake != null)
                {
                    logObject = cancelSXCTake;
                    deviceName = "四向车";
                }

                if (logObject != null)
                {
                    _trackloginfoService.AddTrackLog(logObject, content, $"取消{deviceName}任务,", "", "");
                }
                _trackloginfoService.AddTrackLog(wMSCancelTask, content, $"取消{deviceName}任务,", "", "");
            }
            return content;
        }
@@ -1319,12 +1308,30 @@

        public override WebResponseContent DeleteData(object[] keys)
        {
            try
            {
              //查找所有任务中包含这个id的
               var  take= BaseDal.QueryData(x => keys.Contains(x.TaskId));
                //我就将这个任务移入历史中
              BaseDal.DeleteAndMoveIntoHty(take, OperateTypeEnum.自动完成);
            return base.DeleteData(keys); 

                // æ‰§è¡Œç§»å…¥åŽ†å²æ“ä½œï¼Œå¹¶æ£€æŸ¥ç»“æžœ
                bool moveResult = BaseDal.DeleteAndMoveIntoHty(take, OperateTypeEnum.人工删除);

                if (!moveResult)
                {
                    // ç§»å…¥åŽ†å²å¤±è´¥ï¼Œè¿”回错误信息
                    return WebResponseContent.Instance.Error("移入历史记录失败");
        }
                return WebResponseContent.Instance.OK("删除成功，数据已移入历史");
            }
            catch (Exception ex)
            {
                // è®°å½•å¼‚常日志
                // Logger.Error(ex.Message);
                return WebResponseContent.Instance.Error("删除失败：" + ex.Message);
            }
        }



    }
}