yanjinhui
2026-03-23 67954f1959b432c39c0988d092e7ce1d19b71354
优化提升机job
已修改4个文件
101 ■■■■■ 文件已修改
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/ScheduledTaskJob.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs
@@ -100,7 +100,7 @@
                                    {
                                        DeviceProDTO? deviceProDTO = device.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == HoistEnum.Inboundboxon.ToString());
                                        if (device.IsConnected)
                                            device.SetValue(HoistEnum.Inboundboxon, 1);//入库完成
                                            device.SetValue(HoistEnum.Inboundboxon, 1);//
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                    }
@@ -119,7 +119,7 @@
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                    }
                                }
                                //四楼 å…¥åº“
                                //四楼 å‡ºåº“
                                if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
                                {
                                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
@@ -132,7 +132,7 @@
                                            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;
@@ -141,7 +141,7 @@
                                    {
                                        if (device.IsConnected)
                                            //写以一个出库完成信号
                                            device.SetValue(HoistEnum.Outboundboxretrievalcompleted, "1");
                                            device.SetValue(HoistEnum.Outboundboxretrievalcompleted,"1",task.SourceAddress);
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                    } 
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs
@@ -69,12 +69,12 @@
                            continue;
                            //throw new Exception("设备故障");
                        }
                        if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt()|| task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt())
                        if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt()|| task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt())
                        {
                            if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt())
                            {
                                //判断3楼入库箱号有无
                                if (device.GetValue<HoistEnum, short>(HoistEnum.OutboundInplace, task.SourceAddress) != 2)
                                if (device.GetValue<HoistEnum, short>(HoistEnum.OutboundInplace, task.TargetAddress) != 2)
                                {
                                    if (task.ExceptionMessage == "3楼入库箱号有货,请先处理")
                                    {
@@ -87,26 +87,20 @@
                            }
                            else
                            {
                                //回空箱的时候要读一个吗
                                if (device.GetValue<HoistEnum, string>(HoistEnum.Emptycontainernumber, task.SourceAddress) == null)
                                #region 4楼入库
                                //4楼出库料箱到位
                                if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, task.SourceAddress) != 1)
                                {
                                    if (task.ExceptionMessage != "4楼空箱,读码器没有读到值")
                                    if (task.ExceptionMessage != "4楼入库料箱没有到位")
                                    {
                                        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;
                                }
                                #endregion
                              
                            }
@@ -133,8 +127,10 @@
                        {
                            ////出库料箱缓存数量(这个是库区查询的时候要查一下,返给wms)
                            //if (device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ") == 0) throw new Exception("没有出库料箱缓存数量为空");
                            //读取3楼出库料箱到位
                            if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, task.TargetAddress) != 1)
                            if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, task.SourceAddress) != 1)
                            {
                                if (task.ExceptionMessage != "3楼出库料箱没有到位")
                                {
@@ -158,21 +154,43 @@
                            task.ExceptionMessage = "";
                            Uptasks.Add(task);
                        }
                        else if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt())//和3楼出库中一样;
                        else if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt())//4楼出库任务
                        {
                            #region 4楼出库
                            //4楼出库料箱到位
                            if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, task.TargetAddress) != 2)
                            #region å‡ºåº“信号
                            //回空箱的时候要读一个吗
                            if (device.GetValue<HoistEnum, string>(HoistEnum.Emptycontainernumber, task.TargetAddress) == null)
                            {
                                if (task.ExceptionMessage != "4楼出库料箱没有到位")
                                if (task.ExceptionMessage != "4楼空箱,读码器没有读到值")
                                {
                                    task.ExceptionMessage = "3楼入库箱号有货,请先处理";
                                    task.ExceptionMessage = "4楼空箱,读码器没有读到值";
                                    Uptasks.Add(task);
                                }
                                continue;
                            }
                            //判断4楼空箱到位
                            if (device.GetValue<HoistEnum, short>(HoistEnum.ReturnbinAvailable, task.TargetAddress) != 2)
                            {
                                if (task.ExceptionMessage != "提升机入库空无货")
                                {
                                    task.ExceptionMessage = "提升机入库空无货";
                                    Uptasks.Add(task);
                                }
                                continue;
                            }
                            #endregion
                            //然后调用输送线接口,通知输送线有料箱需要入库,任务举行执行
                            var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
                            if (result.Status == false)
                            {
                                if (task.ExceptionMessage != result.Message)
                                {
                                    task.ExceptionMessage = result.Message;
                                    Uptasks.Add(task);
                                }
                                continue;
                            }
                           
                            #endregion
                            task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
                            task.ExceptionMessage = "";
                            Uptasks.Add(task);
