WMSPrjInstance/HH-0167_WuHuAoKeSi.git

			@@ -538,26 +538,42 @@
			{
			#region Rgv

			LogHelper.Info($"æ¥çRGV çµéï¼ã{tag.RGV.Rå½åçµé}ã åçµç¶æï¼ã{tag.RGV.Råçµç¶æ}ã æéä»£ç ï¼ã{tag.RGV.RgvrunError}ã");
			LogHelper.Info($"æ¥çRGV çµéï¼ã{tag.RGV.Rå½åçµé}ã åçµç¶æï¼ã{tag.RGV.Råçµç¶æ}ã æéä»£ç ï¼ã{tag.RGV.RgvrunError}ã æå¨1èªå¨2ã{tag.RGV.Ræå¨1èªå¨2}ã");

			if (tag.RGV.Ræå¨1èªå¨2 == 1)
			{
			LogHelper.Info($"RGV æå¨æ¨¡å¼ï¼ä¸ç¨ç®¡ã");
			return;
			}
			if (tag.RGV.taskend == 125)
			{
			LogHelper.Info($"RGV æ125å½ä»¤æªæ§è¡ã");
			System.Threading.Thread.Sleep(3000);
			return;
			}
			LogHelper.Info("ä»»å¡ä¸å Rgv ä»»å¡ è¿å¥");

			TaskEntity task1 = null;
			TaskEntity task2 = null;
			var task1Isrun = false;
			if (tag.RGV.ReadTask1No > 0 && tag.RGV.bit1taskOver != 1)
			{
			task1Isrun = true;
			var taskno = tag.RGV.ReadTask1No;
			string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
			task1 = taskservice.FindEntity(x => x.S_TASK_NO == tno);
			if (task1 != null && task1.S_B_STATE != "å®æ")
			task1Isrun = true;
			//if (tag.RGV.bit1taskOver_LAST == 1)
			// RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
			}
			var task2Isrun = false;
			if (tag.RGV.ReadTask2No > 0 && tag.RGV.bit2taskOver != 1)
			{
			task2Isrun = true;
			var taskno = tag.RGV.ReadTask2No;
			string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
			task2 = taskservice.FindEntity(x => x.S_TASK_NO == tno);
			if (task2 != null && task2.S_B_STATE != "å®æ")
			task2Isrun = true;
			//if (tag.RGV.bit2taskOver_LAST == 1)
			// RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
			}
			@@ -573,9 +589,6 @@
			return;
			}
			var thisOver = 0;
			TaskEntity task1 = null;
			TaskEntity task2 = null;

			LogHelper.Info($"æ¥çRGV 1å·¥ä½ä»»å¡ã");
			if (tag.RGV.ReadTask1No > 0 && tag.RGV.bit1taskOver == 1)
			{
			@@ -593,13 +606,13 @@
			if (task1.S_B_STATE == "åè´§å®æ")
			{
			task1.S_B_STATE = "å®æ";
			tag.RGV.ReadTask1No = 0;
			//tag.RGV.ReadTask1No = 0;
			}
			else
			{
			task1.S_B_STATE = "åè´§å®æ";
			}
			tag.RGV.bit1taskOver = 0;
			//tag.RGV.bit1taskOver = 0;
			LogHelper.Info($"RGV 1å·¥ä½ä»»å¡{task1.S_TASK_NO} ç¶æåæ¢ä¸º{task1.S_B_STATE}");
			//tag.RGV.bit1taskOver_LAST = 1;
			RedisHelper.Add($"RGV.bit1taskOver_LAST", "1", out string msg);
			@@ -635,13 +648,13 @@
			if (task2.S_B_STATE == "åè´§å®æ")
			{
			task2.S_B_STATE = "å®æ";
			tag.RGV.ReadTask2No = 0;
			//tag.RGV.ReadTask2No = 0;
			}
			else
			{
			task2.S_B_STATE = "åè´§å®æ";
			}
			tag.RGV.bit2taskOver = 0;
			//tag.RGV.bit2taskOver = 0;
			LogHelper.Info($"RGV 2å·¥ä½ä»»å¡{task2.S_TASK_NO} ç¶æåæ¢ä¸º{task2.S_B_STATE}");
			RedisHelper.Add($"RGV.bit2taskOver_LAST", "1", out string msg);
			LogHelper.Info($"RGV 2å·¥ä½ä»»å¡åå¤ç");
			@@ -658,8 +671,6 @@
			{
			LogHelper.Info($"RGV 2å·¥ä½æ²¡æä»»å¡ã");
			}



			//if (thisOver > 0)
			//{
			@@ -707,7 +718,9 @@
			{
			LogHelper.Info($"æ¥çRGV1 æä»»å¡{task1.S_TASK_NO},å·¥ä½2 æ²¡ä»»å¡ã æ¾1020 1008 1016åè´§ä»»å¡{t2.S_TASK_NO}ã");
			tag.RGV.workMod = 2;
			LogHelper.Info($"{task1.S_TASK_NO}> workMod 2 ã2å·¥ä½ã");
			tag.RGV.taskmod = 1;
			LogHelper.Info($"{task1.S_TASK_NO}> taskmod 1 ãåè´§ã");
			tag.RGV.taskno2 = Convert.ToUInt32(t2.S_TASK_NO.Substring(4));
			tag.RGV.task2do = Convert.ToUInt16(t2.S_START_LOC);
			t2.S_B_STATE = "å·²æ¨é";
			@@ -768,7 +781,9 @@
			{
			LogHelper.Info($"æ¥çRGV1 æä»»å¡{task1.S_TASK_NO},å·¥ä½2 æ²¡ä»»å¡ã æ²¡æåä¾§åè´§ä»»å¡ 1å·¥ä½å¸è´§ã");
			tag.RGV.workMod = 1;
			LogHelper.Info($"{task1.S_TASK_NO}> workMod 1 ã1å·¥ä½ã");
			tag.RGV.taskmod = 2;
			LogHelper.Info($"{task1.S_TASK_NO}> taskmod 2 ãå¸è´§ã");
			tag.RGV.taskno1 = Convert.ToUInt32(task1.S_TASK_NO.Substring(4));
			tag.RGV.task1do = Convert.ToUInt16(task1.S_END_LOC);
			System.Threading.Thread.Sleep(750);
			@@ -786,7 +801,9 @@
			LogHelper.Info($"æ¥çRGV 1å·¥ä½æ²¡ä»»å¡,å·¥ä½2 æä»»å¡{task2.S_TASK_NO}ãå·¥ä½2å¸è´§ãã");
			//2 å¸è´§ã
			tag.RGV.workMod = 2;
			LogHelper.Info($"{task2.S_TASK_NO}> workMod 2 ã2å·¥ä½ã");
			tag.RGV.taskmod = 2;
			LogHelper.Info($"{task2.S_TASK_NO}> taskmod 2 ãå¸è´§ã");
			tag.RGV.taskno2 = Convert.ToUInt32(task2.S_TASK_NO.Substring(4));
			tag.RGV.task2do = Convert.ToUInt16(task2.S_END_LOC);
			System.Threading.Thread.Sleep(750);
			@@ -808,9 +825,11 @@
			//}
			if (e1017first != null)
			{
			LogHelper.Info($"æ¥çRGV1 ä»»å¡å·¥ä½2 æ²¡ä»»å¡ã 1002 1010 1023åè´§ä»»å¡{e1017first.S_TASK_NO}ã");
			LogHelper.Info($"æ¥çRGVæ²¡ä»»å¡ï¼ ç»å·¥ä½1çéä»»å¡ã 1002 1010 1023åè´§ä»»å¡{e1017first.S_TASK_NO}ã");
			tag.RGV.workMod = 1;
			LogHelper.Info($"{e1017first.S_TASK_NO}> workMod 1 ã1å·¥ä½ã");
			tag.RGV.taskmod = 1;
			LogHelper.Info($"{e1017first.S_TASK_NO}> taskmod 1 ãåè´§ã");
			uint tno = Convert.ToUInt32(e1017first.S_TASK_NO.Substring(4));
			LogHelper.Info($"{e1017first.S_TASK_NO}> è½¬æ¢åä»»å¡å·{tno} å¼å§åå¥ã");
			tag.RGV.taskno1 = tno;
			@@ -831,10 +850,13 @@
			var t2 = tklist.OrderBy(x => x.T_CREATE).ToList().Find(x => x.S_START_LOC == "1020" \|\| x.S_START_LOC == "1008" \|\| x.S_START_LOC == "1016");
			if (tklist != null)
			{
			LogHelper.Info($"æ¥çRGV1 æ²¡ä»»å¡å·¥ä½2 æ²¡ä»»å¡ã æ¾1020 1008 1016åè´§ä»»å¡{t2.S_TASK_NO}ã");
			LogHelper.Info($"æ¥çRGVæ²¡ä»»å¡ ç»å·¥ä½2çéä»»å¡ã æ¾1020 1008 1016åè´§ä»»å¡{t2.S_TASK_NO}ã");
			tag.RGV.workMod = 2;
			LogHelper.Info($"{t2.S_TASK_NO}> workMod 2 ã2å·¥ä½ã");
			tag.RGV.taskmod = 1;
			LogHelper.Info($"{t2.S_TASK_NO}> taskmod 1 ãåè´§ã");
			tag.RGV.taskno2 = Convert.ToUInt32(t2.S_TASK_NO.Substring(4));
			LogHelper.Info($"{t2.S_TASK_NO}> taskno2 {Convert.ToUInt32(t2.S_TASK_NO.Substring(4))}ãä»»å¡å·ã");
			tag.RGV.task2do = Convert.ToUInt16(t2.S_START_LOC);
			t2.S_B_STATE = "å·²æ¨é";
			taskservice.Update(t2);