ZhiHuiQiCe/GuoDianLiKu.git

			@@ -468,7 +468,7 @@
			}
			catch (Exception ex)
			{
			ServiceLogger.WriteDebug("ReceiveTask", $"ä»»å¡æ¥æ¶éè¯¯,éè¯¯ä¿¡æ¯:{ex.Message}");
			ServiceLogger.WriteDebug("ReceiveTask", $"ä»»å¡æ¥æ¶éè¯¯,éè¯¯ä¿¡æ¯:{ex.StackTrace}");
			content = WebResponseContent.Instance.Error($"ä»»å¡æ¥æ¶éè¯¯,éè¯¯ä¿¡æ¯:{ex.Message}");
			}
			return content;
			@@ -884,6 +884,7 @@
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			//ä»»å¡æ§è¡å¤±è´¥ï¼è´§ä½ç¶æè¿å
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			content = WebResponseContent.Instance.Error($"å¤§å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			}
			@@ -982,7 +983,7 @@
			{
			try
			{
			Dt_LocationInfo srcLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
			//Dt_LocationInfo srcLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
			//srcLocation.LocationStatus = (int)LocationStatusEnum.Free;


			@@ -1002,44 +1003,45 @@
			MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
			if (res != null && res.code != 0)
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å°å åæºå®æåºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			content = WebResponseContent.Instance.Error($"å°å åæºå®æåºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			}
			else
			{
			//å¤ææ¯å¦å®æçæåä¸å±ï¼èªå¨çæç©ºè½¦åºåºä»»å¡
			string[] Levels = task.Remark.Split("-");
			if (Levels.Length == 2)
			{
			if (!string.IsNullOrEmpty(Levels[0])&& !string.IsNullOrEmpty(Levels[1]))
			{
			//å¦æå½åæåå±æ°çäºæ»å±æï¼åè¡¨ç¤ºæè½¦ææçå±æ°åå®
			if(Convert.ToInt16(Levels[0])== Convert.ToInt16(Levels[1]))
			{
			string[] SourceCodes = task.SourceAddress.Split("-");
			string startPlan = "";
			if (SourceCodes.Length == 4)
			{
			startPlan= "101"+ SourceCodes[2].Substring(1,2);
			}
			DeliveryPlan send = new DeliveryPlan { startPlan = startPlan, isQuit = false, CarId = task.PalletCode };
			string inparam2 = JsonConvert.SerializeObject(send);
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å°å åæºæ§è¡åºåºä»»å¡åä¼ MESå¥å{inparam2}");
			ApiInvoke.DeliveryPlanCMD(send);//åè°MESæ¥å£çæç©ºè½¦åºåºä»»å¡
			//ææçå±æ°é½åå®ï¼éè¦ææåä½ç¶ææ¹ä¸ºç©ºé²ç¶æ
			srcLocation.LocationStatus = (int)LocationStatusEnum.Free;
			_locationInfoRepository.UpdateData(srcLocation);
			}
			//else
			//{
			// //å¤ææ¯å¦å®æçæåä¸å±ï¼èªå¨çæç©ºè½¦åºåºä»»å¡
			// string[] Levels = task.Remark.Split("-");
			// if (Levels.Length == 2)
			// {
			// if (!string.IsNullOrEmpty(Levels[0])&& !string.IsNullOrEmpty(Levels[1]))
			// {
			// //å¦æå½åæåå±æ°çäºæ»å±æï¼åè¡¨ç¤ºæè½¦ææçå±æ°åå®
			// if(Convert.ToInt16(Levels[0])== Convert.ToInt16(Levels[1]))
			// {
			// string[] SourceCodes = task.SourceAddress.Split("-");
			// string startPlan = "";
			// if (SourceCodes.Length == 4)
			// {
			// startPlan = "101" + SourceCodes[2].Substring(1, 2);
			// }
			// DeliveryPlan send = new DeliveryPlan { startPlan = startPlan, isQuit = false, CarId = task.PalletCode };
			// string inparam2 = JsonConvert.SerializeObject(send);
			// ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å°å åæºæ§è¡åºåºä»»å¡åä¼ MESå¥å{inparam2}");
			// ApiInvoke.DeliveryPlanCMD(send);//åè°MESæ¥å£çæç©ºè½¦åºåºä»»å¡
			// ææçå±æ°é½åå®ï¼éè¦ææåä½ç¶ææ¹ä¸ºç©ºé²ç¶æ
			// srcLocation.LocationStatus = (int)LocationStatusEnum.Free;
			// _locationInfoRepository.UpdateData(srcLocation);
			// }

			}
			// }

			}
			}
			// }
			//}

			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å°å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å°å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.StackTrace}ã");
			content = WebResponseContent.Instance.Error($"å°å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			}

			@@ -1060,6 +1062,8 @@
			return content;
			}



			/// <summary>
			/// æ¢å¤æèµ·ä»»å¡
			/// </summary>