优化job

yanjinhui

2026-03-22 8d6df8d172989427be0b9e42d616f95b2730820e

优化job

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs

@@ -21,6 +21,7 @@
using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.DTO;

namespace WIDESEAWCS_TaskInfoService
{
@@ -82,6 +83,30 @@
                            break;
                        case "outbin"://离开起点
                            {
                                
                                ///判断任务是否跟设备有关
                                TaskFromCompleted(task, deviceTypeEnum);
                            }
                            break;
                        case "finish"://离开提升机
                            {

                                //入提升机
                                if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
                                {
                                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
                                    else
                                    {
                                        DeviceProDTO? deviceProDTO = device.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == HoistEnum.Inboundboxon.ToString());
                                        if (device.IsConnected)
                                            device.SetValue(HoistEnum.Inboundboxon, 1);//入库完成
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                    }
                                }

                                //出提升机
                                if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
                                {
                                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
@@ -89,13 +114,38 @@
                                    else
                                    {
                                        if (device.IsConnected)
                                            device.SetValue(HoistEnum.Outboundboxon, 1);
                                            device.SetValue(HoistEnum.Outboundboxon, 1);//出库完成
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                    }
                                }
                                ///判断任务是否跟设备有关
                                TaskFromCompleted(task, deviceTypeEnum);
                                //四楼 å…¥åº“
                                if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
                                {
                                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
                                    else
                                    {
                                        if (device.IsConnected)
                                            device.SetValue(HoistEnum.Emptyboxplacedinposition, 1);
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                    } 
                                }
                                //四楼 å‡ºåº“
                                if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
                                {
                                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
                                    else
                                    {
                                        if (device.IsConnected)
                                            //写以一个出库完成信号
                                            device.SetValue(HoistEnum.Outboundboxretrievalcompleted, "1");
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                    } 
                                }
                            }
                            break;
                        case "into"://申请进入提升机
@@ -113,18 +163,7 @@
                        case "end"://任务完成通知
                            {
                                ///判断任务是否跟设备有关
                                if(task.TaskType== TaskTypeEnum.RK3F.ObjToInt()&& task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
                                {
                                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
                                    else
                                    {
                                        if (device.IsConnected)
                                            device.SetValue(HoistEnum.Inboundboxon,1);
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                    }
                                }
                                
                                TaskCompleted(task, deviceTypeEnum);
                            }
                            break;

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

@@ -48,7 +48,7 @@
                //Example
                //device.GetValue  è¯»å–
                //device.SetValue  å†™å…¥
                // _taskService.Repository ä»“储层，进行数据库访问-
                // _taskService.Repository ä»“储层，进行数据库访问
                try
                {
                    List<Dt_Task> Uptasks = new List<Dt_Task>();
@@ -69,20 +69,48 @@
                            continue;
                            //throw new Exception("设备故障");
                        }
                        if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt())
                        if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt()|| task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt())
                        {
                            //判断3楼入库箱号有无
                            if (device.GetValue<HoistEnum, string>(HoistEnum.OutboundInplace, "TSJ") == "1")
                            if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt())
                            {
                                if (task.ExceptionMessage == "3楼入库箱号有货，请先处理")
                                //判断3楼入库箱号有无
                                if (device.GetValue<HoistEnum, short>(HoistEnum.OutboundInplace, task.SourceAddress) != 2)
                                {
                                    if (task.ExceptionMessage == "3楼入库箱号有货，请先处理")
                                    {
                                        continue;
                                    }
                                    task.ExceptionMessage = "3楼入库箱号有货，请先处理";
                                    Uptasks.Add(task);
                                    continue;
                                }
                                task.ExceptionMessage = "3楼入库箱号有货，请先处理";
                                Uptasks.Add(task);
                                continue;
                            }
                           
                            else
                            {
                                //回空箱的时候要读一个吗
                                if (device.GetValue<HoistEnum, string>(HoistEnum.Emptycontainernumber, task.SourceAddress) == null)
                                {
                                    if (task.ExceptionMessage != "4楼空箱,读码器没有读到值")
                                    {
                                        task.ExceptionMessage = "4楼空箱,读码器没有读到值";
                                        Uptasks.Add(task);
                                    }
                                    continue;
                                }
                                //判断4楼空箱到位
                                if (device.GetValue<HoistEnum, short>(HoistEnum.ReturnbinAvailable, task.SourceAddress) == 2)
                                {
                                    if (task.ExceptionMessage != "TSJ4楼回料箱为空")
                                    {
                                        task.ExceptionMessage = "TSJ4楼回料箱为空";
                                        Uptasks.Add(task);
                                    }
                                    continue;
                                }
                              
                            }


                            //然后调用输送线接口，通知输送线有料箱需要入库，任务举行执行
                            var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
                            if (result.Status == false)
