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

dengjunjie

2026-03-12 38072f522dd49da33b22f604fb6b262e884b8a32

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

@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.NetworkInformation;
using System.Reflection.Metadata;
using System.Text;
using System.Text.Json;
@@ -78,6 +79,10 @@
                        case "outbin":
                            TaskFromCompleted(task, deviceTypeEnum);
                            break;
                        case "start":
                            task.TaskState = (int)TaskStatusEnum.Takeing;
                            TaskFeedback(task, 1);
                            break;
                        default:
                            task.TaskState = ReturnTaskStatus(hIKROBOT.extra.values.method, deviceTypeEnum);
                            BaseDal.UpdateData(task);
@@ -91,36 +96,49 @@
                    //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 == TaskTypeEnum.CPMoveInventory.ObjToInt())
                    {
                        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 ?? throw new Exception("未找到1楼质检门设备信息");
                            device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
                        }
                        else
                        {
                            TaskFromCompleted(task, deviceTypeEnum);
                        }

                    }
                    else if (Rgv.messageType == 10)
                    else
                    {
                        if (Rgv.content.status == 4)
                        if (Rgv.messageType == 72)//小车顶起货物
                        {
                            if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
                            if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Execut)
                            {
                                task.TaskState = (int)TaskStatusEnum.CheckShapeing;
                                BaseDal.UpdateData(task);
                                task.TaskState = (int)TaskStatusEnum.WaiCheckShape;
                                //BaseDal.UpdateData(task);//给质检门写入启动信号
                                TaskFeedback(task, 4);
                                var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice ?? throw new Exception("未找到1楼质检门设备信息");
                                device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
                            }
                            else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Puting)
                            else
                            {
                                TaskCompleted(task, deviceTypeEnum);
                                TaskFromCompleted(task, deviceTypeEnum);
                            }
                            else if (task.TaskType == (int)TaskTypeEnum.CPOutbound || task.TaskType == (int)TaskTypeEnum.CPMoveInventory)//出库、移库完成
                        }
                        else if (Rgv.messageType == 10)
                        {
                            if (Rgv.content.status == 2) TaskFeedback(task, 1);
                            if (Rgv.content.status == 4)
                            {
                                TaskCompleted(task, deviceTypeEnum);
                                if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
                                {
                                    task.TaskState = (int)TaskStatusEnum.CheckShapeing;
                                    BaseDal.UpdateData(task);
                                }
                                else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Puting)
                                {
                                    TaskCompleted(task, deviceTypeEnum);
                                }
                                else if (task.TaskType == (int)TaskTypeEnum.CPInbound && !string.IsNullOrEmpty(task.ExceptionMessage))
                                {
                                    ErrorTaskFeedback(task, !task.ExceptionMessage.Contains("外检失败"));
                                }
                                else if (task.TaskType == (int)TaskTypeEnum.CPOutbound || task.TaskType == (int)TaskTypeEnum.CPMoveInventory)//出库、移库完成
                                {
                                    TaskCompleted(task, deviceTypeEnum);
                                }
                            }
                        }
                    }
@@ -339,6 +357,7 @@
        #region ä¸ŠæŠ¥WMS
        public WebResponseContent TaskFeedback(Dt_Task dt_Task, int Status)
        {
            WebResponseContent content = new WebResponseContent();
            WMSInOutBoundCompleteFeedback boundCompleteFeedback = new WMSInOutBoundCompleteFeedback();
            WMSReturn agvContent = null;
            try
@@ -355,19 +374,71 @@
                    boundCompleteFeedback.custStatus = "";
                    string response = HttpHelper.Post(apiInfo.ApiAddress, boundCompleteFeedback.Serialize());
                    agvContent = response.DeserializeObject<WMSReturn>();
                    if (agvContent.code != 0) dt_Task.ExceptionMessage = agvContent.msg;
                    content.OK(data: agvContent);
                    if (agvContent.code != 200)
                    {
                        dt_Task.ExceptionMessage = agvContent.message;
                        content.Error(agvContent.message);
                    }
                }
            }
            catch (Exception ex)
            {
                dt_Task.ExceptionMessage = ex.Message;
            }
            if (agvContent != null && agvContent.code == 0 && Status == 2)
                BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.自动完成);
            else
                BaseDal.UpdateData(dt_Task);
            finally
            {
                _trackloginfoService.AddTrackLog(boundCompleteFeedback, content, "出入库任务状态反馈WMS", "", "");
                if (agvContent != null && agvContent.code == 200 && Status == 2)
                    BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.自动完成);
                else
                    BaseDal.UpdateData(dt_Task);
            }
            return WebResponseContent.Instance.OK();
        }
        #endregion
        #region å¤±è´¥ä»»åŠ¡ä¸ŠæŠ¥WMS并删除任务
        public WebResponseContent ErrorTaskFeedback(Dt_Task dt_Task, bool Del)
        {
            WebResponseContent content = new WebResponseContent();
            WMSInOutBoundCompleteFeedback boundCompleteFeedback = new WMSInOutBoundCompleteFeedback();
            WMSReturn agvContent = null;
            try
            {
                Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(WMSInOutBoundCompleteFeedback));
                if (apiInfo == null) dt_Task.ExceptionMessage = "未找到出入库完成反馈WMS接口配置信息！请检查接口配置";
                else
                {
                    boundCompleteFeedback.taskCode = dt_Task.WMSTaskNum;
                    boundCompleteFeedback.containerCode = dt_Task.PalletCode;
                    boundCompleteFeedback.fromStationCode = dt_Task.SourceAddress;
                    boundCompleteFeedback.toLocationCode = dt_Task.TargetAddress;
                    boundCompleteFeedback.status = 3;
                    boundCompleteFeedback.custStatus = "";
                    boundCompleteFeedback.memo = dt_Task.ExceptionMessage;
                    string response = HttpHelper.Post(apiInfo.ApiAddress, boundCompleteFeedback.Serialize());
                    agvContent = response.DeserializeObject<WMSReturn>();
                    content.OK(data: agvContent);
                    if (agvContent.code != 200)
                    {
                        dt_Task.ExceptionMessage = agvContent.message;
                        content.Error(agvContent.message);
                    }
                }
            }
            catch (Exception ex)
            {
                dt_Task.ExceptionMessage = ex.Message;
                content.Error(ex.Message);
            }
            finally
            {
                _trackloginfoService.AddTrackLog(boundCompleteFeedback, content, "出入库任务状态反馈WMS", "", "");
                if (agvContent != null && agvContent.code == 200 && Del) BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.自动删除);
                else BaseDal.UpdateData(dt_Task);
            }
            return content;
        }
        #endregion
    }
}