RuiShengZhiNeng/GaoPuLiTiKu.git

			@@ -1,6 +1,7 @@
			ï»¿using Autofac.Core;
			using Magicodes.IE.Core;
			using NetTaste;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
			using System;
			using System.Collections.Generic;
			using System.Linq;
			@@ -8,6 +9,7 @@
			using System.Reflection.Metadata;
			using System.Text;
			using System.Text.Json;
			using System.Text.RegularExpressions;
			using System.Threading.Tasks;
			using WIDESEAWCS_Common;
			using WIDESEAWCS_Common.LocationEnum;
			@@ -83,13 +85,7 @@
			task.TaskState = (int)TaskStatusEnum.HktransportIng;
			BaseDal.UpdateData(task);
			}
			else if (task.TaskType == (int)TaskTypeEnum.Q3CK\|\| task.TaskType == (int)TaskTypeEnum.Q3RK)
			{
			//UpdateStandStatus(task, task.SourceAddress, LocationStatusEnum.Lock);
			task.TaskState = (int)TaskStatusEnum.Takeing;
			TaskFeedback(task, 1);
			}
			else
			else if (task.TaskState == (int)TaskStatusEnum.Execut)
			{
			task.TaskState = (int)TaskStatusEnum.Takeing;
			TaskFeedback(task, 1);
			@@ -97,24 +93,11 @@
			break;
			case "outbin"://ç¦»å¼èµ·ç¹
			{
			if (task.TaskType == (int)TaskTypeEnum.Q3RK\|\| task.TaskType == (int)TaskTypeEnum.Q3CK)
			{
			UpdateStandStatus(task, task.SourceAddress, LocationStatusEnum.Free);
			task.TaskState = TaskStatusEnum.TakeFinish.ObjToInt();
			BaseDal.UpdateData(task);
			TaskFeedback(task, 1);
			}
			else
			{

			TaskFromCompleted(task, deviceTypeEnum); //ä»»å¡ç¶ä½æ¹ä¸º3åè´§å®æï¼æ´æ°èµ·ç¹è´§ä½ç¶æï¼å¹¶åé¦WMSèµ·ç¹å®æ
			}
			///å¤æä»»å¡æ¯å¦è·è®¾å¤æå³
			TaskFromCompleted(task, deviceTypeEnum); //ä»»å¡ç¶ä½æ¹ä¸º3åè´§å®æï¼æ´æ°èµ·ç¹è´§ä½ç¶æï¼å¹¶åé¦WMSèµ·ç¹å®æ
			}
			break;
			case "finish"://ç¦»å¼æåæº
			{

			//å¥æåæº
			if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
			{
			@@ -122,11 +105,22 @@
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			DeviceProDTO? deviceProDTO = device.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == HoistEnum.Inboundboxon.ToString());//æ¾å°ä½äº
			bool Work = false;
			if (device.IsConnected)
			device.SetValue(HoistEnum.Inboundboxon, 1);
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			{
			int i = 0;
			while (!Work && i <= 3)
			{
			i++;
			Work = device.SetValue(HoistEnum.Inboundboxon, 1, task.TargetAddress);
			Thread.Sleep(500);
			}
			}
			if (!Work)
			{
			task.ExceptionMessage = $"ã{task.TargetAddress}ãåå¥3æ¥¼å¥åºç®±æ¾å°ä½å¤±è´¥";
			task.Remark = $"{device.DeviceCode}_Inboundboxon_{1}_{task.TargetAddress}";
			}
			}
			BaseDal.UpdateData(task);
			}
			@@ -138,58 +132,101 @@
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			bool Work = false;
			if (device.IsConnected)
			device.SetValue(HoistEnum.Outboundboxon, 1);//åºåºå®æ
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			{
			int i = 0;
			while (!Work && i <= 3)
			{
			i++;
			Work = device.SetValue(HoistEnum.Outboundboxon, 1, task.SourceAddress);//åºåºå®æ
			Thread.Sleep(500);
			}
			}
			if (!Work)
			{
			task.ExceptionMessage = $"ã{task.SourceAddress}ãåå¥3æ¥¼åºåºç®±æ¾å°ä½å¤±è´¥";
			task.Remark = $"{device.DeviceCode}_Outboundboxon_{1}_{task.SourceAddress}";
			}
			}
			BaseDal.UpdateData(task);
			}
			//åæ¥¼ åºåº
			else if ((task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt() \|\| task.TaskType == TaskTypeEnum.F04.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
			else if ((task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt() \|\| task.TaskType == TaskTypeEnum.F04.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
			{
			var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			bool Work = false;
			if (device.IsConnected)
			device.SetValue(HoistEnum.Emptyboxplacedinposition, 1);
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			{
			int i = 0;
			while (!Work && i <= 3)
			{
			i++;
			Work = device.SetValue(HoistEnum.Emptyboxplacedinposition, 1, task.TargetAddress);
			Thread.Sleep(500);
			}
			}
			if (!Work)
			{
			task.ExceptionMessage = $"ã{task.TargetAddress}ãåå¥4æ¥¼ç©ºç®±æ¾å°ä½å¤±è´¥";
			task.Remark = $"{device.DeviceCode}_Emptyboxplacedinposition_{1}_{task.TargetAddress}";
			}
			}
			BaseDal.UpdateData(task);
			}
			// //åæ¥¼åºæåæº å¥åº ä¹åæ¯AGV_ToExecute //è¦åæåè´§å®æç¶æTakeFinish
			if ((task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() \|\| task.TaskType == TaskTypeEnum.F03.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
			else if ((task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() \|\| task.TaskType == TaskTypeEnum.F03.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.TakeFinish)
			{
			var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			bool Work = false;
			if (device.IsConnected)
			//åä»¥ä¸ä¸ªåºåºå®æä¿¡å·
			device.SetValue(HoistEnum.Outboundboxretrievalcompleted, 1, task.SourceAddress);
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			{
			int i = 0;
			while (!Work && i <= 3)
			{
			i++;
			Work = device.SetValue(HoistEnum.Outboundboxretrievalcompleted, 1, task.SourceAddress);
			Thread.Sleep(500);
			}
			}
			if (!Work)
			{
			task.ExceptionMessage = $"ã{task.SourceAddress}ãåå¥4æ¥¼åºåºåç®±å®æå¤±è´¥";
			task.Remark = $"{device.DeviceCode}_Outboundboxretrievalcompleted_{1}_{task.SourceAddress}";
			}
			}
			BaseDal.UpdateData(task);
			}
			//è·¨æ¥¼å±
			else if (task.TaskType == TaskTypeEnum.Q3RK.ObjToInt() \|\| task.TaskType == TaskTypeEnum.Q3CK.ObjToInt() && task.TaskState == (int)TaskStatusEnum.TakeFinish)
			else if (task.TaskType == TaskTypeEnum.Q3RK.ObjToInt() \|\| task.TaskType == TaskTypeEnum.Q3CK.ObjToInt()/* && task.TaskState == (int)TaskStatusEnum.TakeFinish*/)
			{
			if (task.TaskType == TaskTypeEnum.Q3RK.ObjToInt()\|\| task.TaskType == TaskTypeEnum.Q3RK.ObjToInt())
			var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
			if (device == null) task.ExceptionMessage = "æªæ¾å°è´¨æ£é¨ä¿¡æ¯";
			else
			{
			var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
			if (device == null) task.ExceptionMessage = "æªæ¾å°è´¨æ£é¨ä¿¡æ¯";
			else
			bool Wok = false;
			var Address = task.TaskType == TaskTypeEnum.Q3RK.ObjToInt() ? task.TargetAddress : task.SourceAddress;
			if (device.IsConnected)
			{
			if (device.IsConnected)
			//åä»¥ä¸ä¸ªåºåºå®æä¿¡å·
			device.SetValue(QualityInspectionCommandEnum.RequestToEnter, false, task.TargetAddress);
			else
			task.ExceptionMessage = "è´¨æ£é¨ä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			int i = 0;
			while (!Wok && i <= 3)
			{
			i++;
			Wok = device.SetValue(QualityInspectionCommandEnum.RequestToEnter, false, Address);
			Thread.Sleep(500);
			}
			}

			if (!Wok)
			{
			task.ExceptionMessage = $"ã{Address}ãå³éè¯·æ±è¿å¥å¤±è´¥ï¼";
			task.Remark = $"{device.DeviceCode}_RequestToEnter_{false}_{Address}";
			}
			}
			BaseDal.UpdateData(task);
			}
			@@ -208,11 +245,22 @@
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			bool Wok = false;
			if (device.IsConnected)
			//æå¼æ«ç å¨
			device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1);
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			{
			int i = 0;
			while (!Wok && i <= 3)
			{
			i++;
			Wok = device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1, "TSJR3F");
			Thread.Sleep(500);
			}
			}
			if (!Wok)
			{
			task.ExceptionMessage = $"ãTSJR3Fã3æ¥¼è¯»ç è§¦åå¤±è´¥ï¼";
			task.Remark = $"{device.DeviceCode}_Codereadingtriggered_{1}_TSJR3F";
			}
			}
			task.TaskState = (int)TaskStatusEnum.CheckPalletCodeing;
			BaseDal.UpdateData(task);
			@@ -220,16 +268,16 @@
			break;
			case "end"://ä»»å¡å®æéç¥
			{
			if (task.TaskType == (int)TaskTypeEnum.Q3RK \|\| task.TaskType == (int)TaskTypeEnum.Q3CK\|\| task.TaskType == (int)TaskTypeEnum.MOVE)
			if (task.TaskType == (int)TaskTypeEnum.MOVE)
			{
			task.TaskState = TaskStatusEnum.Finish.ObjToInt();
			BaseDal.UpdateData(task);
			TaskFeedback(task, 2);
			BaseDal.DeleteAndMoveIntoHty(task, OperateTypeEnum.èªå¨å®æ);
			var Task = BaseDal.QueryFirst(x => task.WMSTaskNum.Contains(x.WMSTaskNum));
			Task.TaskState = TaskStatusEnum.HkTransportCompleted.ObjToInt();
			BaseDal.UpdateData(Task);
			}
			else
			{
			///å¤æä»»å¡æ¯å¦è·è®¾å¤æå³
			TaskCompleted(task, deviceTypeEnum);
			}
			}
			@@ -237,16 +285,16 @@
			case "intolift": //è¿å¥çµæ¢¯
			{
			//åæ¥¼å°ä¸æ¥¼çå¥åºä»»å¡
			if (task.TaskType==(int)TaskTypeEnum.Q3RK\|\|task.TaskType==(int)TaskTypeEnum.MOVE\|\|task.TaskType==(int)TaskTypeEnum.F01)
			if (task.TaskType == (int)TaskTypeEnum.Q3RK \|\| task.TaskType == (int)TaskTypeEnum.MOVE \|\| task.TaskType == (int)TaskTypeEnum.F01 \|\| task.TaskType == (int)TaskTypeEnum.Q3CK)
			{
			task.TaskState = TaskStatusEnum.Hkintolift.ObjToInt();
			BaseDal.UpdateData(task);
			}
			}
			break;
			case "leavelift": //ç¦»å¼çµæ¢¯
			case "leavelift": //ç¦»å¼çµæ¢¯
			{
			if (task.TaskType == (int)TaskTypeEnum.Q3RK \|\| task.TaskType == (int)TaskTypeEnum.MOVE \|\| task.TaskType == (int)TaskTypeEnum.F01)
			if (task.TaskType == (int)TaskTypeEnum.Q3RK \|\| task.TaskType == (int)TaskTypeEnum.MOVE \|\| task.TaskType == (int)TaskTypeEnum.F01 \|\| task.TaskType == (int)TaskTypeEnum.Q3CK)
			{
			task.TaskState = TaskStatusEnum.HKleavelift.ObjToInt();
			BaseDal.UpdateData(task);
			@@ -269,31 +317,40 @@
			var task = BaseDal.QueryFirst(x => x.PalletCode == Rgv.content.podID);
			if (task == null) throw new Exception($"æªæ¾å°ä»»å¡,ä»»å¡ç¼å·ã{Rgv.content.taskID}ã");
			//ç§»åº
			if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt() && Rgv.messageType == 10 && Rgv.content.status == 4)
			if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt())
			{
			deviceName += "ç§»åº";
			WMSMoveLocationFeedback wMSMoveLocationFeedback = new WMSMoveLocationFeedback()
			if (Rgv.messageType == 72)
			{
			containerCode = task.PalletCode,
			fromStationCode = task.SourceAddress,
			toLocationCode = task.TargetAddress
			};
			Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(WMSMoveLocationFeedback));
			WMSReturn agvContent = null;
			if (apiInfo == null) task.ExceptionMessage = "æªæ¾å°ç§»åºå®æåé¦WMSæ¥å£éç½®ä¿¡æ¯ï¼è¯·æ£æ¥æ¥å£éç½®";
			else
			task.TaskState = TaskStatusEnum.TakeFinish.ObjToInt();
			BaseDal.UpdateData(task);
			UpdateLocationStatus(task.SourceAddress, task.PalletCode, deviceTypeEnum, LocationStatusEnum.Free);
			}
			if (Rgv.messageType == 10 && Rgv.content.status == 4)
			{
			task.TaskState = TaskStatusEnum.Finish.ObjToInt();
			string response = HttpHelper.Post(apiInfo.ApiAddress, wMSMoveLocationFeedback.Serialize());
			agvContent = response.DeserializeObject<WMSReturn>();
			content.OK(data: agvContent);
			if (agvContent.code != 200)
			deviceName += "ç§»åº";
			WMSMoveLocationFeedback wMSMoveLocationFeedback = new WMSMoveLocationFeedback()
			{
			task.ExceptionMessage = agvContent.message;
			content.Error(agvContent.message);
			containerCode = task.PalletCode,
			fromStationCode = task.SourceAddress,
			toLocationCode = task.TargetAddress
			};
			Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(WMSMoveLocationFeedback));
			WMSReturn agvContent = null;
			if (apiInfo == null) task.ExceptionMessage = "æªæ¾å°ç§»åºå®æåé¦WMSæ¥å£éç½®ä¿¡æ¯ï¼è¯·æ£æ¥æ¥å£éç½®";
			else
			{
			task.TaskState = TaskStatusEnum.Finish.ObjToInt();
			string response = HttpHelper.Post(apiInfo.ApiAddress, wMSMoveLocationFeedback.Serialize());
			agvContent = response.DeserializeObject<WMSReturn>();
			content.OK(data: agvContent);
			if (agvContent.code != 200)
			{
			task.ExceptionMessage = agvContent.message;
			content.Error(agvContent.message);
			}
			UpdateLocationStatus(task.TargetAddress, task.PalletCode, deviceTypeEnum, LocationStatusEnum.InStock);
			BaseDal.DeleteAndMoveIntoHty(task, OperateTypeEnum.èªå¨å®æ);
			}
			UpdateLocationStatus(task.TargetAddress, task.PalletCode, deviceTypeEnum, LocationStatusEnum.InStock);
			BaseDal.DeleteAndMoveIntoHty(task, OperateTypeEnum.èªå¨å®æ);
			}
			}
			else
			@@ -345,6 +402,29 @@
			TaskCompleted(task, deviceTypeEnum);
			}
			}
			if (Rgv.content.status == 5)
			{
			task.ExceptionMessage = Rgv.content.errorReason;
			var Error = _taskErrorMessageService.Repository.QueryFirst(x => x.ErrorCode == Rgv.content.errorCode && x.DeviceType == (int)deviceTypeEnum);
			if (task.TaskType == (int)TaskTypeEnum.CPOutbound && task.TaskState == (int)TaskStatusEnum.Execut && Rgv.content.errorCode == 1330003)//æååºåºä»»å¡ä¸åååé¦æé»ç¢æï¼ä¿®æ¹ä»»å¡ç¶æä¸ºæ°å»ºéæ°æ¥è¯¢é»ç¢æå³ç³»
			{
			task.TaskState = (int)TaskStatusEnum.New;
			BaseDal.UpdateData(task);
			}
			else
			{
			if (Error != null)
			{
			task.ExceptionMessage = Error.ExceptionMessage;
			MatchCollection matches = Regex.Matches(Rgv.content.errorReason, @"$([^)]+)$");
			if (matches.Count > 0)
			task.ExceptionMessage = ReplacePlaceholders(Rgv.content.errorReason, Error.ExceptionMessage);
			ErrorTaskFeedback(task, true, Error.ErrorCode.ToString());
			}
			else
			ErrorTaskFeedback(task, true);
			}
			}
			}
			}
			}
			@@ -359,6 +439,30 @@
			_trackloginfoService.AddTrackLog(TaskDTO, content, $"{deviceName}ä»»å¡ç¶æåé¦", "", "");
			}
			return content;
			}
			#endregion

			#region å¼å¸¸ä¿¡æ¯è½¬æ¢
			/// <summary>
			/// å¼å¸¸ä¿¡æ¯()åå®¹è½¬æ¢
			/// </summary>
			/// <param name="source"></param>
			/// <param name="targetTemplate"></param>
			/// <returns></returns>
			public string ReplacePlaceholders(string source, string targetTemplate)
			{
			// æåæºåç¬¦ä¸²ä¸çæææ¬å·å¼
			var values = Regex.Matches(source, @"$([^)]+)$")
			.Cast<Match>()
			.Select(m => m.Groups[1].Value)
			.ToList();

			// æ¿æ¢ç®æ æ¨¡æ¿ä¸çææ (%v)
			int idx = 0;
			string result = Regex.Replace(targetTemplate, @"$\%v$", _ =>
			idx < values.Count ? values[idx++] : "");

			return result;
			}
			#endregion

			@@ -443,7 +547,7 @@
			try
			{
			dt_Task.TaskState = TaskStatusEnum.Finish.ObjToInt();
			TaskFeedback(dt_Task, 2);
			TaskFeedback(dt_Task, 2, string.IsNullOrEmpty(dt_Task.Remark));
			//Db.Ado.BeginTran();
			UpdateLocationStatus(dt_Task.TargetAddress, dt_Task.PalletCode, deviceTypeEnum, LocationStatusEnum.InStock);

			@@ -517,6 +621,21 @@
			stationInfo.StationStatus = locationStatusEnum.ObjToInt();
			_stationInfo.UpdateData(stationInfo);
			}
			Dt_StationManger stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == locationCode);
			if (stationManger != null)
			{
			if (locationStatusEnum == LocationStatusEnum.Free) //å¦æèµ·ç¹å®æå°±ç»è´§ä½èµå¼æçå·
			{
			stationManger.Remark = "";
			stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
			}
			else
			{
			stationManger.Remark = palletCode;
			stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
			}
			_stationMangerService.UpdateData(stationManger);
			}
			}
			else if (deviceTypeEnum == DeviceTypeEnum.YuanLiJuHe)
			{
			@@ -536,38 +655,22 @@
			dt_RGVLocationInfo.LocationStatus = locationStatusEnum.ObjToInt();
			_rGVLocationInfoService.Repository.UpdateData(dt_RGVLocationInfo);
			}
			}
			else//å¹³åºåºä½
			{

			}
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			throw new Exception(ex.Message);
			}
			}
			#endregion

			#region æ´æ°ä¸æ¥¼ç«å°ç¶æ
			public WebResponseContent UpdateStandStatus(Dt_Task task,string stationCode,LocationStatusEnum locationStatusEnum)
			{
			try
			{
			Dt_StationManger? stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == task.TargetAddress);
			//stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
			if (stationManger != null)
			{
			if (locationStatusEnum == LocationStatusEnum.Free) //å¦æèµ·ç¹å®æå°±ç»è´§ä½èµå¼æçå·
			Dt_StationManger stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == locationCode);
			if (stationManger != null)
			{
			stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
			if (locationStatusEnum == LocationStatusEnum.Free) //å¦æèµ·ç¹å®æå°±ç»è´§ä½èµå¼æçå·
			{
			stationManger.Remark = "";
			stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
			}
			else
			{
			stationManger.Remark = palletCode;
			stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
			}
			_stationMangerService.UpdateData(stationManger);
			}
			else
			{
			stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
			}
			_stationMangerService.UpdateData(stationManger);
			}
			return WebResponseContent.Instance.OK();
			}
			@@ -579,7 +682,7 @@
			#endregion

			#region ä¸æ¥WMS
			public WebResponseContent TaskFeedback(Dt_Task dt_Task, int Status)
			public WebResponseContent TaskFeedback(Dt_Task dt_Task, int Status, bool Del = false)
			{
			WebResponseContent content = new WebResponseContent();
			WMSInOutBoundCompleteFeedback boundCompleteFeedback = new WMSInOutBoundCompleteFeedback();
			@@ -596,7 +699,7 @@
			boundCompleteFeedback.toLocationCode = dt_Task.TargetAddress;
			boundCompleteFeedback.status = Status;
			boundCompleteFeedback.custStatus = "";
			string response = HttpHelper.Post(apiInfo.ApiAddress,boundCompleteFeedback.Serialize());
			string response = HttpHelper.Post(apiInfo.ApiAddress, boundCompleteFeedback.Serialize());
			agvContent = response.DeserializeObject<WMSReturn>();
			content.OK(data: agvContent);
			if (agvContent.code != 200)
			@@ -613,7 +716,7 @@
			finally
			{
			_trackloginfoService.AddTrackLog(boundCompleteFeedback, content, "åºå¥åºä»»å¡ç¶æåé¦WMS", "", "");
			if (agvContent != null && agvContent.code == 200 && Status == 2)
			if (agvContent != null && agvContent.code == 200 && Del)
			BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å®æ);
			else
			BaseDal.UpdateData(dt_Task);
			@@ -622,7 +725,7 @@
			}
			#endregion
			#region å¤±è´¥ä»»å¡ä¸æ¥WMSå¹¶å é¤ä»»å¡
			public WebResponseContent ErrorTaskFeedback(Dt_Task dt_Task, bool Del)
			public WebResponseContent ErrorTaskFeedback(Dt_Task dt_Task, bool Del = false, string ErrorCode = "")
			{
			WebResponseContent content = new WebResponseContent();
			WMSInOutBoundCompleteFeedback boundCompleteFeedback = new WMSInOutBoundCompleteFeedback();
			@@ -638,7 +741,7 @@
			boundCompleteFeedback.fromStationCode = dt_Task.SourceAddress;
			boundCompleteFeedback.toLocationCode = dt_Task.TargetAddress;
			boundCompleteFeedback.status = 3;
			boundCompleteFeedback.custStatus = "";
			boundCompleteFeedback.custStatus = ErrorCode;
			boundCompleteFeedback.memo = dt_Task.ExceptionMessage;
			string response = HttpHelper.Post(apiInfo.ApiAddress, boundCompleteFeedback.Serialize());
			agvContent = response.DeserializeObject<WMSReturn>();
			@@ -659,15 +762,12 @@
			finally
			{
			_trackloginfoService.AddTrackLog(boundCompleteFeedback, content, "åºå¥åºä»»å¡ç¶æåé¦WMS", "", "");
			if (agvContent != null && agvContent.code == 200 && Del) BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å é¤);
			if (agvContent != null && agvContent.code == 200 && Del)
			BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å é¤);
			else BaseDal.UpdateData(dt_Task);
			}
			return content;
			}
			#endregion




			}
			}