@@ -190,7 +208,7 @@
                    {
                        var Barcode = device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1);
                        //检查3楼入库箱号是多少,然后传给wms
                        var BinNumber = device.GetValue<HoistEnum, string>(HoistEnum.Inboxnumber, "TSJ");
                        var BinNumber = device.GetValue<HoistEnum, string>(HoistEnum.Inboxnumber, RK3FTasks.TargetAddress);
                        //根据读到的箱号进行料箱检验,检验通过就触发读码器读取,如果不通过就抛出异常
                        //var Verification = _taskService.MaterialBoxInspection(RK3FTasks.WMSTaskNum, BinNumber.ToString());
                        //if (!Verification.Status)
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/ScheduledTaskJob.cs
@@ -79,16 +79,19 @@
                {
                    if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, "TSJC3F") == 1)
                    {
                        Dt_Task dt_Task = _taskService.Repository.QueryFirst(x => x.SourceAddress == "TSJC3F");
                        if (dt_Task == null)
                        {
                        station = stations.FirstOrDefault(x => x.StationStatus == (int)LocationStatusEnum.Free);
                        if (station != null)
                        {
                            var tasknum = _taskService.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
                            Dt_Task dt_Task = new Dt_Task()
                                dt_Task = new Dt_Task()
                            {
                                TaskNum = tasknum,
                                WMSTaskNum = "GP" + tasknum,
                                Grade = 60,
                                PalletCode = station.PalletCode,
                                    PalletCode = "LXM" + tasknum,
                                Roadway = "",
                                TaskState = (int)TaskStatusEnum.New,
                                TaskType = TaskTypeEnum.CK3F.ObjToInt(),
@@ -110,12 +113,13 @@
                        }
                    }
                }
                }
                #endregion
                #endregion
                #region å››æ¥¼è‡ªåŠ¨ä»»åŠ¡
                List<string> LocationCodes = new() { "RGD0304A04011", "RG0105A04031", "RG0202A05021" };
                List<string> LocationCodes = new() { "RGD0303A04041","RG0302A05041","RG0304A05041","RG0205A05031" };
                var hKLocationInfos = _HKLocationInfoService.Repository.QueryData(x => LocationCodes.Contains(x.LocationCode));
                #region å…¥æå‡æœºä»»åŠ¡
                var hKLocation = hKLocationInfos.FirstOrDefault(x => x.LocationStatus == (int)LocationStatusEnum.InStock);
@@ -152,18 +156,21 @@
                #region å‡ºæå‡æœºä»»åŠ¡
                if (device != null && device.IsConnected)
                {
                    if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, "TSJC3F") == 1)
                    if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, "TSJC4F") == 1)
                    {
                        Dt_Task dt_Task = _taskService.Repository.QueryFirst(x => x.SourceAddress == "TSJC4F");
                        if (dt_Task == null)
                    {
                        hKLocation = hKLocationInfos.FirstOrDefault(x => x.LocationStatus == (int)LocationStatusEnum.Free);
                        if (hKLocation != null)
                        {
                            var tasknum = _taskService.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
                            Dt_Task dt_Task = new Dt_Task()
                                 dt_Task = new Dt_Task()
                            {
                                TaskNum = tasknum,
                                WMSTaskNum = "GP" + tasknum,
                                Grade = 60,
                                PalletCode = hKLocation.PalletCode,
                                    PalletCode = "LXM" + tasknum,
                                Roadway = "",
                                TaskState = (int)TaskStatusEnum.New,
                                TaskType = TaskTypeEnum.Q1TSJ4.ObjToInt(),
@@ -184,6 +191,8 @@
                            }
                        }
                    }
                    }
                }
                #endregion
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs
@@ -49,9 +49,9 @@
        {
            try
            {
                //SendNewTask();
                SendNewTask();
                //SendWaitToTask();
                SendWaitToTask();
            }
            catch (Exception ex)
            {