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

yanjinhui

2026-02-27 5bb0b67327e01373ef8b582d6ddf20b96d738933

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs

@@ -1,10 +1,13 @@
using System;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO;
using WIDESEAWCS_Model.Models;

namespace WIDESEAWCS_Tasks
@@ -19,10 +22,23 @@
        {
            try
            {
                var newTask = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.New.ObjToInt()).ToList();
                if (newTask.Count > 0)
                var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.New).ToList();
                if (newTasks.Count > 0)
                {
                    #region æŸ¥æ‰¾å‡¯ä¹å£«ä»»åŠ¡
                    var Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.MLInbound || x.TaskType == (int)TaskTypeEnum.MLOutbound).ToList();
                    if (Tasks.Count > 0) SendGALAXISTask(Tasks);
                    #endregion

                    #region æŸ¥æ‰¾RGV任务
                    Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound || x.TaskType == (int)TaskTypeEnum.CPOutbound).ToList();
                    if (Tasks.Count > 0) SendRGVTask(Tasks);
                    #endregion

                    #region æŸ¥æ‰¾æµ·åº·AGV任务
                    Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.Carry || x.TaskType == (int)TaskTypeEnum.CJCarry || x.TaskType == (int)TaskTypeEnum.CJInbound || x.TaskType == (int)TaskTypeEnum.CJOutbound).ToList();
                    if (Tasks.Count > 0) SendHIKROBOTTask(Tasks);
                    #endregion
                }
            }
            catch (Exception ex)
@@ -40,33 +56,31 @@
        {
            try
            {
                #region ä¸‹å‘外形检测通过的四向车任务
                var Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingOk).ToList();
                if (Tasks.Count > 0) SendCheckShapeingOkTask(Tasks);
                #endregion

                #region ä¸‹å‘外形检测失败的四向车任务
                Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingNG).ToList();
                if (Tasks.Count > 0) SendCheckShapeingNGTask(Tasks);
                Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingOk && x.ExceptionMessage.Contains("未找到终点库区")).ToList();
                if (Tasks.Count > 0) SendCheckShapeingNGTask(Tasks);
                #endregion

                #region ä¸‹å‘待移库后四向车出库任务
                Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.RGV_WaitMoveToExecute).ToList();
                if (Tasks.Count > 0) SendMoveToExecuteTask(Tasks);
                #endregion

                #region ä¸‹å‘托盘确认的海康AGV任务

                #endregion
            }
            catch (Exception ex)
            {
                WriteError(nameof(TaskJob), ex.Message, ex);
            }
        }
        #endregion

        #region ä¸‹å‘凯乐士AGV任务
        public void SendGALAXISTask(List<Dt_Task> tasks)
        {

        }
        #endregion

        #region ä¸‹å‘四向车任务
        public void SendRGVTask(List<Dt_Task> tasks)
        {

        }
        #endregion

        #region ä¸‹å‘海康AGV任务
        public void SendHIKROBOTTask(List<Dt_Task> tasks)
        {

        }
        #endregion
    }