修改WCS、WMS出入库逻辑

dengjunjie

2024-11-14 c827fe7b0c5b3b444d76ba0d96a2649c764630dd

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

@@ -1,4 +1,5 @@
using AutoMapper;
using HslCommunication;
using Newtonsoft.Json;
using OfficeOpenXml.Drawing.Chart;
using Quartz;
@@ -16,6 +17,7 @@
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
using WIDESEAWCS_TaskInfoService;
@@ -26,17 +28,19 @@
namespace WIDESEAWCS_Tasks
{
    [DisallowConcurrentExecution]
    public class CommonShuttleCarJob : JobBase, IJob
    partial class CommonShuttleCarJob : JobBase, IJob
    {
        private readonly ITaskService _taskService;
        private readonly ITaskHtyService _taskHtyService;
        private readonly IShuttleCarService _shuttleCarService;
        private readonly ITaskExecuteDetailService _taskExecuteDetailService;
        private readonly IRouterService _routerService;
        private readonly IMapper _mapper;

        public CommonShuttleCarJob(ITaskService taskService, IShuttleCarService shuttleCarService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper)
        public CommonShuttleCarJob(ITaskService taskService, ITaskHtyService taskHtyService, IShuttleCarService shuttleCarService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper)
        {
            _taskService = taskService;
            _taskHtyService = taskHtyService;
            _shuttleCarService = shuttleCarService;
            _taskExecuteDetailService = taskExecuteDetailService;
            _routerService = routerService;
@@ -50,28 +54,25 @@
                ShuttleCar shuttleCar = (ShuttleCar)context.JobDetail.JobDataMap.Get("JobParams");
                if (shuttleCar != null)
                {
                    ShuttleCarTaskCommandR command = shuttleCar.Communicator.ReadCustomer<ShuttleCarTaskCommandR>(shuttleCar.DeviceCode);//读取穿梭车信息
                    ShuttleCarTaskCommandR command = ReadCustomer<ShuttleCarTaskCommandR>(shuttleCar, shuttleCar.DeviceCode);//读取穿梭车信息
                    if (command != null && command.JoinStatus == 1)
                    {
                        #region ç©¿æ¢­è½¦ä»»åŠ¡å®Œæˆ
                        if (command.TaskTypeComplete > (short)ShuttleCarTaskComplete.Standby)
                        {
                            //查找任务，判断任务状态做对应处理！！！！！！！！！！！！！！！！！！！！！！！！！
                            var Status = _taskService.StackCraneTaskCompleted(command.number).Status;//需优化!!!
                            var Status = _taskService.ShuttleCarTaskCompleted(command.number, command.TaskTypeComplete).Status;
                            shuttleCar.SetValue(ShuttleCarDBName.ConfirmComplete, Status, shuttleCar.DeviceCode);
                        }
                        #endregion

                        #region ç§»åº“充电任务
                        #region åˆ›å»ºç§»è½¦å……电任务
                        if (command.Err_Status == (short)ShuttleCarErr.LowBattery || command.ElectricQuantity == (short)ShuttleCarErr.LowBattery)
                        {
                            //生成堆垛机移车任务&穿梭车充电任务
                            var ShuttleCar = QueryCode(shuttleCar.DeviceCode);
                            var ShuttleCar = QueryCode(shuttleCar.DeviceCode);//充电终点待确认！！！！！！！！！！！！！！！！！！！！！
                            _taskService.AddRelocationCarTask(ShuttleCar.ShuttleCarPosition, "", ShuttleCar.ShuttleCarCode, ShuttleCarTaskType.Charging.ToString());
                        }
                        #endregion

                        #region ç©¿æ¢­è½¦ç§»åº“任务

                        #region èŽ·å–堆垛机移车完成任务
                        Dt_Task dt_Task = GetTask((int)TaskCarStatusEnum.SC_CarFinish, (int)TaskOtherTypeEnum.RelocationCar);
@@ -81,20 +82,20 @@
                            ShuttleCar.ShuttleCarPosition = dt_Task.TargetAddress;
                            _shuttleCarService.UpdateData(ShuttleCar);
                            if (string.IsNullOrEmpty(dt_Task.Remark))//完成移库任务
                            {
                                //移入历史任务！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！
                                //删除当前任务
                            }
                                _taskService.AddTask_Hty(dt_Task, TaskOperateTypeEnum.AutoComplete.ToJson());
                            else//下发充电任务
                            {
                                SendTask(dt_Task);
                            }
                        }
                        #endregion

                        #region èŽ·å–移车任务
                        dt_Task = GetTask((int)TaskCarStatusEnum.CarNew, (int)TaskOtherTypeEnum.RelocationCar);//获取新建移车任务
                        if (dt_Task != null)
                        {
                            #region åˆ¤æ–­æ˜¯å¦å­˜åœ¨ç©ºé—²ç©¿æ¢­è½¦,如都在充电(选择电量高的并超过50%电量的穿梭车退出充电)

                            #endregion

                            if (string.IsNullOrEmpty(dt_Task.SourceAddress))
                            {
                                if (command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command.Err_Status == (short)ShuttleCarErr.Normal)
@@ -139,32 +140,8 @@
                                if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && !task.IsPickPlace)
                                {
                                    var ShuttleCar = _shuttleCarService.QueryShuttleCar(task.SourceAddress);//出库任务判断是否存在穿梭车
                                    if (ShuttleCar != null)
                                    {
                                        SendTask(task);
                                    }
                                    else
                                    {
                                        _taskService.AddRelocationCarTask("", task.SourceAddress);
                                    }
                                    #region åˆ›å»ºå †åž›æœºç§»è½¦ä»»åŠ¡
                                    //dt_Task = new Dt_Task()
                                    //{
                                    //    TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
                                    //    Grade = 2,
                                    //    Roadway = "SC01",
                                    //    TaskType = (int)TaskOtherTypeEnum.RelocationCar,
                                    //    SourceAddress = "",
                                    //    TargetAddress = task.SourceAddress,
                                    //    CurrentAddress = "",
                                    //    NextAddress = task.SourceAddress,
                                    //    CreateDate = DateTime.Now,
                                    //    Creater = "WCS",
                                    //    TaskState = (int)TaskCarStatusEnum.CarNew,
                                    //    WMSId = 0,
                                    //};
                                    //_taskService.AddData(dt_Task);
                                    #endregion
                                    if (ShuttleCar != null) SendTask(task);
                                    else _taskService.AddRelocationCarTask("", task.SourceAddress);
                                }
                            }
                        }
@@ -187,7 +164,7 @@
            ShuttleCar shuttleCar = Storage.Devices.FirstOrDefault(x => x.DeviceCode == task.ShuttleCarCode) as ShuttleCar;
            if (shuttleCar != null)
            {
                ShuttleCarTaskCommandR command = shuttleCar.Communicator.ReadCustomer<ShuttleCarTaskCommandR>(shuttleCar.DeviceCode);//读取穿梭车信息
                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)
                {
                    //任务转换
@@ -221,68 +198,13 @@
                        }
                    }
                }

