RuiShengZhiNeng/GaoPuLiTiKu.git

			@@ -95,10 +95,12 @@
			{
			content = TaskHelpMethods.isOkTaskInfo(task, true, true);
			if (!content.Status) throw new Exception(content.Message);
			if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode \|\| x.PalletCode == task.containerCode) != null)
			{
			continue;
			}
			if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode) != null)
			throw new Exception($"ä»»å¡å·ã{task.taskCode}ãå·²åå¨ä»»å¡");
			if (BaseDal.QueryFirst(x => x.PalletCode == task.containerCode) != null)
			throw new Exception($"æçå·ã{task.containerCode}ãå·²åå¨ä»»å¡");
			if (BaseDal.QueryFirst(x => x.SourceAddress == task.fromLocationCode) != null)
			throw new Exception($"èµ·ç¹ä½ç½®ã{task.containerCode}ãå·²åå¨ä»»å¡");
			switch (item.taskType)
			{
			case (int)TaskTypeEnum.MLInbound:
			@@ -167,7 +169,7 @@
			#region å¯ä¹å£«
			if (isGALAXISTask)
			{
			KLS = new CancelGALAXISTask
			KLS = new CancelGALAXISTask
			{
			taskId = dt_Task.WMSTaskNum,
			reportTime = DateTime.Now.ToString()
			@@ -180,11 +182,11 @@
			{
			//ç´æ¥ç§»å¥åå²
			BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å®æ);
			content.OK("åæ¶ä»»å¡æå", dt_Task);
			content.OK($"åæ¶{dt_Task.WMSTaskNum}ä»»å¡æå", dt_Task);
			}
			else
			{
			content.Error($"ä»»å¡å¤±è´¥{agvContent.data.returnInfo}");
			content.Error($"ä»»å¡{dt_Task.WMSTaskNum}å¤±è´¥{agvContent.data.returnInfo}");

			}
			}
			@@ -193,9 +195,10 @@
			#region ååè½¦
			if (isAGV)
			{
			cancelSXCTake = new CancelSXCTake
			cancelSXCTake = new CancelSXCTake
			{
			taskID = dt_Task.RGVTaskId
			taskID = dt_Task.RGVTaskId,
			withoutRunning = 1
			};
			Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelSXCTake));
			if (apiInfo == null) throw new Exception("æªæ¾å°ååè½¦AGVä»»å¡ä¸åæ¥å£éç½®ä¿¡æ¯ï¼è¯·æ£æ¥æ¥å£éç½®");
			@@ -205,18 +208,18 @@
			{
			//ç´æ¥ç§»å¥åå²
			BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å®æ);
			content.OK("åæ¶ä»»å¡æå", dt_Task);
			content.OK($"åæ¶{dt_Task.WMSTaskNum}ä»»å¡æå", dt_Task);
			}
			else
			{
			content.Error($"ä»»å¡å¤±è´¥{fOURBOTReturn.data}");
			content.Error($"ä»»å¡{dt_Task.WMSTaskNum}å¤±è´¥{fOURBOTReturn.data}");
			}
			}
			#endregion
			#region æµ·åº·
			if (isHK)
			{
			cancelHIKROBOTTask = new CancelHIKROBOTTask
			cancelHIKROBOTTask = new CancelHIKROBOTTask
			{
			robotTaskCode = dt_Task.WMSTaskNum,
			cancelType = "CANCEL"//åè½¯åæ¶ï¼DROPäººå·¥ä»å¥ï¼åç¡¬åæ¶ï¼
			@@ -229,11 +232,11 @@
			{
			//ç´æ¥ç§»å¥åå²
			BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å®æ);
			content.OK("åæ¶ä»»å¡æå", dt_Task);
			content.OK("åæ¶{dt_Task.WMSTaskNum}ä»»å¡æå", dt_Task);
			}
			else
			{
			content.Error($"ä»»å¡å¤±è´¥{hIKROBOTReturn.data}");
			content.Error($"ä»»å¡{dt_Task.WMSTaskNum}å¤±è´¥ï¼éè¯¯ä¿¡æ¯ï¼{hIKROBOTReturn.data}");
			}

			}
			@@ -250,17 +253,17 @@
			object logObject = null;
			string deviceName = "";

			if (KLS != null )
			if (KLS != null)
			{
			logObject = KLS;
			deviceName = "å¯ä¹å£«AGV";
			}
			else if (cancelHIKROBOTTask != null )
			else if (cancelHIKROBOTTask != null)
			{
			logObject = cancelHIKROBOTTask;
			deviceName = "æµ·åº·æºå¨äºº";
			}
			else if (cancelSXCTake != null )
			else if (cancelSXCTake != null)
			{
			logObject = cancelSXCTake;
			deviceName = "ååè½¦";
			@@ -268,7 +271,7 @@

			if (logObject != null)
			{
			_trackloginfoService.AddTrackLog(logObject, content, $"åæ¶{deviceName}ä»»å¡", "", "");
			_trackloginfoService.AddTrackLog(logObject, content, $"åæ¶{deviceName}ä»»å¡,", "", "");
			}
			}
			return content;
			@@ -309,7 +312,6 @@
			{
			taskId = dt_Task.WMSTaskNum,
			reportTime = DateTime.Now.ToString(),
			district = dt_Task.Roadway,//ä»»å¡åºåº
			priorityCode = updateTaskPriority.taskPriority,
			};
			Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(UpdateGALAXISTaskGrade));
			@@ -320,11 +322,11 @@
			{

			BaseDal.UpdateData(dt_Task);
			content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);
			content.OK($"ä¿®æ¹{dt_Task.WMSTaskNum}ä»»å¡ä¼åçº§æå", dt_Task);
			}
			else
			{
			content.Error($"ä»»å¡å¤±è´¥{agvContent.data.returnInfo}");
			content.Error($"{dt_Task.WMSTaskNum}ä»»å¡å¤±è´¥,éè¯¯ä¿¡æ¯ï¼{agvContent.data.returnInfo}");
			}
			}
			#endregion
			@@ -332,23 +334,23 @@
			#region ååè½¦
			if (isAGV)
			{
			request = new UpdateAgvSXCTake
			request = new UpdateAgvSXCTake
			{
			taskID = dt_Task.RGVTaskId,
			priority = updateTaskPriority.taskPriority
			};
			Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(UpdateAgvSXCTake));
			if (apiInfo == null) throw new Exception("æªæ¾å°ååè½¦AGVä»»å¡ä¸åæ¥å£éç½®ä¿¡æ¯ï¼è¯·æ£æ¥æ¥å£éç½®");
			if (apiInfo == null) throw new Exception("æªæ¾å°æ´æ°ååè½¦ä»»å¡ä¼åçº§æ¥å£éç½®ä¿¡æ¯ï¼è¯·æ£æ¥æ¥å£éç½®");
			string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
			FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
			if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "æå")
			{
			BaseDal.UpdateData(dt_Task);
			content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);
			content.OK("ä¿®æ¹{dt_Task.WMSTaskNum}ä»»å¡ä¼åçº§æå", dt_Task);
			}
			else
			{
			content.Error($"ä»»å¡å¤±è´¥{fOURBOTReturn.data}");
			content.Error($"ä»»å¡{dt_Task.WMSTaskNum}å¤±è´¥ï¼éè¯¯ä¿¡æ¯ï¼{fOURBOTReturn.data}");
			}
			}

			@@ -356,7 +358,7 @@
			#region æµ·åº·
			if (isHK)
			{
			Hkrequest = new HIKROBOTTaskGrade
			Hkrequest = new HIKROBOTTaskGrade
			{
			robotTaskCode = dt_Task.WMSTaskNum,//ä»»å¡å·
			initPriority = updateTaskPriority.taskPriority//ä¼åçº§
			@@ -368,11 +370,11 @@
			if (hIKROBOTReturn.code == "SUCCESS0" && hIKROBOTReturn.message == "æå")
			{
			BaseDal.UpdateData(dt_Task);
			content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);
			content.OK("ä¿®æ¹{dt_Task.WMSTaskNum}ä»»å¡ä¼åçº§æå", dt_Task);
			}
			else
			{
			content.Error($"ä»»å¡å¤±è´¥{hIKROBOTReturn.data}");
			content.Error($"ä»»å¡{dt_Task.WMSTaskNum}å¤±è´¥ï¼éè¯¯ä¿¡æ¯{hIKROBOTReturn.data}");
			}
			}
			#endregion
			@@ -387,7 +389,7 @@
			object logObject = null;
			string deviceName = "";

			if (updateGALAXISTaskGrade != null )
			if (updateGALAXISTaskGrade != null)
			{
			logObject = updateGALAXISTaskGrade;
			deviceName = "å¯ä¹å£«AGV";
			@@ -397,7 +399,7 @@
			logObject = Hkrequest;
			deviceName = "æµ·åº·æºå¨äºº";
			}
			else if (request != null )
			else if (request != null)
			{
			logObject = request;
			deviceName = "ååè½¦";
			@@ -1118,7 +1120,8 @@
			};
			string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOToccupyStation.Serialize());
			FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
			if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
			if (fOURBOTReturn.returnCode != 0 && fOURBOTReturn.returnUserMsg != $"ç«ç¹å·²è¢«å ç¨,(podID={iQC.ContainerCode})")
			throw new Exception(fOURBOTReturn.returnUserMsg);
			#endregion

			#region åå»ºååè½¦ä»»å¡
			@@ -1166,7 +1169,7 @@
			var Agvlocation = _rGVLocationInfoService.Repository.QueryData(x => fOURBOTStorageStatusNotify.storageCode.Contains(x.LocationCode));
			foreach (var item in Agvlocation)
			{
			item.LocationStatus = (int)(fOURBOTStorageStatusNotify.disable == 0 ? EnableStatusEnum.Normal : EnableStatusEnum.Disable);
			item.EnableStatus = (int)(fOURBOTStorageStatusNotify.disable == 0 ? EnableStatusEnum.Normal : EnableStatusEnum.Disable);
			}
			_rGVLocationInfoService.UpdateData(Agvlocation);
			return WebResponseContent.Instance.OK();