HuaYiZhongHeng/BaiBuLiKu.git

			@@ -148,6 +148,13 @@
			private Dt_Task? GetTask(CommonStackerStationCrane commonStackerCrane)
			{
			Dt_Task task;

			task = _taskService.QueryRelocationTask(commonStackerCrane.DeviceCode);
			if (task != null)
			{
			return task;
			}

			if (commonStackerCrane.LastTaskType == null)
			{
			task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
			@@ -239,7 +246,7 @@
			string[] sourceCodes = task.SourceAddress.Split("-");
			if (sourceCodes.Length == 3)
			{
			stackerCraneTaskCommand.StartRow = (short)(Convert.ToInt16(sourceCodes[0]) % 2 == 0 ? 2:1);
			stackerCraneTaskCommand.StartRow = (short)(Convert.ToInt16(sourceCodes[0]) % 2 == 0 ? 2 : 1);
			stackerCraneTaskCommand.StartColumn = Convert.ToInt16(sourceCodes[1]);
			stackerCraneTaskCommand.StartLayer = Convert.ToInt16(sourceCodes[2]);
			}
			@@ -271,7 +278,7 @@
			//}
			//else
			//{


			//}
			stackerCraneTaskCommand.EndRow = (short)(Convert.ToInt16(targetCodes[0]) % 2 == 0 ? 2 : 1);
			stackerCraneTaskCommand.EndColumn = Convert.ToInt16(targetCodes[1]);