Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPu...

dengjunjie

2026-03-17 644819a289399eff1d5972c3df41ec55cb9d8c95

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

@@ -111,35 +111,8 @@
                    //var task = BaseDal.QueryFirst(x => x.RGVTaskId == Rgv.content.taskID);
                    var task = BaseDal.QueryFirst(x => x.PalletCode == Rgv.content.podID);
                    if (task == null) throw new Exception($"未找到任务,任务编号【{Rgv.content.taskID}】");

                    if (Rgv.messageType == 72)//小车顶起货物
                    {
                        if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Execut)
                        {
                            task.TaskState = (int)TaskStatusEnum.WaiCheckShape;
                            //BaseDal.UpdateData(task);//给质检门写入启动信号
                            var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
                            if (device == null) task.ExceptionMessage = "未找到1楼质检门设备信息";
                            else
                            {
                                if (device.IsConnected)
                                    device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
                                else
                                    task.ExceptionMessage = "1楼质检门设备连接失败";
                            }
                            TaskFeedback(task, 4);
                        }
                        else
                        {
                            TaskFromCompleted(task, deviceTypeEnum);
                        }
                    }
                    else if (Rgv.messageType == 10)
                    {
                        if (Rgv.content.status == 2) TaskFeedback(task, 1);
                        if (Rgv.content.status == 4)
                        {
                            if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt())
                    //移库
                    if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt() && Rgv.messageType == 10 && Rgv.content.status == 4)
                            {
                                deviceName += "移库";
                                WMSMoveLocationFeedback wMSMoveLocationFeedback = new WMSMoveLocationFeedback()
@@ -166,7 +139,38 @@
                                    BaseDal.DeleteAndMoveIntoHty(task, OperateTypeEnum.自动完成);
                                }
                            }
                            else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
                    else
                    {
                        //站台到质检台
                        if (Rgv.messageType == 72)//小车顶起货物
                        {
                            if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Execut)
                            {
                                task.TaskState = (int)TaskStatusEnum.WaiCheckShape;
                                //BaseDal.UpdateData(task);//给质检门写入启动信号
                                var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
                                if (device == null) task.ExceptionMessage = "未找到1楼质检门设备信息";
                                else
                                {
                                    if (device.IsConnected)
                                        device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
                                    else
                                        task.ExceptionMessage = "1楼质检门设备连接失败";
                                }
                                TaskFeedback(task, 4);
                            }
                            else
                            {
                                //这里出库，这个接口中也返回给了wms状态
                                TaskFromCompleted(task, deviceTypeEnum);
                            }
                        }
                        else if (Rgv.messageType == 10)//质检台到目标货位
                        {
                            if (Rgv.content.status == 2) TaskFeedback(task, 1);
                            if (Rgv.content.status == 4)
                            {
                                if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
                            {
                                if (!string.IsNullOrEmpty(task.ExceptionMessage)) task.TaskState = TaskStatusEnum.CheckShapeingNG.ObjToInt();
                                else task.TaskState = (int)TaskStatusEnum.CheckShapeing;
@@ -179,13 +183,14 @@
                                else
                                    TaskCompleted(task, deviceTypeEnum);
                            }
                            else if (task.TaskType == (int)TaskTypeEnum.CPOutbound || task.TaskType == (int)TaskTypeEnum.CPMoveInventory)//出库、移库完成
                                else if (task.TaskType == (int)TaskTypeEnum.CPOutbound )//出库完成
                            {
                                TaskCompleted(task, deviceTypeEnum);
                            }
                        }
                    }
                }
                }
                content.OK();
            }
            catch (Exception ex)