´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs
@@ -168,7 +168,7 @@ task.ExceptionMessage = $"ã{task.SourceAddress}ãåå ¥3楼åºåºç®±æ¾å°ä½å¤±è´¥{ex.Message}"; task.Remark = $"{device.DeviceCode}_Outboundboxon_{1}_{task.SourceAddress}"; throw; } } BaseDal.UpdateData(task); } @@ -204,7 +204,7 @@ task.ExceptionMessage = $"ã{task.TargetAddress}ãåå ¥4楼空箱æ¾å°ä½å¤±è´¥{ex.Message}"; task.Remark = $"{device.DeviceCode}_Emptyboxplacedinposition_{1}_{task.TargetAddress}"; } } BaseDal.UpdateData(task); } @@ -240,7 +240,7 @@ task.ExceptionMessage = $"ã{task.SourceAddress}ãåå ¥4楼åºåºåç®±å®æ失败{ex.Message}"; task.Remark = $"{device.DeviceCode}_Outboundboxretrievalcompleted_{1}_{task.SourceAddress}"; } } BaseDal.UpdateData(task); } @@ -277,7 +277,7 @@ task.ExceptionMessage = $"ã{Address}ãå ³é请æ±è¿å ¥å¤±è´¥ï¼{ex.Message}"; task.Remark = $"{device.DeviceCode}_RequestToEnter_{false}_{Address}"; } } BaseDal.UpdateData(task); } @@ -321,7 +321,7 @@ task.ExceptionMessage = $"ãTSJR3Fã3楼读ç 触å失败ï¼{ex.Message}"; task.Remark = $"{device.DeviceCode}_Codereadingtriggered_{1}_TSJR3F"; } } task.TaskState = (int)TaskStatusEnum.CheckPalletCodeing; BaseDal.UpdateData(task); @@ -378,7 +378,7 @@ var task = BaseDal.QueryFirst(x => x.PalletCode == Rgv.content.podID); if (task == null) throw new Exception($"æªæ¾å°ä»»å¡,ä»»å¡ç¼å·ã{Rgv.content.taskID}ã"); //ç§»åº if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt()) if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt() && string.IsNullOrEmpty(task.WMSTaskNum)) { if (Rgv.messageType == 72) { @@ -422,15 +422,18 @@ 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 (task.SourceAddress != "OUT-01") { if (device.IsConnected) device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress); //BaseDal.UpdateData(task);//ç»è´¨æ£é¨åå ¥å¯å¨ä¿¡å· var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice; if (device == null) task.ExceptionMessage = "æªæ¾å°1楼质æ£é¨è®¾å¤ä¿¡æ¯"; else task.ExceptionMessage = "1楼质æ£é¨è®¾å¤è¿æ¥å¤±è´¥"; { if (device.IsConnected) device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress); else task.ExceptionMessage = "1楼质æ£é¨è®¾å¤è¿æ¥å¤±è´¥"; } } TaskFeedback(task, 4); } @@ -687,7 +690,7 @@ { if (locationStatusEnum == LocationStatusEnum.Free) //å¦æèµ·ç¹å®æå°±ç»è´§ä½èµå¼æçå· { stationManger.Remark =""; stationManger.Remark = ""; stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt(); } else ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -1406,6 +1406,7 @@ { stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt(); stationManger.Remark = ""; _stationMangerService.UpdateData(stationManger); FOURBOToccupyStation fOURBOToccupyStation = new FOURBOToccupyStation() { stationCode = wMSContainerFlow.slotCode, @@ -1414,7 +1415,6 @@ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>(); content.OK(data: fOURBOTReturn); if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg); _stationMangerService.UpdateData(stationManger); } return content.OK(); } ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs
@@ -4,6 +4,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using System.Net.NetworkInformation; using System.Text; using System.Threading.Tasks; using WIDESEAWCS_Common; @@ -164,7 +165,7 @@ WebResponseContent content = new WebResponseContent(); try { List<Dt_Task> dt_Tasks = new List<Dt_Task>(); //List<Dt_Task> dt_Tasks = new List<Dt_Task>(); var PalletCodes = tasks.Select(x => x.PalletCode).ToList(); var request = new GetBlockPodContentListDto { @@ -221,34 +222,69 @@ _taskService.UpdateData(tasks); return; } foreach (var Result in getBlockPod.Result) #region å¤ææ¯å¦éè¦ç§»åº foreach (var task in tasks) { foreach (var item in Result.outPods) var item = getBlockPod.Result[0].outPods.FirstOrDefault(x => x.outPod == task.PalletCode); if (item != null) { var task = tasks.First(x => x.PalletCode == item.outPod); if (item.blockPods != null && item.blockPods.Count > 0) item.blockPods = item.blockPods.Except(PalletCodes).ToList(); if (item.blockPods != null && item.blockPods.Count > 0) { #region å¤æé»ç¢ææ¯å¦ä¸ºåºåºä»»å¡ //var except = item.blockPods.Except(PalletCodes).ToList(); #endregion var responseContent = AddMoveTask(item.blockPods, task);//æ·»å 移åºä»»å¡ if (!responseContent.Status) task.ExceptionMessage = responseContent.Message; else { task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute; } dt_Tasks.Add(task); else task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute; #region 移åºç¶æåé¦ç»WMS WMSInOutBoundCompleteFeedback boundCompleteFeedback = new WMSInOutBoundCompleteFeedback(); boundCompleteFeedback.taskCode = task.WMSTaskNum; boundCompleteFeedback.containerCode = task.PalletCode; boundCompleteFeedback.fromStationCode = task.SourceAddress; boundCompleteFeedback.toLocationCode = task.TargetAddress; boundCompleteFeedback.status = 5; boundCompleteFeedback.custStatus = ""; _apiInfoService.PostInterfaceRequest(nameof(WMSInOutBoundCompleteFeedback), boundCompleteFeedback.Serialize(), "æååºåºä»»å¡çå¾ ç§»åºä¸æ¥WMS"); #endregion } else { task.TaskState = (int)TaskStatusEnum.RGV_WaitSend; dt_Tasks.Add(task); } } else task.ExceptionMessage = $"RCSæªåé¦ã{task.PalletCode}ãå¯åºåºæçä¿¡æ¯,详æ 请æ¥çæ¹éè·åé»ç¢æçå ³ç³»æ¥å£æ¥å¿ï¼"; } _taskService.UpdateData(dt_Tasks); _taskService.Repository.UpdateData(tasks); #endregion #region MyRegion //foreach (var Result in getBlockPod.Result) //{ // foreach (var item in Result.outPods) // { // var task = tasks.First(x => x.PalletCode == item.outPod); // if (item.blockPods != null && item.blockPods.Count > 0) // item.blockPods = item.blockPods.Except(PalletCodes).ToList(); // if (item.blockPods != null && item.blockPods.Count > 0) // { // #region å¤æé»ç¢ææ¯å¦ä¸ºåºåºä»»å¡ // //var except = item.blockPods.Except(PalletCodes).ToList(); // #endregion // var responseContent = AddMoveTask(item.blockPods, task);//æ·»å 移åºä»»å¡ // if (!responseContent.Status) task.ExceptionMessage = responseContent.Message; // else // { // task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute; // } // dt_Tasks.Add(task); // } // else // { // task.TaskState = (int)TaskStatusEnum.RGV_WaitSend; // dt_Tasks.Add(task); // } // } //} //_taskService.UpdateData(dt_Tasks); #endregion content.OK(); } } ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestExtend.cs
@@ -26,6 +26,13 @@ //ä»»å¡çç®æ å°å对äºç«å°å·ï¼ foreach (var task in taskList) { if (task.SourceAddress == "OUT-01") { task.TaskState = TaskStatusEnum.CheckShapeingOk.ObjToInt(); task.ExceptionMessage = ""; Uptasks.Add(task); continue; } if (device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_QualityInspection, task.SourceAddress)) { device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, false, task.SourceAddress);
