修改入库、移库、出库逻辑

dengjunjie

4 小时以前 441b6f8d257a01b2998253ef0515a201777d7e68

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs

@@ -14,33 +14,47 @@
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO.WMSInfo;
using WIDESEAWCS_Tasks.ShuttleCarJob;
using System.Reflection.Metadata;

namespace WIDESEAWCS_Tasks
{
    partial class CommonShuttleCarJob
    {
        private object _CarTaskObject = new object();
        private readonly object _lockObject = new object();
        #region å †åž›æœºç§»è½¦å®Œæˆ
        /// <summary>
        /// èŽ·å–堆垛机移车/移库完成任务
        /// èŽ·å–堆垛机完成穿梭车待执行任务
        /// </summary>
        public void GetSC_CarFinish()
        {
            Dt_Task dt_Task = GetTask(TaskCarStatusEnum.SC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCar.ObjToInt());//移车任务
            #region ç§»è½¦ä»»åŠ¡
            Dt_Task dt_Task = GetTask(TaskCarStatusEnum.SC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCar.ObjToInt());
            if (dt_Task != null)
            {
                UpdateShuttleCar(dt_Task.ShuttleCarCode, dt_Task.CurrentAddress);
                dt_Task.TaskState = TaskCarStatusEnum.RelocationCarFinish.ObjToInt();
                _taskService.AddTask_Hty(dt_Task, TaskOperateTypeEnum.AutoComplete);
            }
            dt_Task = GetTask(CarChargingTaskEnum.SC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCarCharging.ObjToInt());//移车充电任务
            #endregion

            #region ç§»è½¦å……电任务
            dt_Task = GetTask(CarChargingTaskEnum.CarChargingSC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCarCharging.ObjToInt());
            if (dt_Task != null)
            {
                UpdateShuttleCar(dt_Task.ShuttleCarCode, dt_Task.CurrentAddress);
                SendTask(dt_Task);//下发充电任务
            }
            dt_Task = GetTask(TaskRelocationStatusEnum.SC_RelocationFinish.ObjToInt(), TaskRelocationTypeEnum.Relocation.ObjToInt());//移库任务
            if (dt_Task != null)
                SendTask(dt_Task);
            #endregion

            #region ç§»åº“任务
            dt_Task = GetTask(TaskRelocationStatusEnum.SC_RelocationFinish.ObjToInt(), TaskRelocationTypeEnum.Relocation.ObjToInt());
            if (dt_Task != null) SendTask(dt_Task);
            #endregion

            #region å…¥åº“任务
            dt_Task = _taskRepository.QueryFirst(x => _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.SC_InFinish);
            if (dt_Task != null) SendTask(dt_Task);
            #endregion
        }
        #endregion
        /// <summary>
@@ -51,31 +65,141 @@
        public void UpdateShuttleCar(string ShuttleCarCode, string Address)
        {
            var ShuttleCar = QueryCode(ShuttleCarCode);
            string[] targetCodes = Address.Split("-");
            var Row = Convert.ToInt16(targetCodes[0]);
            if (Row == 3)
            {
                ShuttleCar.ShuttleCarPosition = Address;
                ShuttleCar.ShuttleCarPosition1 = Address;
            }
            else
            {
                var a = Row == 1 ? 2.ToString("000") : 1.ToString("000");
                ShuttleCar.ShuttleCarPosition = Address;
                ShuttleCar.ShuttleCarPosition1 = a + "-" + targetCodes[1] + "-" + targetCodes[2];
            }
            ShuttleCar.ShuttleCarPosition = Address;
            ShuttleCar.ShuttleCarPosition1 = Address;
            _shuttleCarService.UpdateData(ShuttleCar);
        }