@@ -97,6 +125,7 @@
                            task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
                            task.ExceptionMessage = "";
                            Uptasks.Add(task);

                            //这里任务变成了CheckPalletCodeing

                        }
@@ -105,7 +134,7 @@
                            ////出库料箱缓存数量(这个是库区查询的时候要查一下，返给wms)
                            //if (device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ") == 0) throw new Exception("没有出库料箱缓存数量为空");
                            //读取3楼出库料箱到位
                            if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, "TSJ") != 1)
                            if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, task.TargetAddress) != 1)
                            {
                                if (task.ExceptionMessage != "3楼出库料箱没有到位")
                                {
@@ -126,31 +155,34 @@
                                continue;
                            }
                            task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
                            task.ExceptionMessage = "";
                            Uptasks.Add(task);
                        }
                        else if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt())//4楼入库
                        else if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt())//和3楼出库中一样；
                        {
                            //回空箱的时候要读一个吗
                            if (device.GetValue<HoistEnum, short>(HoistEnum.Emptycontainernumber, "TSJ") == null) throw new Exception($"4楼空箱,读码器没有读到值");
                           
                            //判断4楼空箱到位
                            if (device.GetValue<HoistEnum, short>(HoistEnum.ReturnbinAvailable, "TSJ") == 2) throw new Exception("4楼回料箱为空");
                            if (_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Status == false) throw new Exception($"3楼出库任务举行执行失败，错误信息{_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Message}");//给任务号
                            //写入空箱放到位信号
                            device.SetValue(HoistEnum.Emptyboxplacedinposition, "TSJ", "1");
                        }
                        else if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt()) //四楼库内到提升机 
                        {
                            
                            #region 4楼出库
                            //4楼出库料箱到位
                            if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox,"TSJ") == 2) throw new Exception("4楼出库料箱没有到位");
                            //写以一个出库完成信号
                            device.SetValue(HoistEnum.Outboundboxretrievalcompleted, "TSJ", "1");
                            if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, task.TargetAddress) != 2)
                            {
                                if (task.ExceptionMessage != "4楼出库料箱没有到位")
                                {
                                    task.ExceptionMessage = "3楼入库箱号有货，请先处理";
                                    Uptasks.Add(task);
                                }
                                continue;
                            }
                           
                            #endregion
                            task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
                            task.ExceptionMessage = "";
                            Uptasks.Add(task);
                        }
                     
                        
                        //else if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt()) //四楼库内到提升机 
                        //{
                            
                           
                        //}  
                    }


                    //查找三楼入库任务状态为CheckPalletCodeing的任务托盘号确认中
                    var RK3FTasks = _taskService.Repository.QueryFirst(x => x.TaskType == TaskTypeEnum.RK3F.ObjToInt() && x.TaskState == (int)TaskStatusEnum.CheckPalletCodeing);
@@ -160,17 +192,17 @@
                        //检查3楼入库箱号是多少，然后传给wms
                        var BinNumber = device.GetValue<HoistEnum, string>(HoistEnum.Inboxnumber, "TSJ");
                        //根据读到的箱号进行料箱检验，检验通过就触发读码器读取，如果不通过就抛出异常
                        var Verification = _taskService.MaterialBoxInspection(RK3FTasks.WMSTaskNum, BinNumber.ToString());
                        if (!Verification.Status)
                        {
                            if (!(RK3FTasks.ExceptionMessage == Verification.Message))
                            {
                                RK3FTasks.ExceptionMessage = Verification.Message;
                                Uptasks.Add(RK3FTasks);
                            }
                            //料箱验证写好后，需要更改
                            RK3FTasks.TargetAddress = Verification.Data.ToString();
                        }
                        //var Verification = _taskService.MaterialBoxInspection(RK3FTasks.WMSTaskNum, BinNumber.ToString());
                        //if (!Verification.Status)
                        //{
                        //    if (!(RK3FTasks.ExceptionMessage == Verification.Message))
                        //    {
                        //        RK3FTasks.ExceptionMessage = Verification.Message;
                        //        Uptasks.Add(RK3FTasks);
                        //    }
                        //    //料箱验证写好后，需要更改
                        //    RK3FTasks.TargetAddress = Verification.Data.ToString();
                        //}

                        //如果料箱检验成功就写入读码器的值
                        var result = _taskService.Hikvisiontaskscontinue(RK3FTasks.WMSTaskNum, RK3FTasks.TargetAddress);

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

@@ -49,9 +49,9 @@
        {
            try
            {
                SendNewTask();
                //SendNewTask();

                SendWaitToTask();
                //SendWaitToTask();
            }
            catch (Exception ex)
            {