HuaYiZhongHeng/BaiBuLiKu.git

			@@ -151,6 +151,15 @@
			/// <param name="nextAddress">下一地址</param>
			/// <returns></returns>
			Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress, string Barcode);

			/// <summary>
			/// 根据任务号、托盘号、当前地址查询输送线执行中的任务
			/// </summary>
			/// <param name="taskNum">任务号</param>
			/// <param name="currentAddress">当前地址</param>
			/// <param name="Barcode">托盘号</param>
			/// <returns></returns>
			Dt_Task QueryExecutingCurrentConveyorLineTask(int taskNum, string currentAddress, string Barcode);
			/// <summary>
			/// 根据托盘号、下一地址查询输送线执行中的任务
			/// </summary>

			@@ -308,6 +308,18 @@
			/// 根据任务号、下一地址查询输送线执行中的任务
			/// </summary>
			/// <param name="taskNum">任务号</param>
			/// <param name="Barcode">下一地址</param>
			/// <param name="currentAddress">下一地址</param>
			/// <returns></returns>
			public Dt_Task QueryExecutingCurrentConveyorLineTask(int taskNum, string Barcode, string currentAddress)
			{
			return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.PalletCode == Barcode && x.CurrentAddress == currentAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting \|\| x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy);
			}

			/// <summary>
			/// 根据任务号、下一地址查询输送线执行中的任务
			/// </summary>
			/// <param name="taskNum">任务号</param>
			/// <param name="nextAddress">下一地址</param>
			/// <returns></returns>
			public Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress,string Barcode)

			@@ -265,6 +265,15 @@
			}
			}
			}
			//else
			//{
			// //当前地址请求寻找当前地址的托盘号任务号的任务，如存在任务则重新再次写入新目标地址
			// Dt_Task currentTask = _taskService.QueryExecutingCurrentConveyorLineTask(command.ConveyorLineTaskNum, childDeviceCode, command.ConveyorLineBarcode);
			// if (currentTask != null)
			// {
			// conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, Convert.ToInt16(currentTask.TargetAddress), childDeviceCode);
			// }
			//}
			}

			/// <summary>

	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史