        public void GetShuttleCarTask(ShuttleCar shuttleCar, ShuttleCarTaskCommandR command)
        {
            #region æ–°å»ºç§»è½¦å……电任务
            Dt_Task CarCharging_Task = GetTask((int)CarChargingTaskEnum.CarChargingNew, (int)TaskOtherTypeEnum.RelocationCarCharging);
            if (CarCharging_Task != null)
            {
                Dt_Task? _Task = _taskRepository.QueryFirst(x => x.ShuttleCarCode == CarCharging_Task.ShuttleCarCode && x.TaskType != TaskOtherTypeEnum.RelocationCarCharging.ObjToInt());
                if (_Task == null) SendTask(CarCharging_Task);
                else if (_taskService.TaskOutboundTypes.Contains(_Task.TaskType) && _Task.TaskState >= TaskOutStatusEnum.SC_OutFinish.ObjToInt())
                    SendTask(CarCharging_Task);
            }
            #endregion

            #region æ–°å»ºç§»è½¦ä»»åŠ¡èµ·ç‚¹ä¸ºç©º
            Dt_Task? RelocationCar_Task = null;
            lock (_lockObject)
            {
                RelocationCar_Task = GetTask((int)TaskCarStatusEnum.CarNew, (int)TaskOtherTypeEnum.RelocationCar);
                if (RelocationCar_Task != null)
                {
                    if (string.IsNullOrEmpty(RelocationCar_Task.SourceAddress))
                    {
                        (bool, Dt_ShuttleCar) result = GetSourceTask(shuttleCar, command);
                        if (result.Item1)
                            UpdateSource(ref RelocationCar_Task, result.Item2);
                        else
                            GetShuttleCar(ref RelocationCar_Task, shuttleCar);//获取另外一个穿梭车信息
                    }
                }
                Thread.Sleep(1000);
            }
            #endregion

            #region å †åž›æœºç§»åº“完成前任务/堆垛机出库完成前任务
            //判断是否存在满足堆垛机入库的任务
            if (_taskRepository.QueryFirst(x => _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish && !string.IsNullOrEmpty(x.NextAddress), _taskService.TaskOrderBy) == null)
            {
                Dt_Task dt_Task = _taskRepository.QueryFirst(x => _taskService.TaskRelocationTypes.Contains(x.TaskType) && x.TaskState < (int)TaskRelocationStatusEnum.SC_RelocationFinish, _taskService.TaskOrderBy) ??
                _taskRepository.QueryFirst(x => _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.TaskState < (int)TaskOutStatusEnum.SC_OutFinish, _taskService.TaskOrderBy);
                if (dt_Task != null)
                {
                    if (dt_Task.TaskState == (int)TaskRelocationStatusEnum.RelocationNew || dt_Task.TaskState == (int)TaskOutStatusEnum.OutNew)
                    {
                        var ShuttleCar = _shuttleCarService.QueryShuttleCar(dt_Task.SourceAddress);//判断起点是否有穿梭车
                        if (ShuttleCar == null)
                        {
                            if (RelocationCar_Task != null && string.IsNullOrEmpty(RelocationCar_Task.TargetAddress))
                            {
                                RelocationCar_Task.TargetAddress = dt_Task.SourceAddress;
                                RelocationCar_Task.NextAddress = dt_Task.SourceAddress;
                                _taskService.UpdateData(RelocationCar_Task);
                                _taskExecuteDetailService.AddTaskExecuteDetail(RelocationCar_Task.TaskNum, "更新移车任务目标地址");
                            }
                            else
                                _taskService.AddRelocationCarTask("", dt_Task.SourceAddress);
                        }
                        else
                        {
                            dt_Task.ShuttleCarCode = ShuttleCar.ShuttleCarCode;
                            SendTask(dt_Task);
                        }
                    }
                }
            }
            #endregion

            #region æ–°å»ºç§»è½¦ä»»åŠ¡ç»ˆç‚¹ä¸ºç©º
            if (RelocationCar_Task != null)
            {
                if (string.IsNullOrEmpty(RelocationCar_Task.TargetAddress))
                {
                    #region å‘WMS申请
                    var ShuttleCar = _shuttleCarService.QueryNoCode(RelocationCar_Task.ShuttleCarCode);
                    WebResponseContent content = new WebResponseContent();
                    var ResultData = HttpHelper.PostAsync(WMSInterfaceAddress.GetPosition + $"?position={RelocationCar_Task.SourceAddress}&&position1={ShuttleCar.ShuttleCarPosition}", "", headers: new Dictionary<string, string>());
                    if (ResultData.Result != null)
                    {
                        content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
                        if (content != null && content.Status)
                        {
                            RelocationCar_Task.TargetAddress = content.Message;
                            RelocationCar_Task.NextAddress = RelocationCar_Task.TargetAddress;
                            _taskService.UpdateData(RelocationCar_Task);
                            _taskExecuteDetailService.AddTaskExecuteDetail(RelocationCar_Task.TaskNum, "更新移车任务目标地址");
                        }
                    }
                    #endregion
                }
                if (!string.IsNullOrEmpty(RelocationCar_Task.SourceAddress) && !string.IsNullOrEmpty(RelocationCar_Task.TargetAddress) && !string.IsNullOrEmpty(RelocationCar_Task.ShuttleCarCode))
                {
                    Dt_Task? _Task = _taskRepository.QueryFirst(x => x.ShuttleCarCode == RelocationCar_Task.ShuttleCarCode && x.TaskType != TaskOtherTypeEnum.RelocationCar.ObjToInt());
                    if (_Task == null) SendTask(RelocationCar_Task);
                    else if (_taskService.TaskOutboundTypes.Contains(_Task.TaskType) && _Task.TaskState >= TaskOutStatusEnum.SC_OutFinish.ObjToInt())
                        SendTask(RelocationCar_Task);
                }
            }
            #endregion
        }

