yanjinhui
2026-03-24 4bdc37291d784008cea7fb9d105077b65a12beb9
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs
@@ -83,7 +83,6 @@
                            break;
                        case "outbin"://离开起点
                            {
                                ///判断任务是否跟设备有关
                                TaskFromCompleted(task, deviceTypeEnum);
                            }
@@ -100,14 +99,14 @@
                                    {
                                        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 = "提升机信息设备连接失败";
                                    }
                                }
                                //出提升机
                                if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
                                else if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
                                {
                                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
@@ -119,8 +118,8 @@
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                    }
                                }
                                //四楼 å…¥åº“
                                if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
                                //四楼 å‡ºåº“
                                else if ((task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt() || task.TaskType == TaskTypeEnum.F04.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
                                {
                                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
@@ -130,10 +129,10 @@
                                            device.SetValue(HoistEnum.Emptyboxplacedinposition, 1);
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                    }
                                    }
                                }
                                //四楼 å‡ºåº“
                                if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
                                //四楼 å…¥åº“
                                else if ((task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() || task.TaskType == TaskTypeEnum.F03.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
                                {
                                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
@@ -141,10 +140,10 @@
                                    {
                                        if (device.IsConnected)
                                            //写以一个出库完成信号
                                            device.SetValue(HoistEnum.Outboundboxretrievalcompleted, "1");
                                            device.SetValue(HoistEnum.Outboundboxretrievalcompleted, 1, task.SourceAddress);
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                    }
                                    }
                                }
                            }
                            break;
@@ -163,7 +162,6 @@
                        case "end"://任务完成通知
                            {
                                ///判断任务是否跟设备有关
                                TaskCompleted(task, deviceTypeEnum);
                            }
                            break;
@@ -417,6 +415,20 @@
                        dt_HKLocationInfo.LocationStatus = locationStatusEnum.ObjToInt();
                        _hKLocationInfoService.Repository.UpdateData(dt_HKLocationInfo);
                    }
                    Dt_StationInfo? stationInfo = _stationInfo.Repository.QueryFirst(x => x.StationCode == locationCode);
                    if (stationInfo != null)
                    {
                        if (locationStatusEnum == LocationStatusEnum.Free) //如果起点完成就给货位赋值托盘号
                        {
                            stationInfo.PalletCode = "";
                        }
                        else
                        {
                            stationInfo.PalletCode = palletCode;
                        }
                        stationInfo.StationStatus = locationStatusEnum.ObjToInt();
                        _stationInfo.UpdateData(stationInfo);
                    }
                }
                else if (deviceTypeEnum == DeviceTypeEnum.YuanLiJuHe)
                {