feat: 同步协议处理、前端交互与业务联调改动

wanshenmean

2026-03-17 94ad631d316da04c46266ddb1fc6e63e6f8f2fae

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -10,6 +10,8 @@
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.StackerCrane;
using WIDESEAWCS_Tasks.StackerCraneJob;
using WIDESEA_Core;
using WIDESEAWCS_QuartzJob.Service;

namespace WIDESEAWCS_Tasks
{
@@ -28,14 +30,15 @@
            ITaskService taskService,
            ITaskExecuteDetailService taskExecuteDetailService,
            ITaskRepository taskRepository,
            WIDESEAWCS_QuartzJob.Service.IRouterService routerService)
            IRouterService routerService,
            HttpClientHelper httpClientHelper)
        {
            _taskService = taskService;
            _taskExecuteDetailService = taskExecuteDetailService;
            _taskRepository = taskRepository;

            _config = LoadConfig();
            _taskSelector = new StackerCraneTaskSelector(taskService, routerService);
            _taskSelector = new StackerCraneTaskSelector(taskService, routerService, httpClientHelper);
            _commandBuilder = new StackerCraneCommandBuilder(taskService, routerService, _config);
        }

@@ -65,7 +68,7 @@
        {
            try
            {
                Console.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " CommonStackerCraneJob Start");
                //Console.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " CommonStackerCraneJob Start");

                bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
                if (!flag || value is not IStackerCrane commonStackerCrane)
@@ -79,12 +82,13 @@
                    commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;
                }

                commonStackerCrane.CheckStackerCraneTaskCompleted();

                if (!commonStackerCrane.IsCanSendTask(commonStackerCrane.Communicator, commonStackerCrane.DeviceProDTOs, commonStackerCrane.DeviceProtocolDetailDTOs))
                {
                    return Task.CompletedTask;
                }

                commonStackerCrane.CheckStackerCraneTaskCompleted();

                // 任务选择下沉到专用选择器。
                Dt_Task? task = _taskSelector.SelectTask(commonStackerCrane);
@@ -125,7 +129,7 @@
            {
                Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
                _taskService.StackCraneTaskCompleted(e.TaskNum);
                commonStackerCrane.SetValue(StackerCraneDBName.WorkAction, 5);
                commonStackerCrane.SetValue(StackerCraneDBName.WorkAction, 2);
            }
        }