        private static readonly SemaphoreSlim _CarTaskObject = new SemaphoreSlim(1, 1);
        #region èŽ·å–移车任务
        /// <summary>
        /// èŽ·å–移车任务/出入库任务
        /// </summary>
        public void Get_CarTask(ShuttleCar shuttleCar, ShuttleCarTaskCommandR command)
        public async Task Get_CarTask(ShuttleCar shuttleCar, ShuttleCarTaskCommandR command)
        {
            lock (_CarTaskObject)
            await _CarTaskObject.WaitAsync();
            try
            {

                #region èŽ·å–新建移车充电任务
                Dt_Task dt_Task = GetTask((int)CarChargingTaskEnum.CarChargingNew, (int)TaskOtherTypeEnum.RelocationCarCharging);
                if (dt_Task != null && dt_Task.ShuttleCarCode == shuttleCar.DeviceCode)
                {
                    if (!string.IsNullOrEmpty(dt_Task.SourceAddress) && !string.IsNullOrEmpty(dt_Task.TargetAddress) && !string.IsNullOrEmpty(dt_Task.ShuttleCarCode))
                    {
                        Dt_Task? _Task = _taskRepository.QueryData(x => x.ShuttleCarCode == dt_Task.ShuttleCarCode && x.TaskType != TaskOtherTypeEnum.RelocationCarCharging.ObjToInt()).OrderByDescending(x => x.CreateDate).FirstOrDefault();
                        if (_Task != null && _taskService.TaskOutboundTypes.Contains(_Task.TaskType))
                        {
                            if (_Task.TaskState >= TaskOutStatusEnum.SC_OutFinish.ObjToInt())
                                SendTask(dt_Task);
                        }
                        else
                            SendTask(dt_Task);
                    }
                }
                #endregion

                #region èŽ·å–新建移车任务
                Dt_Task dt_Task = GetTask((int)TaskCarStatusEnum.CarNew, (int)TaskOtherTypeEnum.RelocationCar);
                dt_Task = GetTask((int)TaskCarStatusEnum.CarNew, (int)TaskOtherTypeEnum.RelocationCar);
                if (dt_Task != null)
                {
                    if (string.IsNullOrEmpty(dt_Task.SourceAddress))
@@ -89,8 +213,9 @@
                    else if (string.IsNullOrEmpty(dt_Task.TargetAddress))
                    {
                        #region å‘WMS申请
                        var ShuttleCar = _shuttleCarService.QueryNoCode(dt_Task.ShuttleCarCode);
                        WebResponseContent content = new WebResponseContent();
                        var ResultData = HttpHelper.PostAsync(WMSInterfaceAddress.GetPosition + $"?position={dt_Task.SourceAddress}", "", headers: new Dictionary<string, string>());
                        var ResultData = HttpHelper.PostAsync(WMSInterfaceAddress.GetPosition + $"?position={dt_Task.SourceAddress}&&position1={ShuttleCar.ShuttleCarPosition}", "", headers: new Dictionary<string, string>());
                        if (ResultData.Result != null)
                        {
                            content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
@@ -105,39 +230,62 @@
                        #endregion
                    }
                    //穿梭车移车任务下发
                    if (!string.IsNullOrEmpty(dt_Task.SourceAddress) && !string.IsNullOrEmpty(dt_Task.TargetAddress) && !string.IsNullOrEmpty(dt_Task.ShuttleCarCode))
                    if (!string.IsNullOrEmpty(dt_Task.SourceAddress) && !string.IsNullOrEmpty(dt_Task.TargetAddress) && !string.IsNullOrEmpty(dt_Task.ShuttleCarCode) && dt_Task.ShuttleCarCode == shuttleCar.DeviceCode)
                    {
                        SendTask(dt_Task);
                        Dt_Task? _Task = _taskRepository.QueryData(x => x.ShuttleCarCode == dt_Task.ShuttleCarCode && x.TaskType != TaskOtherTypeEnum.RelocationCar.ObjToInt()).OrderByDescending(x => x.CreateDate).FirstOrDefault();
                        if (_Task != null && _taskService.TaskOutboundTypes.Contains(_Task.TaskType))
                        {
                            if (_Task.TaskState >= TaskOutStatusEnum.SC_OutFinish.ObjToInt())
                                SendTask(dt_Task);
                        }
                        else
                            SendTask(dt_Task);
                    }
                }
                #endregion

                #region ç©¿æ¢­è½¦ä»»åŠ¡
                else

                var task = _taskService.ShuttleCarRelocationTask(shuttleCar.DeviceCode);//获取穿梭车移库任务
                if (task != null)
                {
                    var task = _taskService.ShuttleCarRelocationTask(shuttleCar.DeviceCode);//获取穿梭车移库任务
                    if (task != null)
                    if (!task.SourceIsPickPlace && task.ShuttleCarCode == shuttleCar.DeviceCode)
                    {
                        if (!task.SourceIsPickPlace)
                            SendTask(task);
                    }
                    else
                    {
                        task = _taskService.QueryShuttleCarTask(shuttleCar.DeviceCode);
                        if (task != null)
                        {
                            if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && !task.SourceIsPickPlace)
                            {
                                var ShuttleCar = _shuttleCarService.QueryShuttleCar(task.SourceAddress);//出库任务判断起点是否有穿梭车
                                if (ShuttleCar != null) SendTask(task);
                                else _taskService.AddRelocationCarTask("", task.SourceAddress);
                            }
                            else
                                SendTask(task);
                        }
                        SendTask(task);
                    }
                }
                else
                {
                    task = _taskService.QueryShuttleCarTask(shuttleCar.DeviceCode);
                    if (task != null)
                    {
                        if (_taskService.TaskOutboundTypes.Contains(task.TaskType))
                        {
                            if (!task.SourceIsPickPlace && task.TaskState == (int)TaskOutStatusEnum.OutNew)
                            {
                                var ShuttleCar = _shuttleCarService.QueryShuttleCar(task.SourceAddress);//出库任务判断起点是否有穿梭车
                                if (ShuttleCar == null) _taskService.AddRelocationCarTask("", task.SourceAddress);
                                else
                                {
                                    task.ShuttleCarCode = ShuttleCar.ShuttleCarCode;
                                    SendTask(task);
                                }
                            }
                        }
                        else
                            SendTask(task);
                    }
                }

                #endregion
            }
            catch (Exception)
            {
                throw;
            }
            finally
            {
                _CarTaskObject.Release();
            }
        }
        #endregion
@@ -158,6 +306,7 @@
            _taskExecuteDetailService.AddTaskExecuteDetail(dt_Task.TaskNum, "更新移车任务起始地址");
        }
        #endregion

