´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs
@@ -254,10 +254,18 @@ try { var tasktype = (TaskTypeEnum)Enum.GetValues(typeof(TaskTypeEnum)).GetValue(task.TaskType - 1); hIKROBOTTaskSubmit.initPriority = task.Grade; if (task.PalletCode== "MR-Q3-600LE-D(M)") { hIKROBOTTaskSubmit.robotType = "19"; //海康 转è¿è½¦ } else if (task.PalletCode == "MR-Q3-600LE-D(M)(YWGP)") { hIKROBOTTaskSubmit.robotType = "20"; //海康 空æç车ï¼ä¸æ¥¼å°å 楼ï¼6楼å°ä¸æ¥¼ } hIKROBOTTaskSubmit.taskType = tasktype.ToString(); ExtraDto extraDto = new ExtraDto(); hIKROBOTTaskSubmit.robotTaskCode = task.WMSTaskNum; hIKROBOTTaskSubmit.taskType = tasktype.ToString(); ExtraDto extraDto = new ExtraDto(); if (task.TaskType != (int)TaskTypeEnum.MOVE && task.TaskType != (int)TaskTypeEnum.Q3RK && task.TaskType != (int)TaskTypeEnum.Q3CK && task.TaskType != (int)TaskTypeEnum.F01) { CarrierInfoDto carrierInfoDto = new CarrierInfoDto() ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs
@@ -3,6 +3,7 @@ using NetTaste; using OfficeOpenXml.FormulaParsing.Excel.Functions.Text; using System; using System.Collections; using System.Collections.Generic; using System.Linq; using System.Net.NetworkInformation; @@ -141,6 +142,8 @@ else { bool Work = false; try { if (device.IsConnected) { int i = 0; @@ -157,6 +160,13 @@ task.Remark = $"{device.DeviceCode}_Outboundboxon_{1}_{task.SourceAddress}"; } } catch (Exception ex) { task.ExceptionMessage = $"ã{task.SourceAddress}ãåå ¥3楼åºåºç®±æ¾å°ä½å¤±è´¥"; task.Remark = $"{device.DeviceCode}_Outboundboxon_{1}_{task.SourceAddress}"; throw; } } BaseDal.UpdateData(task); } //å楼 åºåº @@ -167,6 +177,8 @@ else { bool Work = false; try { if (device.IsConnected) { int i = 0; @@ -183,6 +195,14 @@ task.Remark = $"{device.DeviceCode}_Emptyboxplacedinposition_{1}_{task.TargetAddress}"; } } catch (Exception ex) { task.ExceptionMessage = $"ã{task.TargetAddress}ãåå ¥4楼空箱æ¾å°ä½å¤±è´¥"; task.Remark = $"{device.DeviceCode}_Emptyboxplacedinposition_{1}_{task.TargetAddress}"; } } BaseDal.UpdateData(task); } // //å楼åºæåæº å ¥åº ä¹åæ¯AGV_ToExecute //è¦åæåè´§å®æç¶æTakeFinish @@ -193,6 +213,8 @@ else { bool Work = false; try { if (device.IsConnected) { int i = 0; @@ -209,6 +231,14 @@ task.Remark = $"{device.DeviceCode}_Outboundboxretrievalcompleted_{1}_{task.SourceAddress}"; } } catch (Exception ex) { task.ExceptionMessage = $"ã{task.SourceAddress}ãåå ¥4楼åºåºåç®±å®æ失败"; task.Remark = $"{device.DeviceCode}_Outboundboxretrievalcompleted_{1}_{task.SourceAddress}"; } } BaseDal.UpdateData(task); } //è·¨æ¥¼å± @@ -220,6 +250,8 @@ { bool Wok = false; var Address = task.TaskType == TaskTypeEnum.Q3RK.ObjToInt() ? task.TargetAddress : task.SourceAddress; try { if (device.IsConnected) { int i = 0; @@ -235,6 +267,14 @@ task.ExceptionMessage = $"ã{Address}ãå ³é请æ±è¿å ¥å¤±è´¥ï¼"; task.Remark = $"{device.DeviceCode}_RequestToEnter_{false}_{Address}"; } } catch (Exception ex) { task.ExceptionMessage = $"ã{Address}ãå ³é请æ±è¿å ¥å¤±è´¥ï¼"; task.Remark = $"{device.DeviceCode}_RequestToEnter_{false}_{Address}"; } } BaseDal.UpdateData(task); } @@ -254,6 +294,8 @@ else { bool Wok = false; try { if (device.IsConnected) { int i = 0; @@ -270,6 +312,14 @@ task.Remark = $"{device.DeviceCode}_Codereadingtriggered_{1}_TSJR3F"; } } catch (Exception ex) { task.ExceptionMessage = $"ãTSJR3Fã3楼读ç 触å失败ï¼"; task.Remark = $"{device.DeviceCode}_Codereadingtriggered_{1}_TSJR3F"; } } task.TaskState = (int)TaskStatusEnum.CheckPalletCodeing; BaseDal.UpdateData(task); } ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs
@@ -63,7 +63,6 @@ // Q3CK æ¯AAâFFç跨楼å±ä»»å¡ï¼åªè½ä½¿ç¨ä¸ç¨å°è½¦ var code = item.TaskType == (int)TaskTypeEnum.Q3CK ? "AA" : "FF"; var specialCarInAA = dataList.FirstOrDefault(d => d.mapCode == code); if (specialCarInAA != null) { // æå¨1楼çå°è½¦ï¼ç´æ¥æ§è¡ä»»å¡ @@ -107,7 +106,6 @@ { // F01ä»»å¡å¤çï¼æ ¹æ®ç®æ å°åå¤æéè¦åªä¸ªæ¥¼å±çå°è½¦ var result = _agvcartInfoService.CheckTheCar("MR-Q3-600LE-D(M)"); if (result != null && result.Status) { var dataList = result.Data as List<HIKROBOTQueryData>; @@ -194,12 +192,17 @@ var currentFloorInfo = FloorMapping.FloorMap[currentMapCode]; var targetFloorInfo = FloorMapping.FloorMap[targetMapCode]; // 设置任å¡ä¿¡æ¯ //task.SourceAddress = currentFloorInfo.PointCode; // èµ·ç¹ï¼å°è½¦å½åä½ç½®çç¹ä½ //task.CurrentAddress = currentFloorInfo.PointCode; // å½åä½ç½®ï¼å°è½¦å½åä½ç½®çç¹ä½ //task.TargetAddress = targetFloorInfo.PointCode; // ç®æ ç¹ï¼ç®æ 楼å±ç¹ä½ //task.NextAddress = targetFloorInfo.PointCode; // è®°å½ç®æ 楼å±ä»£ç // è®°å½ä½¿ç¨çAGVå°è½¦åå·å°ä»»å¡ä¸ var carType= ""; if (task.TaskType==(int)TaskTypeEnum.F01) { carType = "MR-Q3-600LE-D(M)"; } else// 1-6/6-1çä»»å¡ { carType = "MR-Q3-600LE-D(M)(YWGP)"; } Dt_Task newTask = new Dt_Task { WMSTaskNum = "HK_" + task.WMSTaskNum, // çæå¯ä¸çWMSä»»å¡å· @@ -210,7 +213,7 @@ NextAddress = targetFloorInfo.PointCode, TaskType = (int)TaskTypeEnum.MOVE, Grade = task.Grade, PalletCode = "", PalletCode = carType, TaskState = (int)TaskStatusEnum.CallingHKtransportation, // å¤å¶å ¶ä»å¿ è¦å段 CreateDate = DateTime.Now,
