RuiShengZhiNeng/GaoPuLiTiKu.git

			@@ -16,6 +16,7 @@
			#endregion << ç æ¬ æ³¨ é >>

			using AutoMapper;
			using SixLabors.ImageSharp.ColorSpaces;
			using SqlSugar;
			using System.Diagnostics.CodeAnalysis;
			using WIDESEAWCS_BasicInfoService;
			@@ -146,6 +147,9 @@
			public WebResponseContent CancelWMSTask(WMSCancelTask wMSCancelTask)
			{
			WebResponseContent content = new WebResponseContent();
			var KLS = new CancelGALAXISTask();
			CancelHIKROBOTTask cancelHIKROBOTTask = new CancelHIKROBOTTask();
			CancelSXCTake cancelSXCTake = new CancelSXCTake();
			try
			{
			Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
			@@ -163,7 +167,7 @@
			#region å¯ä¹å£«
			if (isGALAXISTask)
			{
			var KLS = new CancelGALAXISTask
			KLS = new CancelGALAXISTask
			{
			taskId = dt_Task.WMSTaskNum,
			reportTime = DateTime.Now.ToString()
			@@ -176,11 +180,11 @@
			{
			//ç´æ¥ç§»å¥åå²
			BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å®æ);
			return content.OK("åæ¶ä»»å¡æå", dt_Task);
			content.OK("åæ¶ä»»å¡æå", dt_Task);
			}
			else
			{
			return content.Error($"ä»»å¡å¤±è´¥{agvContent.data.returnInfo}");
			content.Error($"ä»»å¡å¤±è´¥{agvContent.data.returnInfo}");

			}
			}
			@@ -189,7 +193,7 @@
			#region ååè½¦
			if (isAGV)
			{
			CancelSXCTake cancelSXCTake = new CancelSXCTake
			cancelSXCTake = new CancelSXCTake
			{
			taskID = dt_Task.RGVTaskId
			};
			@@ -201,18 +205,18 @@
			{
			//ç´æ¥ç§»å¥åå²
			BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å®æ);
			return content.OK("åæ¶ä»»å¡æå", dt_Task);
			content.OK("åæ¶ä»»å¡æå", dt_Task);
			}
			else
			{
			return content.Error($"ä»»å¡å¤±è´¥{fOURBOTReturn.data}");
			content.Error($"ä»»å¡å¤±è´¥{fOURBOTReturn.data}");
			}
			}
			#endregion
			#region æµ·åº·
			if (isHK)
			{
			CancelHIKROBOTTask cancelHIKROBOTTask = new CancelHIKROBOTTask
			cancelHIKROBOTTask = new CancelHIKROBOTTask
			{
			robotTaskCode = dt_Task.WMSTaskNum,
			cancelType = "CANCEL"//åè½¯åæ¶ï¼DROPäººå·¥ä»å¥ï¼åç¡¬åæ¶ï¼
			@@ -225,11 +229,11 @@
			{
			//ç´æ¥ç§»å¥åå²
			BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å®æ);
			return content.OK("åæ¶ä»»å¡æå", dt_Task);
			content.OK("åæ¶ä»»å¡æå", dt_Task);
			}
			else
			{
			return content.Error($"ä»»å¡å¤±è´¥{hIKROBOTReturn.data}");
			content.Error($"ä»»å¡å¤±è´¥{hIKROBOTReturn.data}");
			}

			}
			@@ -239,6 +243,33 @@
			catch (Exception ex)
			{
			content.Error(ex.Message);
			}
			finally
			{
			// å¨ finally ä¸å¤æåªä¸ªå¯¹è±¡è¢«èµå¼äº
			object logObject = null;
			string deviceName = "";

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

			if (logObject != null)
			{
			_trackloginfoService.AddTrackLog(logObject, content, $"åæ¶{deviceName}ä»»å¡", "", "");
			}
			}
			return content;
			}
			@@ -252,6 +283,9 @@
			public WebResponseContent UpdateWMSTaskPriority(WMSUpdateTaskPriority updateTaskPriority)
			{
			WebResponseContent content = new WebResponseContent();
			var updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade();
			var request = new UpdateAgvSXCTake();
			var Hkrequest = new HIKROBOTTaskGrade();
			try
			{
			Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == updateTaskPriority.taskCode);
			@@ -271,7 +305,7 @@
			#region å¯ä¹å£«
			if (isGALAXISTask)
			{
			var updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade
			updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade
			{
			taskId = dt_Task.WMSTaskNum,
			reportTime = DateTime.Now.ToString(),
			@@ -286,11 +320,11 @@
			{

			BaseDal.UpdateData(dt_Task);
			return content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);
			content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);
			}
			else
			{
			return content.Error($"ä»»å¡å¤±è´¥{agvContent.data.returnInfo}");
			content.Error($"ä»»å¡å¤±è´¥{agvContent.data.returnInfo}");
			}
			}
			#endregion
			@@ -298,7 +332,7 @@
			#region ååè½¦
			if (isAGV)
			{
			var request = new UpdateAgvSXCTake
			request = new UpdateAgvSXCTake
			{
			taskID = dt_Task.RGVTaskId,
			priority = updateTaskPriority.taskPriority
			@@ -310,11 +344,11 @@
			if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "æå")
			{
			BaseDal.UpdateData(dt_Task);
			return content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);
			content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);
			}
			else
			{
			return content.Error($"ä»»å¡å¤±è´¥{fOURBOTReturn.data}");
			content.Error($"ä»»å¡å¤±è´¥{fOURBOTReturn.data}");
			}
			}

			@@ -322,23 +356,23 @@
			#region æµ·åº·
			if (isHK)
			{
			var request = new HIKROBOTTaskGrade
			Hkrequest = new HIKROBOTTaskGrade
			{
			robotTaskCode = dt_Task.WMSTaskNum,//ä»»å¡å·
			initPriority = updateTaskPriority.taskPriority//ä¼åçº§
			};
			Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(HIKROBOTTaskGrade));
			if (apiInfo == null) throw new Exception("æªæ¾å°ååè½¦AGVä»»å¡ä¸åæ¥å£éç½®ä¿¡æ¯ï¼è¯·æ£æ¥æ¥å£éç½®");
			string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
			string response = HttpHelper.Post(apiInfo.ApiAddress, Hkrequest.Serialize());
			HIKROBOTReturn hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
			if (hIKROBOTReturn.code == "SUCCESS0" && hIKROBOTReturn.message == "æå")
			{
			BaseDal.UpdateData(dt_Task);
			return content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);
			content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);
			}
			else
			{
			return content.Error($"ä»»å¡å¤±è´¥{hIKROBOTReturn.data}");
			content.Error($"ä»»å¡å¤±è´¥{hIKROBOTReturn.data}");
			}
			}
			#endregion
			@@ -347,6 +381,33 @@
			{
			content.Error(ex.Message);
			}
			finally
			{
			// å¨ finally ä¸å¤æåªä¸ªå¯¹è±¡è¢«èµå¼äº
			object logObject = null;
			string deviceName = "";

			if (updateGALAXISTaskGrade != null )
			{
			logObject = updateGALAXISTaskGrade;
			deviceName = "å¯ä¹å£«AGV";
			}
			else if (Hkrequest != null)
			{
			logObject = Hkrequest;
			deviceName = "æµ·åº·æºå¨äºº";
			}
			else if (request != null )
			{
			logObject = request;
			deviceName = "ååè½¦";
			}

			if (logObject != null)
			{
			_trackloginfoService.AddTrackLog(logObject, content, $"ä¿®æ¹{deviceName}ä»»å¡ä¼åçº§", "", "");
			}
			}
			return content;
			}