LanTianZhiNeng/YanTaiLiKu.git

			@@ -33,11 +33,13 @@
			using System.Linq.Expressions;
			using System.Reflection;
			using System.Reflection.Metadata;
			using System.Security.Cryptography.Xml;
			using System.Security.Policy;
			using System.Text;
			using System.Threading.Tasks;
			using WIDESEA_Comm.Http;
			using WIDESEA_Common.Log;
			using WIDESEA_Core.Enums;
			using WIDESEAWCS_Common.TaskEnum;
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.BaseRepository;
			@@ -46,10 +48,13 @@
			using WIDESEAWCS_Core.Utilities;
			using WIDESEAWCS_DTO.Enum;
			using WIDESEAWCS_DTO.TaskInfo;
			using WIDESEAWCS_ISystemRepository;
			using WIDESEAWCS_ISystemServices;
			using WIDESEAWCS_ITaskInfoRepository;
			using WIDESEAWCS_ITaskInfoService;
			using WIDESEAWCS_Model.Models;
			using WIDESEAWCS_Model.Models.System;
			using WIDESEAWCS_QuartzJob;
			using WIDESEAWCS_QuartzJob.Models;
			using WIDESEAWCS_QuartzJob.Service;
			using WIDESEAWCS_TaskInfoRepository;
			@@ -67,6 +72,7 @@
			private readonly IMapper _mapper;
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			private readonly IDt_roadwayinfoService _Dt_roadwayinfoService;
			private readonly IDt_PlatformStationRepository _dt_PlatformStation;

			private Dictionary<string, OrderByType> _taskOrderBy = new()
			{
			@@ -80,7 +86,7 @@
			public string urlWMSdeverror = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlWMSdeverror"];
			public string urlWMSliftinposition = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlWMSliftinposition"];

			public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, ITask_HtyRepository task_HtyRepository, IUnitOfWorkManage unitOfWork, IDt_roadwayinfoService dt_RoadwayinfoService) : base(BaseDal)
			public TaskService(ITaskRepository BaseDal, IDt_PlatformStationRepository dt_PlatformStation, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, ITask_HtyRepository task_HtyRepository, IUnitOfWorkManage unitOfWork, IDt_roadwayinfoService dt_RoadwayinfoService) : base(BaseDal)
			{
			_routerService = routerService;
			_taskExecuteDetailService = taskExecuteDetailService;
			@@ -90,6 +96,7 @@
			_mapper = mapper;
			_unitOfWorkManage = unitOfWork;
			_Dt_roadwayinfoService = dt_RoadwayinfoService;
			_dt_PlatformStation = dt_PlatformStation;
			}

			//æ ¹æ®ä»»å¡å·ï¼æ¥è¯¢ä»»å¡
			@@ -118,8 +125,8 @@

			string Result = WMSTaskStatusEnum.outsuccess.GetDescription();
			//åæ¥ç»ä¸æ¸¸åé¦ä»»å¡å®æ
			//CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
			//if (command.status != "success") return content.Error($"è°åä¸æ¸¸è¿åå¤±è´¥ï¼å®æå åæºä»»å¡å¤±è´¥ï¼æ¡ç ï¼{task.PalletCode},ä»»å¡å·ï¼{task.TaskNum}");
			CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
			if (command.status != "success") return content.Error($"è°åä¸æ¸¸è¿åå¤±è´¥ï¼å®æå åæºä»»å¡å¤±è´¥ï¼æ¡ç ï¼{task.PalletCode},ä»»å¡å·ï¼{task.TaskNum}");

			task.ModifyDate = DateTime.Now;
			BaseDal.DeleteData(task);
			@@ -132,9 +139,9 @@
			task.TaskState = (int)TaskInStatusEnum.InFinish;
			BaseDal.UpdateData(task);
			string Result = WMSTaskStatusEnum.insuccess.GetDescription();
			//CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
			CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");

			//if (command.status != "success") return content.Error($"è°åä¸æ¸¸è¿åå¤±è´¥ï¼å®æå åæºä»»å¡å¤±è´¥ï¼æ¡ç ï¼{task.PalletCode},ä»»å¡å·ï¼{task.TaskNum}");
			if (command.status != "success") return content.Error($"è°åä¸æ¸¸è¿åå¤±è´¥ï¼å®æå åæºä»»å¡å¤±è´¥ï¼æ¡ç ï¼{task.PalletCode},ä»»å¡å·ï¼{task.TaskNum}");

			task.ModifyDate = DateTime.Now;
			task.Modifier = "System";
			@@ -147,9 +154,9 @@
			task.TaskState = (int)TaskinventoryStatusEnum.inventoryFinish;
			BaseDal.UpdateData(task);
			string Result = WMSTaskStatusEnum.insuccess.GetDescription();
			//CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
			CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");

			//if (command.status != "success") return content.Error($"è°åä¸æ¸¸è¿åå¤±è´¥ï¼å®æå åæºä»»å¡å¤±è´¥ï¼æ¡ç ï¼{task.PalletCode},ä»»å¡å·ï¼{task.TaskNum}");
			if (command.status != "success") return content.Error($"è°åä¸æ¸¸è¿åå¤±è´¥ï¼å®æå åæºä»»å¡å¤±è´¥ï¼æ¡ç ï¼{task.PalletCode},ä»»å¡å·ï¼{task.TaskNum}");

			task.ModifyDate = DateTime.Now;
			task.Modifier = "System";
			@@ -426,13 +433,13 @@
			{
			_task_HtyService.AddTaskHty(tasks);
			BaseDal.DeleteData(tasks);
			WriteLog.Write_Log("WMSæå¨å é¤ä»»å¡", "å é¤æå", $"ç³è¯·å é¤çæ¡ç ï¼{tasks.TaskNum},æçæ¡ç ï¼{tasks.PalletCode}", new { ä¿¡æ¯ = "å é¤æå" });
			WriteLog.Write_Log("WMSæå¨å é¤ä»»å¡", "å é¤æå", $"ç³è¯·å é¤çä»»å¡å·ï¼{tasks.TaskNum},æçæ¡ç ï¼{tasks.PalletCode}", new { ä¿¡æ¯ = "å é¤æå" });
			return WebResponseContent.Instance.OK();

			}
			catch (Exception ex)
			{
			WriteLog.Write_Log("WMSæå¨å é¤ä»»å¡", "å é¤å¤±è´¥", $"ç³è¯·å é¤çæ¡ç ï¼{tasks.TaskNum},æçæ¡ç ï¼{tasks.PalletCode}", new { ä¿¡æ¯ = ex.Message });
			WriteLog.Write_Log("WMSæå¨å é¤ä»»å¡", "å é¤å¤±è´¥", $"ç³è¯·å é¤çä»»å¡å·ï¼{tasks.TaskNum},æçæ¡ç ï¼{tasks.PalletCode}", new { ä¿¡æ¯ = ex.Message });
			return WebResponseContent.Instance.Error();
			}
			}
			@@ -513,8 +520,8 @@
			{
			string Result = WMSTaskStatusEnum.outsuccess.GetDescription();
			//åæ¥ç»ä¸æ¸¸åé¦ä»»å¡å®æ
			//CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
			//if (command.status != "success") return content.Error($"è°åä¸æ¸¸è¿åå¤±è´¥ï¼å®æå åæºä»»å¡å¤±è´¥ï¼æ¡ç ï¼{task.PalletCode},ä»»å¡å·ï¼{task.TaskNum}");
			CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
			if (command.status != "success") return content.Error($"è°åä¸æ¸¸è¿åå¤±è´¥ï¼å®æå åæºä»»å¡å¤±è´¥ï¼æ¡ç ï¼{task.PalletCode},ä»»å¡å·ï¼{task.TaskNum}");

			task.ModifyDate = DateTime.Now;
			task.Modifier = App.User?.UserName;
			@@ -526,9 +533,9 @@
			else if (task.TaskType == (int)TaskTypeEnum.Inbound)
			{
			string Result = WMSTaskStatusEnum.insuccess.GetDescription();
			//CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
			CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");

			//if (command.status != "success") return content.Error($"è°åä¸æ¸¸è¿åå¤±è´¥ï¼å®æå åæºä»»å¡å¤±è´¥ï¼æ¡ç ï¼{task.PalletCode},ä»»å¡å·ï¼{task.TaskNum}");
			if (command.status != "success") return content.Error($"è°åä¸æ¸¸è¿åå¤±è´¥ï¼å®æå åæºä»»å¡å¤±è´¥ï¼æ¡ç ï¼{task.PalletCode},ä»»å¡å·ï¼{task.TaskNum}");

			task.ModifyDate = DateTime.Now;
			task.Modifier = App.User?.UserName;
			@@ -540,9 +547,9 @@
			else if (task.TaskType == (int)TaskTypeEnum.Inventorybound)
			{;
			string Result = WMSTaskStatusEnum.insuccess.GetDescription();
			//CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
			CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");

			//if (command.status != "success") return content.Error($"è°åä¸æ¸¸è¿åå¤±è´¥ï¼å®æå åæºä»»å¡å¤±è´¥ï¼æ¡ç ï¼{task.PalletCode},ä»»å¡å·ï¼{task.TaskNum}");
			if (command.status != "success") return content.Error($"è°åä¸æ¸¸è¿åå¤±è´¥ï¼å®æå åæºä»»å¡å¤±è´¥ï¼æ¡ç ï¼{task.PalletCode},ä»»å¡å·ï¼{task.TaskNum}");

			task.ModifyDate = DateTime.Now;
			task.Modifier = App.User?.UserName;
			@@ -564,5 +571,103 @@
			return content;
			}

			/// <summary>
			/// æå¨åå»ºä»»å¡
			/// </summary>
			/// <param name="transfer"></param>
			/// <returns></returns>
			public WebResponseContent CreateManualTask(Dt_Task transfer)
			{


			WebResponseContent content = new WebResponseContent();
			try
			{
			IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceName.Contains("å åæº"));



			// å¤æè®¾å¤æ¯å¦åå¨
			if (device == null)
			{
			content.Error("æå¨åå»ºä»»å¡å¤±è´¥ï¼åå ï¼æªæ¾å°å åæºè®¾å¤");
			WriteLog.Write_Log("æå¨ä»»å¡åå»ºå¤±è´¥", "åå»ºå¤±è´¥", $"åå ï¼æªæ¾å°å åæºè®¾å¤,æçç¼å·ï¼{transfer.PalletCode}ï¼ä»»å¡ç±»åï¼{transfer.TaskType},èµ·å§å°åï¼{transfer.SourceAddress}ï¼ç®æ å°åï¼{transfer.TargetAddress}");
			return content;
			}

			// å¤æå°åæ¯å¦å±äºå½åè®¾å¤åº
			if (transfer.SourceAddress.Contains(device.DeviceCode) && transfer.TargetAddress.Contains(device.DeviceCode))
			{
			// å¥åº
			if (transfer.TaskType == 200)
			{
			Dt_PlatformStation _PlatformStation = _dt_PlatformStation.QueryFirst(x => x.Station_code == transfer.SourceAddress);
			if (_PlatformStation == null)
			{
			content.Error($"æå¨åå»ºä»»å¡å¤±è´¥,åå :{device.DeviceCode}åºä¸åå¨è¿ä¸ªåºå£ï¼{transfer.SourceAddress}");
			WriteLog.Write_Log("æå¨ä»»å¡åå»ºå¤±è´¥", "åå»ºå¤±è´¥", $"æçç¼å·ï¼{transfer.PalletCode}ï¼ä»»å¡ç±»åï¼{transfer.TaskType},èµ·å§å°åï¼{transfer.SourceAddress}ï¼ç®æ å°åï¼{transfer.TargetAddress}");
			}
			else {
			// æ£å¸¸åå»ºä»»å¡
			transfer.TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
			transfer.TaskState = 200;
			transfer.CurrentAddress = transfer.SourceAddress;
			transfer.NextAddress = transfer.TargetAddress;
			transfer.Roadway = device.DeviceCode;
			transfer.Creater = "WCS";
			transfer.Grade = 1;
			transfer.CreateDate = DateTime.Now;
			_unitOfWorkManage.BeginTran();
			BaseDal.AddData(transfer);
			_unitOfWorkManage.CommitTran();
			content.OK("æå¨ä»»å¡åå»ºæåï¼");
			WriteLog.Write_Log("æå¨ä»»å¡åå»ºæå", "åå»ºæå", $"æçç¼å·ï¼{transfer.PalletCode}ï¼ä»»å¡ç±»åï¼{transfer.TaskType},èµ·å§å°åï¼{transfer.SourceAddress}ï¼ç®æ å°åï¼{transfer.TargetAddress}");
			}
			return content;

			}
			// åºåº
			else if (transfer.TaskType == 100)
			{
			Dt_PlatformStation _PlatformStation = _dt_PlatformStation.QueryFirst(x => x.Station_code == transfer.TargetAddress);
			if (_PlatformStation == null)
			{
			content.Error($"æå¨åå»ºä»»å¡å¤±è´¥,åå :{device.DeviceCode}åºä¸åå¨è¿ä¸ªåºå£ï¼{transfer.TargetAddress}");
			}
			else
			{
			// æ£å¸¸åå»ºä»»å¡
			transfer.TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
			transfer.TaskState = 200;
			transfer.CurrentAddress = transfer.SourceAddress;
			transfer.NextAddress = transfer.TargetAddress;
			transfer.Roadway = device.DeviceCode;
			transfer.Creater = "WCS";
			transfer.Grade = 1;
			transfer.CreateDate = DateTime.Now;
			_unitOfWorkManage.BeginTran();
			BaseDal.AddData(transfer);
			_unitOfWorkManage.CommitTran();
			content.OK("æå¨ä»»å¡åå»ºæåï¼");
			WriteLog.Write_Log("æå¨ä»»å¡åå»ºæå", "åå»ºæå", $"æçç¼å·ï¼{transfer.PalletCode}ï¼ä»»å¡ç±»åï¼{transfer.TaskType},èµ·å§å°åï¼{transfer.SourceAddress}ï¼ç®æ å°åï¼{transfer.TargetAddress}");
			}
			return content;
			}


			}
			else
			{
			content.Error($"æå¨åå»ºä»»å¡å¤±è´¥,åå :{device.DeviceCode}åºå°åä¸å¹é,èµ·å§å°åï¼{transfer.SourceAddress}ï¼ç®æ å°åï¼{transfer.TargetAddress}");
			WriteLog.Write_Log("æå¨ä»»å¡åå»ºå¤±è´¥", "åå»ºå¤±è´¥", $"æçç¼å·ï¼{transfer.PalletCode}ï¼ä»»å¡ç±»åï¼{transfer.TaskType},èµ·å§å°åï¼{transfer.SourceAddress}ï¼ç®æ å°åï¼{transfer.TargetAddress}");
			}
			}
			catch (Exception ex)
			{
			content.Error($"æå¨åå»ºä»»å¡å¤±è´¥ï¼ç³»ç»å¼å¸¸ï¼{ex.Message}");
			WriteLog.Write_Log("æå¨ä»»å¡å¼å¸¸", "å¼å¸¸", ex.ToString());
			}
			return content;
			}
			}
			}