1

huangxiaoqiang

2025-10-18 692f6b474db06bf7e8b713474531018faf69388d

 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob_FirstFloor/CommonRGV_FirstFloorJob.cs

@@ -410,6 +410,7 @@
                            LevelPoint = SecondRgv.GetValue<RGVDBName, int>(RGVDBName.LevelPoint),
                            CurrentTaskNum = SecondRgv.GetValue<RGVDBName, short>(RGVDBName.RGVTaskNum),
                            RGVAlarm = SecondRgv.GetValue<RGVDBName, uint>(RGVDBName.RGVAlarm),
                            InStock = SecondRgv.GetValue<RGVDBName, bool>(RGVDBName.InStock),
                            SecondRgv.DeviceCode,
                            SecondRgv.DeviceName,
                        };
@@ -530,13 +531,13 @@
                                    };
                                    SendCommand(commonRGVSecond, command);
                                    Thread.Sleep(3000);
                                    if (!commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running))
                                    if (!commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running) || commonRGVSecond.GetValue<RGVDBName, int>(RGVDBName.Speed) == 0)
                                    {
                                        return null;
                                    }
                                }
                                Thread.Sleep(1000);
                                if (task.Remark != null || ((task.TaskType == (int)TaskOutboundTypeEnum.Outbound && task.RGVName == "RGV02" && task.TargetAddress == "1002") || (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && task.RGVName == "RGV01" && (task.TargetAddress == "1030" || task.TargetAddress == "1029"))))
                                if (task.Remark != null || (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && task.RGVName == "RGV02" && task.TargetAddress == "1002") || (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && task.RGVName == "RGV01" && (task.TargetAddress == "1030" || task.TargetAddress == "1029")))
                                {
                                    task.Remark = "1025";
                                    _taskRepository.UpdateData(task);
@@ -643,7 +644,7 @@
                                    };
                                    SendCommand(commonRGVFirst, command);
                                    Thread.Sleep(3000);
                                    if (!commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running))
                                    if (!commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running) || commonRGVFirst.GetValue<RGVDBName, int>(RGVDBName.Speed) == 0)
                                    {
                                        return null;
                                    }
@@ -726,7 +727,7 @@
                            };
                            SendCommand(commonRGVSecond, command);
                            Thread.Sleep(3000);
                            if (!commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running))
                            if (!commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running) || commonRGVSecond.GetValue<RGVDBName, int>(RGVDBName.Speed) == 0)
                            {
                                return null;
                            }
@@ -805,7 +806,7 @@
                            };
                            SendCommand(commonRGVFirst, command);
                            Thread.Sleep(3000);
                            if (!commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running))
                            if (!commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running) || commonRGVFirst.GetValue<RGVDBName, int>(RGVDBName.Speed) == 0)
                            {
                                return null;
                            }
@@ -912,7 +913,7 @@
                                    };
                                    SendCommand(commonRGVSecond, command);
                                    Thread.Sleep(3000);
                                    if (!commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running))
                                    if (!commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running) || commonRGVSecond.GetValue<RGVDBName, int>(RGVDBName.Speed) == 0)
                                    {
                                        return null;
                                    }
@@ -999,7 +1000,7 @@
                                    };
                                    SendCommand(commonRGVFirst, command);
                                    Thread.Sleep(3000);
                                    if (!commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running))
                                    if (!commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running) || commonRGVFirst.GetValue<RGVDBName, int>(RGVDBName.Speed) == 0)
                                    {
                                        return null;
                                    }
@@ -1423,7 +1424,7 @@
                }
                else if (task.TaskState == (int)TaskInStatusEnum.RGV_IndispatchFinish)
                {
                    if (task.Remark != null && (task.Roadway == "SC01" || task.Roadway == "SC06"))
                    if (task.Remark != null && (task.Remark == "1026" || task.Remark == "1025"))
                    {
                        Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.Remark);
                        rgvTaskCommand.TaskType = (byte)Convert.ToSByte(4);
@@ -1446,7 +1447,7 @@

                if (task.TaskState == (int)TaskOutStatusEnum.Line_OutFinish)
                {
                    if (task.Remark != null && (task.Roadway == "SC01" || task.Roadway == "SC06"))
                    if (task.Remark != null && (task.Remark == "1025" || task.Remark == "1026"))
                    {
                        Dt_StationManager stationManagerStart = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.CurrentAddress);
                        Dt_StationManager stationManagerEnd = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.Remark);
@@ -1471,9 +1472,18 @@
                }
                else if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutdispatchFinish)
                {
                    Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.NextAddress);
                    rgvTaskCommand.TaskType = (byte)Convert.ToSByte(4);
                    rgvTaskCommand.PutcargoLocation = (byte)Convert.ToSByte(stationManager.stationRemark);
                    if (task.Remark != null && (task.Remark == "1025" || task.Remark == "1026"))
                    {
                        Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.Remark);
                        rgvTaskCommand.TaskType = (byte)Convert.ToSByte(4);
                        rgvTaskCommand.PutcargoLocation = (byte)Convert.ToSByte(stationManager.stationRemark);
                    }
                    else
                    {
                        Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.NextAddress);
                        rgvTaskCommand.TaskType = (byte)Convert.ToSByte(4);
                        rgvTaskCommand.PutcargoLocation = (byte)Convert.ToSByte(stationManager.stationRemark);
                    }
                }
                else
                {