MeiXinLaiRui/BeiJingZhouChenKu.git

			@@ -30,13 +30,11 @@
			[DisallowConcurrentExecution]
			public partial class RgvDispatchJob : JobBase, IJob
			{

			/// <summary>
			/// RGV(æè½¨å°è½¦)è°åº¦
			/// </summary>
			/// <param name="context"></param>
			/// <returns></returns>

			public Task Execute(IJobExecutionContext context)
			{
			return Task.Run(() =>
			@@ -44,6 +42,9 @@
			var executeLog = ExecuteJob(context, () => Run(context));
			});
			}
			public static bool TempHK = false; // æ¯å¦ç©ºæçååºä¼å
			public static int HKNumber = 0; // ç©ºæçååºçæ°é å¦æå·²ç»åäºåä¸ªäº é£å°±ä¸è½éå¶åºåºçäº
			string[] endStationNo = new string[] { "70101", "70103", "70104", "70106" };
			public string Run(IJobExecutionContext context)
			{
			using (VOLContext dbCcontext = new VOLContext())
			@@ -70,11 +71,24 @@
			List<int> currentLayer = new List<int>();
			foreach (var item in rgvData.data)
			{
			if (item.rgvId == "1")
			{
			client.WriteValue(CLineInfoDBName.RGV01.ToString(), item.status);
			}
			if (item.rgvId == "2")
			{
			client.WriteValue(CLineInfoDBName.RGV02.ToString(), item.status);
			}
			if (item.rgvId == "3")
			{
			client.WriteValue(CLineInfoDBName.RGV03.ToString(), item.status);
			}
			//0ç¦»çº¿ 1æ£å¸¸ 2æé
			if (item.status != 1)
			carCount++;
			else
			currentLayer.Add(item.layer);

			}
			if (carCount == 3)
			{
			@@ -144,10 +158,30 @@
			{
			//æå¨ä»»å¡
			if (rgvTask.rgvtask_wcsTaskNumber == 0 && rgvTask.rgvtask_taskId == "0")
			{
			SendRGVTaskAction(rgvTask, wcsInfo, taskRGVinfoRepository, taskWCSinfoRepository);
			else
			continue;
			}
			continue;
			}

			// è¿éå ä¸ä¸ªå¤æï¼æ¯å¦ææä¸¤ä¸ªä»»å¡å»70101 æä»»å¡Aåä¸å çåºåå°70101 ä½å¯è½ä»»å¡Aårgvæ¢å±çå½±å ä»»å¡B åå°åºåºåºçç¼åæ¶ å¯¼è´Båè¿å»å°äº70101é£è¾¹
			// è¿éè¦å¤æ å¦ææä»»å¡BçRGVä»»å¡è¦ä¸åçæ¶åï¼å¤æåé¢æ¯å¦æä»»å¡ï¼å¦ææï¼å¤æè¿ä¸ªä»»å¡æ¯å¦å·²å°è¾¾ç¼åæ¶æèæ¯ä»»å¡åºåºè¾éçº¿æ§è¡ä¸æè½ä¸å
			if (endStationNo.Contains(wcsInfo.wcstask_endPoint)) // è¯ææ¯å»åè£å°ç
			{
			Dt_TaskWCSinfo WcsTask = taskWCSinfoRepository.FindFirst(x =>
			x.wcstask_endPoint == wcsInfo.wcstask_endPoint
			&& x.wcstask_taskNumber != wcsInfo.wcstask_taskNumber
			&& x.wcstask_type == TaskType.TaskType_Box_Pallet_Outbound.ToString()
			&& x.wcstask_state != TaskState.TaskState_Assigned.ToString()
			&& x.wcstask_state != TaskState.TaskState_Box_Out_Line_Executing.ToString()
			&& x.wcstask_state != TaskState.TaskState_HoisterExecuting.ToString()
			);
			if (WcsTask != null)
			{
			continue;
			}
			}


			//ååä¸ä¸ªä¿æ¤ï¼æ¥çå¯¹åºçæ¾è´§ç«å°ä¸æ¯ææè´§ï¼å³è¯»åç«å°æ¯å¦å¤äºè´è½½å¾æºçç¶æï¼å¦ææ¯ï¼è¯´ææä¸è¥¿
			if (wcsInfo.wcstask_type == TaskType.TaskType_Box_Pallet_Measure_Out.ToString() \|\|
			@@ -162,9 +196,44 @@
			//ç©¿æ¢è½¦æ¾è´§ç«å°
			string targetStation = wcsInfo.wcstask_endLocation;
			//å¤ææå°å½åæ¾è´§ä½ç½®çå°±ä¸æ§è¡
			Dt_TaskWCSinfo executingTask = taskWCSinfoRepository.FindFirst(r => r.wcstask_endPoint == targetStation && r.wcstask_id != wcsInfo.wcstask_id);
			if (null != executingTask)
			Dt_TaskWCSinfo executingTask = taskWCSinfoRepository.FindFirst(r =>
			r.wcstask_endPoint == targetStation
			&& r.wcstask_id != wcsInfo.wcstask_id
			&& r.wcstask_state != TaskState.TaskState_Assigned.ToString());

			if (null != executingTask) // è¿ä¸ªå¤æä¸»è¦æ¯å¤æç©ºæçååºç å¦æç©ºæçååºå°60101 é£åºåºå°60101çå°±ä¸è½ä¸å
			{
			continue;
			}


			// è¿éè·åä¸ä¸ªç©ºæçååºçï¼å¦ææçç©ºæå·²ç»å¨å¤é¢æéå¾é¿äº é£æå°±ä¸è½ä¸ååºçä»»å¡äº
			// è¿éè¦è¯»åä¸ä¸ªä¿¡å·
			int Return_Quantity = int.Parse(client.ReadValue(CLineInfoDBName.Return_Quantity.ToString()).ToString());
			if (Return_Quantity >= 8) // åªè¦ç©ºæçå¨è·¯ä¸çæ°é >= 8 é£ä¹åç©ºæççä¼åçº§å°±è¦æé«äº
			{
			TempHK = true;
			}

			if (HKNumber == 4)
			{
			TempHK = false;
			HKNumber = 0;
			}

			if (TempHK)
			{
			if ((wcsInfo.wcstask_type == TaskType.TaskType_Box_Pallet_Outbound.ToString() \|\| wcsInfo.wcstask_type == TaskType.TaskType_Empty_Pallet_Outbound.ToString())
			&& wcsInfo.wcstask_state == TaskState.TaskState_Assigned.ToString()
			&& endStationNo.Contains(wcsInfo.wcstask_endPoint))
			{
			continue;
			}
			}



			// å¦æåä¸ªç«å°åæ¶æè´è½½ï¼é£æå°±è¦ææçTempHK ç»è®¾ç½®ä¸ºTrue å½è®¾ç½®ä¸ºTrueäº æå°±ä¼è¿å¥ä¸ä¸ªæ¡ä»¶

			//if (rgvTask.rgvtask_areaCode.Equals("OutboundArea"))
			//{
			@@ -185,7 +254,8 @@
			continue;
			else
			{
			Dt_TaskRGVinfo currentTask = taskRGVinfoRepository.FindFirst(r => r.rgvtask_endNode == rgvTask.rgvtask_endNode && r.rgvtask_taskStatus != RGVTaskState.RgvTaskState_Wait_Send.ToString());
			Dt_TaskRGVinfo currentTask = taskRGVinfoRepository.FindFirst(r => r.rgvtask_endNode == rgvTask.rgvtask_endNode
			&& r.rgvtask_taskStatus != RGVTaskState.RgvTaskState_Wait_Send.ToString());
			if (null != currentTask)
			continue;
			}
			@@ -195,7 +265,7 @@



			//æ¤å¤æ¥çå½åæ£å¨è¿è¡çæµéä»»å¡æ¡æ°ï¼éè¦æ§å¶æ°éï¼çº¿ä½ç¼åæ°éæéï¼æµééè¦æ¶é´ï¼æå®3ä¸ª
			//æ¤å¤æ¥çå½åæ£å¨è¿è¡çæµéä»»å¡æ¡æ°ï¼éè¦æ§å¶æ°éï¼çº¿ä½ç¼åæ°éæéï¼æµééè¦æ¶é´ï¼æå®2ä¸ª
			if (wcsInfo.wcstask_type == TaskType.TaskType_Box_Pallet_Measure_Out.ToString())
			{
			List<Dt_TaskWCSinfo> measureList = taskWCSinfoRepository.Find(x =>
			@@ -207,6 +277,8 @@
			continue;
			}
			}


			}
			SendRGVTaskAction(rgvTask, wcsInfo, taskRGVinfoRepository, taskWCSinfoRepository);
			}