RuiShengZhiNeng/GaoPuLiTiKu.git

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

			using AutoMapper;
			using SixLabors.ImageSharp.ColorSpaces;
			using SqlSugar;
			using System.Diagnostics.CodeAnalysis;
			using WIDESEAWCS_BasicInfoService;
			@@ -147,6 +148,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);
			@@ -164,7 +168,7 @@
			#region å¯ä¹å£«
			if (isGALAXISTask)
			{
			var KLS = new CancelGALAXISTask
			KLS = new CancelGALAXISTask
			{
			taskId = dt_Task.WMSTaskNum,
			reportTime = DateTime.Now.ToString()
			@@ -177,11 +181,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}");

			}
			}
			@@ -190,7 +194,7 @@
			#region ååè½¦
			if (isAGV)
			{
			CancelSXCTake cancelSXCTake = new CancelSXCTake
			cancelSXCTake = new CancelSXCTake
			{
			taskID = dt_Task.RGVTaskId,
			withoutRunning = 1
			@@ -203,18 +207,18 @@
			{
			//ç´æ¥ç§»å¥åå²
			BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å®æ);
			return content.OK($"åæ¶ä»»å¡ã{dt_Task.WMSTaskNum}ãæå", dt_Task);
			content.OK("åæ¶ä»»å¡æå", dt_Task);
			}
			else
			{
			return content.Error($"ä»»å¡åæ¶å¤±è´¥ã{dt_Task.WMSTaskNum}ã{fOURBOTReturn.returnUserMsg}");
			content.Error($"ä»»å¡å¤±è´¥{fOURBOTReturn.data}");
			}
			}
			#endregion
			#region æµ·åº·
			if (isHK)
			{
			CancelHIKROBOTTask cancelHIKROBOTTask = new CancelHIKROBOTTask
			cancelHIKROBOTTask = new CancelHIKROBOTTask
			{
			robotTaskCode = dt_Task.WMSTaskNum,
			cancelType = "CANCEL"//åè½¯åæ¶ï¼DROPäººå·¥ä»å¥ï¼åç¡¬åæ¶ï¼
			@@ -227,11 +231,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}");
			}

			}
			@@ -241,6 +245,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;
			}
			@@ -254,6 +285,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);
			@@ -273,7 +307,7 @@
			#region å¯ä¹å£«
			if (isGALAXISTask)
			{
			var updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade
			updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade
			{
			taskId = dt_Task.WMSTaskNum,
			reportTime = DateTime.Now.ToString(),
			@@ -288,11 +322,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
			@@ -300,7 +334,7 @@
			#region ååè½¦
			if (isAGV)
			{
			var request = new UpdateAgvSXCTake
			request = new UpdateAgvSXCTake
			{
			taskID = dt_Task.RGVTaskId,
			priority = updateTaskPriority.taskPriority
			@@ -312,11 +346,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}");
			}
			}

			@@ -324,23 +358,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
			@@ -349,6 +383,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;
			}