        /// <summary>
        /// åˆ¤æ–­å½“前穿梭车是否可以执行移库
        /// </summary>
@@ -170,14 +319,50 @@
            bool ok = false;
            if (command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command.Err_Status == (short)ShuttleCarErr.Normal)
            {
                #region åˆ¤æ–­å½“前穿梭车是否存在任务
                Dt_Task? _Task = _taskRepository.QueryFirst(x =>
                x.SourceAddress == _ShuttleCar.ShuttleCarPosition ||
                x.TargetAddress == _ShuttleCar.ShuttleCarPosition ||
                x.SourceAddress == _ShuttleCar.ShuttleCarPosition1 ||
                x.TargetAddress == _ShuttleCar.ShuttleCarPosition1);
                #endregion
                if (_taskRepository.QueryFirst(x => x.SourceAddress == _ShuttleCar.ShuttleCarPosition && _taskService.TaskRelocationTypes.Contains(x.TaskType) && x.TaskState == TaskRelocationStatusEnum.SC_RelocationExecuting.ObjToInt()) != null)
                    return (ok, _ShuttleCar);
                Dt_Task? _Task = _taskRepository.QueryFirst(x => x.ShuttleCarCode == _ShuttleCar.ShuttleCarCode);
                if (_Task != null)
                    ok = _taskService.TaskOutboundTypes.Contains(_Task.TaskType) && _Task.TaskState >= TaskOutStatusEnum.SC_OutFinish.ObjToInt();
                ok = _Task == null;
                #region åˆ¤æ–­å½“前穿梭车是否存在任务
                //Dt_Task? _Task = _taskRepository.QueryFirst(x => x.SourceAddress == _ShuttleCar.ShuttleCarPosition);
                //if (_Task != null)
                //{
                //    if (_Task.TaskState <= TaskOutStatusEnum.Car_OutFinish.ObjToInt() ||
                //        _Task.TaskState <= TaskRelocationStatusEnum.CarSource_Finish.ObjToInt() ||
                //        _Task.TaskState <= TaskCarStatusEnum.ShuttleCar_Finish.ObjToInt() ||
                //        _Task.TaskState <= CarChargingTaskEnum.CarCharging_Finish.ObjToInt())
                //    {
                //        //_Task.ShuttleCarCode = shuttleCar.DeviceCode;
                //        //SendTask(_Task);
                //        return (ok, _ShuttleCar);
                //    }
                //}
                //_Task = _taskRepository.QueryFirst(x => x.TargetAddress == _ShuttleCar.ShuttleCarPosition);
                //if (_Task != null)
                //{
                //    if (_Task.TaskState >= TaskInStatusEnum.Line_InFinish.ObjToInt() ||
                //        _Task.TaskState >= TaskRelocationStatusEnum.CarSource_Finish.ObjToInt() ||
                //        _Task.TaskState >= CarChargingTaskEnum.CarCharging_Finish.ObjToInt())
                //    {
                //        //_Task.ShuttleCarCode = shuttleCar.DeviceCode;
                //        //SendTask(_Task);
                //        return (ok, _ShuttleCar);
                //    }
                //}
                //_Task = _taskRepository.QueryData(x => x.SourceAddress == _ShuttleCar.ShuttleCarPosition &&
                //x.TaskState < TaskRelocationStatusEnum.CarSource_Finish.ObjToInt() &&
                //x.TaskType == TaskRelocationTypeEnum.Relocation.ObjToInt()).OrderByDescending(x => x.CreateDate).FirstOrDefault();
                //if (_Task != null) return (ok, _ShuttleCar);
                //_Task = _taskRepository.QueryData(x => x.ShuttleCarCode == _ShuttleCar.ShuttleCarCode && _taskService.TaskOutboundTypes.Contains(x.TaskType)).OrderByDescending(x => x.CreateDate).FirstOrDefault();
                //if (_Task != null)
                //{
                //    if (_Task.TaskState >= TaskOutStatusEnum.SC_OutFinish.ObjToInt())
                //        _Task = null;
                //}
                //ok = _Task == null;
                #endregion
            }
            if (!ok)
            {
@@ -212,19 +397,12 @@
            if (shuttleCar != null)
            {
                ShuttleCarTaskCommandR command = ReadCustomer<ShuttleCarTaskCommandR>(shuttleCar, shuttleCar.DeviceCode);//读取穿梭车信息
                if (command != null && command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command.Err_Status == (short)ShuttleCarErr.Normal)
                if (command != null && command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && (command.Err_Status == (short)ShuttleCarErr.Normal || command.Err_Status == (short)ShuttleCarErr.LowBattery))
                {
                    #region åˆ¤æ–­å°è½¦ä½ç½®æ— AB面不下发任务
                    short Position = 0;
                    if (shuttleCar.GetValue<ShuttleCarDBName, bool>(ShuttleCarDBName.DirectionA)) Position = 1;
                    if (shuttleCar.GetValue<ShuttleCarDBName, bool>(ShuttleCarDBName.DirectionB)) Position = 2;
                    if (Position != 1 && Position != 2)
                    {
                        var Message = $"{shuttleCar.DeviceName}无AB面";
                        if (task.ExceptionMessage != Message)
                            _taskService.UpdateData(task);
                        return;
                    }
                    Dt_ShuttleCar _ShuttleCar = QueryCode(task.ShuttleCarCode);
                    var Row = Convert.ToInt32(_ShuttleCar.ShuttleCarPosition.Split("-")[0]);
                    short Position = Convert.ToInt16(Row);
                    #endregion
                    //任务转换
                    shuttleCar.SetValue(ShuttleCarDBName.Direction, Position);//写入车体方向
@@ -235,27 +413,35 @@
                    {
                        if (task.TaskState == (int)TaskCarStatusEnum.CarNew)
                        {
                            //if (task.Remark == ShuttleCarTaskType.ExitCharge.ToString()) shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.Remark);
                            //else
                            shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction);
                        }
                        else if (task.TaskState == (int)TaskCarStatusEnum.SC_CarFinish)
                        {
                            if (task.Remark == ShuttleCarTaskType.Charging.ToString()) shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.Remark);
                            //else
                            //    shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction);
                        }
                    }
                    else if (task.TaskType == (int)TaskOtherTypeEnum.RelocationCarCharging)
                    {
                        shuttleCarTaskCommand.TaskType = task.TaskState == CarChargingTaskEnum.CarChargingNew.ObjToInt() ?
                            (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction) :
                            (short)GetCarTaskType(ShuttleCarTaskType.Charging.ToString());
                    }
                    else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)
                    {
                        shuttleCarTaskCommand.TaskType = task.TaskState == TaskRelocationStatusEnum.RelocationNew.ObjToInt() ?
                            (short)ShuttleCarTaskType.Out :
                            (short)ShuttleCarTaskType.In;
                    }
                    else
                        shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction);
                    //shuttleCarTaskCommand.TaskType = string.IsNullOrEmpty(task.Remark) ? (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction) : (short)GetCarTaskType(task.Remark);
                    //任务下发
                    if (shuttleCarTaskCommand.TaskType != null)//0
                    {
                        if (shuttleCar.SendCommand(shuttleCarTaskCommand, shuttleCar.DeviceCode))
                        {
                            if (!string.IsNullOrEmpty(task.Remark)) task.Remark = task.Remark + "已下发";
                            task.TaskState = GetTaskState(task.TaskType);
                            if (!string.IsNullOrEmpty(task.Remark) && task.TaskState == CarChargingTaskEnum.CarChargingNew.ObjToInt())
                                task.Remark = task.Remark + "已下发";
                            task.TaskState = GetTaskState(task.TaskType, task.TaskState);
                            _taskService.UpdateData(task);
                        }
                    }
