1

dengjunjie

2025-09-29 d9c99e0480b4910cdb134778dd5c314b35ec4cf2

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -42,10 +42,10 @@
        private readonly ITaskExecuteDetailService _taskExecuteDetailService;
        private readonly ITaskRepository _taskRepository;
        private readonly IRouterService _routerService;
        private readonly IShuttleCarService _shuttleCarService;
        private readonly WIDESEAWCS_IShuttleCar.IShuttleCarService _shuttleCarService;
        private readonly ICacheService _cacheService;

        public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IShuttleCarService shuttleCarService, ICacheService cacheService)
        public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, WIDESEAWCS_IShuttleCar.IShuttleCarService shuttleCarService, ICacheService cacheService)
        {
            _taskService = taskService;
            _taskExecuteDetailService = taskExecuteDetailService;
@@ -73,7 +73,7 @@
                    #endregion

                    #region ä»»åŠ¡å®Œæˆ
                    if (common.CompleteStatus == 2 || common.CompleteStatus == 3 || common.CompleteStatus == 4)
                    if ((common.CompleteStatus == 2 || common.CompleteStatus == 3 || common.CompleteStatus == 4) && commonStackerCrane.CurrentTaskNum > 0)
                    {
                        var remark = "正常完成";
                        if (common.CompleteStatus == 2) remark = "手动完成";
@@ -87,7 +87,7 @@
                    if (common.Onlinestate == (short)Onlinestate.online)
                    {
                        #region æŸ¥è¯¢ä»»åŠ¡,逻辑处理
                        if (common.RunStatus == (short)RunStatus.Standby)
                        if (common.RunStatus == (short)RunStatus.Standby && common.WriteStatus == (short)WriteStatus.Permit)
                        {
                            #region ç©¿æ¢­è½¦ç§»è½¦/充电任务
                            var Task = _taskService.GetTaskState((int)CarChargingTaskEnum.CarCharging_Finish, (int)TaskOtherTypeEnum.RelocationCarCharging) ??
@@ -125,6 +125,7 @@
                {
                    if (commonStackerCrane.SetValue(StackerCraneDBName.CommandSend, sendFlag))
                    {
                        WriteDebug($"{commonStackerCrane.DeviceName}接收任务", $"WCS下发任务,任务号【{task.TaskNum}】");
                        if (_taskService.TaskInboundTypes.Contains(task.TaskType) ||
                            _taskService.TaskOutboundTypes.Contains(task.TaskType))
                            commonStackerCrane.LastTaskType = task.TaskType;