                ///下发退出充电任务并生成移库任务
                if (command.ElectricQuantity > 50)
                {

                }
            }
        }
        private Dt_Task GetTask(int TaskState, int TaskType)
        {
            return _taskService.GetTaskState(TaskState, TaskType);
        }

        public Dt_ShuttleCar QueryCode(string ShuttleCarCode)
        {
            return _shuttleCarService.QueryCode(ShuttleCarCode);
        }
        ///下发退出充电任务并生成移库任务
        //if (command.ElectricQuantity > 50)
        //{

        ShuttleCarTaskType GetCarTaskType(string remark) => remark switch
        {
            "Charging" => ShuttleCarTaskType.Charging,
            "ExitCharge" => ShuttleCarTaskType.ExitCharge,
        };

        ShuttleCarTaskType GetCarTaskType(int TaskType, short Direction)
        {
            ShuttleCarTaskType taskType = new ShuttleCarTaskType();
            switch (TaskType)
            {
                case (int)TaskInboundTypeEnum.Inbound:
                    taskType = ShuttleCarTaskType.In;
                    break;
                case (int)TaskOutboundTypeEnum.Outbound:
                    taskType = ShuttleCarTaskType.Out;
                    break;
                case (int)TaskOtherTypeEnum.RelocationCar:
                    taskType = Direction == 1 ? ShuttleCarTaskType.ZeroA : ShuttleCarTaskType.ZeroB;
                    break;
                default:
                    break;
            }
            return taskType;
        }

        int GetTaskState(int TaskType)
        {
            int state = 0;
            switch (TaskType)
            {
                case (int)TaskInboundTypeEnum.Inbound:
                    state = (int)TaskInStatusEnum.Car_InExecuting;
                    break;
                case (int)TaskOutboundTypeEnum.Outbound:
                    state = (int)TaskOutStatusEnum.Car_OutExecuting;
                    break;
                case (int)TaskOtherTypeEnum.RelocationCar:
                    state = (int)TaskCarStatusEnum.ShuttleCar_Executing;
                    break;
                default:
                    break;
            }
            return state;
        }
        //}
    }
}