RuiShengZhiNeng/GaoPuLiTiKu.git

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

			using AutoMapper;
			using Dm;
			using SqlSugar;
			using System.Diagnostics.CodeAnalysis;
			using System.Threading.Tasks;
			@@ -25,6 +26,7 @@
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.BaseRepository;
			using WIDESEAWCS_Core.BaseServices;
			using WIDESEAWCS_Core.Enums;
			using WIDESEAWCS_Core.Helper;
			using WIDESEAWCS_DTO;
			using WIDESEAWCS_DTO.TaskInfo;
			@@ -144,21 +146,22 @@
			{
			Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
			if (dt_Task == null) throw new Exception("æªæ¥è¯¢å°ä»»å¡å·ç¸å³ä»»å¡");
			dt_Task.TaskType = TaskOutStatusEnum.OutCancel.ObjToInt();

			// å¤æå½åä»»å¡æ¯å¦ä¸ºå¯ä¹å£«ä»»å¡
			bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound \|\|
			dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;

			//ååè½¦
			bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound \|\| dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;

			//æµ·åº·
			bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry \|\| dt_Task.TaskType == (int)TaskTypeEnum.CJInbound \|\| dt_Task.TaskType == (int)TaskTypeEnum.CJInbound \|\| dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
			//è¿éå°ç¶ææ¹åäº198åæ¶ä»»å¡
			dt_Task.TaskType = TaskStatusEnum.WMSCancel.ObjToInt();
			if (isGALAXISTask)
			{
			var KLS = new CancelGALAXISTask {
			taskId= dt_Task.WMSTaskNum,
			reportTime=DateTime.Now.ToString()
			var KLS = new CancelGALAXISTask
			{
			taskId = dt_Task.WMSTaskNum,
			reportTime = DateTime.Now.ToString()
			};
			Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelGALAXISTask));
			if (apiInfo == null) throw new Exception("æªæ¾å°å¯ä¹å£«AGVä»»å¡ä¸åæ¥å£éç½®ä¿¡æ¯ï¼è¯·æ£æ¥æ¥å£éç½®");
			@@ -166,16 +169,16 @@
			GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
			if (agvContent.success == true && agvContent.code == 0)
			{
			BaseDal.UpdateData(dt_Task);
			//ç´æ¥ç§»å¥åå²
			BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å®æ);
			return content.OK("åæ¶ä»»å¡æå", dt_Task);
			}
			else
			{
			content.Error("åæ¶ä»»å¡å¤±è´¥");
			return content.Error($"ä»»å¡å¤±è´¥{agvContent.data.returnInfo}");

			}
			}

			//BaseDal.UpdateData(dt_Task);
			content.OK("åæ¶ä»»å¡æå",dt_Task);
			}
			catch (Exception ex)
			{
			@@ -197,7 +200,7 @@
			{
			Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == updateTaskPriority.taskCode);
			if (dt_Task == null) throw new Exception("æªæ¥è¯¢å°ä»»å¡å·ç¸å³ä»»å¡");
			dt_Task.Grade = updateTaskPriority.taskPriority;

			// å¤æå½åä»»å¡æ¯å¦ä¸ºå¯ä¹å£«ä»»å¡
			bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound \|\|
			dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
			@@ -206,7 +209,9 @@
			bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound \|\| dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;

			//æµ·åº·
			bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry \|\| dt_Task.TaskType == (int)TaskTypeEnum.CJInbound\|\| dt_Task.TaskType == (int)TaskTypeEnum.CJInbound \|\| dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
			bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry \|\| dt_Task.TaskType == (int)TaskTypeEnum.CJInbound \|\| dt_Task.TaskType == (int)TaskTypeEnum.CJInbound \|\| dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
			//ä¿®æ¹åæ¬ä»»å¡ä¼åçº§
			dt_Task.Grade = updateTaskPriority.taskPriority;
			#region å¯ä¹å£«
			if (isGALAXISTask)
			{
			@@ -223,17 +228,15 @@
			GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
			if (agvContent.success == true && agvContent.code == 0)
			{
			BaseDal.UpdateData(dt_Task);

			return content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);
			}
			else
			{
			content.Error("ä¿®æ¹ä»»å¡ä¼åçº§å¤±è´¥");
			else {
			return content.Error($"ä»»å¡å¤±è´¥{agvContent.data.returnInfo}");
			}
			}
			#endregion


			content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);

			}
			catch (Exception ex)
			{
			@@ -259,7 +262,7 @@
			var rgvList = _rGVLocationInfoService.Repository.QueryData(x =>wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
			foreach (var item in rgvList)
			{
			item.LocationCode = wMSUpdateLocationArea.UpdateAreaCode;
			item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
			}
			rgv.AddRange(rgvList);
			}
			@@ -269,7 +272,7 @@
			var KLSLocationInfoList = _kLSLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
			foreach (var item in KLSLocationInfoList)
			{
			item.LocationCode = wMSUpdateLocationArea.UpdateAreaCode;
			item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
			}
			kls.AddRange(KLSLocationInfoList);
			}
			@@ -278,7 +281,7 @@
			var hkList = _hKLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
			foreach (var item in hkList)
			{
			item.LocationCode = wMSUpdateLocationArea.UpdateAreaCode;
			item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
			}
			hk.AddRange(hkList);
			}

	代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/UpdateGALAXISTaskGrade.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs	49 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -109,7 +109,14 @@
			/// ä»»å¡åºæ¢
			/// </summary>
			[Description("ä»»å¡åºæ¢")]
			Cancel
			Cancel,

			/// <summary>
			/// wmsåæ¶ä»»å¡
			/// </summary>
			[Description("WMSåæ¶ä»»å¡")]
			WMSCancel,

			#endregion

			#region æµ·åº·AGVå¶ä»ä»»å¡ç¶æ

			@@ -22,7 +22,7 @@
			/// <summary>
			/// ä»»å¡åºåº
			/// </summary>
			public string district { get; set; }
			public string district { get; set; } = "cy";
			/// <summary>
			/// æ°çä¼åçº§
			/// </summary>