@@ -297,9 +483,11 @@
            switch (TaskType)
            {
                case (int)TaskInboundTypeEnum.Inbound:
                case (int)TaskInboundTypeEnum.PalletInbound:
                    taskType = ShuttleCarTaskType.In;
                    break;
                case (int)TaskOutboundTypeEnum.Outbound:
                case (int)TaskOutboundTypeEnum.PalletOutbound:
                    taskType = ShuttleCarTaskType.Out;
                    break;
                case (int)TaskOtherTypeEnum.RelocationCar:
@@ -316,20 +504,31 @@
        /// </summary>
        /// <param name="TaskType"></param>
        /// <returns></returns>
        int GetTaskState(int TaskType)
        int GetTaskState(int TaskType, int state)
        {
            int state = 0;
            switch (TaskType)
            {
                case (int)TaskInboundTypeEnum.Inbound:
                case (int)TaskInboundTypeEnum.PalletInbound:
                    state = (int)TaskInStatusEnum.Car_InExecuting;
                    break;
                case (int)TaskOutboundTypeEnum.Outbound:
                case (int)TaskOutboundTypeEnum.PalletOutbound:
                    state = (int)TaskOutStatusEnum.Car_OutExecuting;
                    break;
                case (int)TaskRelocationTypeEnum.Relocation:
                    state = state < (int)TaskRelocationStatusEnum.SC_RelocationFinish.ObjToInt() ?
                        (int)TaskRelocationStatusEnum.CarSource_Executing :
                        (int)TaskRelocationStatusEnum.CarTarget_Executing;
                    break;
                case (int)TaskOtherTypeEnum.RelocationCar:
                    state = (int)TaskCarStatusEnum.ShuttleCar_Executing;
                    break;
                case (int)TaskOtherTypeEnum.RelocationCarCharging:
                    state = state < (int)CarChargingTaskEnum.CarChargingSC_CarFinish ?
                        (int)CarChargingTaskEnum.CarCharging_Executing :
                        (int)CarChargingTaskEnum.CarCharging_Charging;
                    break;
                default:
                    break;
            }