ZhuZhouYouRuiKe/YangJiPingKu.git

			@@ -5,6 +5,7 @@
			using Microsoft.Extensions.Hosting;
			using Microsoft.VisualBasic.FileIO;
			using Newtonsoft.Json;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
			using Quartz;
			using SixLabors.ImageSharp.PixelFormats;
			using System;
			@@ -85,59 +86,26 @@
			try
			{
			#region çæå¥åºä»»å¡
			if (!OHTJob.oHTReadData.R_GZJ_isWork)
			{
			throw new Exception($"è§æ´æºæå¥ä½¿ç¨ä¿¡å·ä¸ºfalse");
			}
			//if (!OHTJob.oHTReadData.R_GZJ_isWork)
			//{
			// throw new Exception($"è§æ´æºæå¥ä½¿ç¨ä¿¡å·ä¸ºfalse");
			//}
			var Inisout = _outStockRepository.QueryFirst(v => v.Id == 1);
			//å¥åº
			if (Inisout.InOut==1)
			{
			Dt_Task task = new Dt_Task();
			var storagemode = _storagemodeRepository.QueryFirst(v => v.Id == 1);
			if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGVä¸ææ¨¡å¼ï¼ä¸ä¸è·¨æ¶åæä¸æä¿¡å·
			if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGVä¸ææ¨¡å¼ï¼ä¸ä¸è·¨æ¶åæä¸æä¿¡å·
			{

			var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å");
			task.SourceAddress = station.Row + "-" + station.Column + "-1";
			var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
			if (oldhtytask !=null)
			{
			task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
			task.Grade = 1;
			task.Remark = (int)MateTypeEnum.ZiChan;
			//æ¥æ¾ç¸é»çåºä½
			Dt_LocationInfo Towlocation = new Dt_LocationInfo();
			var Onelocation = _LocationInfoRepository.QueryFirst(v => v.LocationCode == task.TargetAddress);
			if (Onelocation.Depth == 1)
			{
			Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2);
			}
			else
			{
			Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1);
			}
			task.NextAddress = Towlocation.LocationCode;
			task.Roadway = "TC01";
			task.TaskType = (int)TaskInboundTypeEnum.Inbound;
			task.TaskState = (int)TaskInStatusEnum.InNew;
			task.PalletCode = "text";
			task.CurrentAddress = "text";
			task.WMSId = 3;
			_dt_taskRepositiry.AddData(task);
			}
			}
			if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGVä¸ææ¨¡å¼ï¼ä¸è¥¿è·¨æ¶åæä¸æä¿¡å·
			{
			var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "è¥¿è·¨æ¶å");
			task.SourceAddress = station.Row + "-" + station.Column + "-1";
			var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
			if (oldhtytask!=null)
			if (oldhtytask ==null)
			{
			task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
			var DKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å");
			string address = DKstation.Row + "-" + DKstation.Column + "-1";
			var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == address);
			if (oldtask != null && oldtask.TaskState == (int)TaskInStatusEnum.InNew)
			if (OHTJob.oHTReadData.R_DK_isready)
			{
			task.Grade = 2;
			}
			@@ -167,16 +135,17 @@
			_dt_taskRepositiry.AddData(task);
			}
			}
			if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)//äººå·¥åè½¦ä¸ææ¨¡å¼ï¼ä¸è¥¿è·¨æ¶åæä¸æä¿¡å·
			if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGVä¸ææ¨¡å¼ï¼ä¸è¥¿è·¨æ¶åæä¸æä¿¡å·
			{
			var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "è¥¿è·¨æ¶å");
			var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å");
			task.SourceAddress = station.Row + "-" + station.Column + "-1";
			var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
			if (oldhtytask!=null)
			if (oldhtytask==null)
			{
			task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;

			task.Grade = 1;
			task.Remark = (int)MateTypeEnum.WaiGou;
			task.Remark = (int)MateTypeEnum.ZiChan;
			//æ¥æ¾ç¸é»çåºä½
			Dt_LocationInfo Towlocation = new Dt_LocationInfo();
			var Onelocation = _LocationInfoRepository.QueryFirst(v => v.LocationCode == task.TargetAddress);
			@@ -198,18 +167,15 @@
			_dt_taskRepositiry.AddData(task);
			}
			}
			if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)//äººå·¥åè½¦ä¸ææ¨¡å¼ï¼ä¸ä¸è·¨æ¶åæä¸æä¿¡å·
			if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)
			{
			var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å");
			task.SourceAddress = station.Row + "-" + station.Column + "-1";
			var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
			if (true)
			if (oldhtytask == null)
			{
			task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
			var XKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "è¥¿è·¨æ¶å");
			string address = XKstation.Row + "-" + XKstation.Column + "-1";
			var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == address);
			if (oldtask != null && oldtask.TaskState == (int)TaskInStatusEnum.InNew)
			if (OHTJob.oHTReadData.R_XK_isready)
			{
			task.Grade = 2;
			}
			@@ -239,24 +205,77 @@
			_dt_taskRepositiry.AddData(task);
			}
			}

			if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)
			{
			var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "è¥¿è·¨æ¶å");
			task.SourceAddress = station.Row + "-" + station.Column + "-1";
			var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
			if (oldhtytask == null)
			{
			task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
			//var XKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å");
			//string address = XKstation.Row + "-" + XKstation.Column + "-1";
			//var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == address);
			//if (oldtask != null && oldtask.TaskState == (int)TaskInStatusEnum.InNew)
			//{
			// task.Grade = 2;
			//}
			//else
			//{
			// task.Grade = 1;
			//}
			task.Grade = 1;
			task.Remark = (int)MateTypeEnum.WaiGou;
			//æ¥æ¾ç¸é»çåºä½
			Dt_LocationInfo Towlocation = new Dt_LocationInfo();
			var Onelocation = _LocationInfoRepository.QueryFirst(v => v.LocationCode == task.TargetAddress);
			if (Onelocation.Depth == 1)
			{
			Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2);
			}
			else
			{
			Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1);
			}
			task.NextAddress = Towlocation.LocationCode;
			task.Roadway = "TC01";
			task.TaskType = (int)TaskInboundTypeEnum.Inbound;
			task.TaskState = (int)TaskInStatusEnum.InNew;
			task.PalletCode = "text";
			task.CurrentAddress = "text";
			task.WMSId = 3;
			_dt_taskRepositiry.AddData(task);
			}
			}
			}
			//ç´æ¥åºåº
			else if(Inisout.InOut == 2)
			{
			if (!OHTJob.oHTReadData.R_ZXJ_TCMode \|\| !OHTJob.oHTReadData.R_HC_isReadyWork)
			if (!OHTJob.oHTReadData.R_ZXJ_TCMode)
			{
			throw new Exception($"æ´å½¢æºä¸å±äºå¤©è½¦ä¸ææ¨¡å¼æå¤©è½¦æ¾æ¿ä¿¡å·ä¸ºfalse");
			}
			Dt_Task outtask = new Dt_Task();
			if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready )
			if (!OHTJob.oHTReadData.R_HC_isReadyWork)
			{
			var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å");
			throw new Exception($"æ´å½¢æºå¤©è½¦æ¾æ¿ä¿¡å·ä¸ºfalse");
			}
			Dt_Task outtask = new Dt_Task();
			//å°è½¦ä¸æ
			if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready )
			{
			var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "è¥¿è·¨æ¶å");
			outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";

			}
			else if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)
			else if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)
			{
			var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "è¥¿è·¨æ¶å");
			var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å");
			outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
			}
			//äººå·¥ä¸æ
			else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)
			{
			var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å");
			outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
			}
			else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)
			@@ -264,13 +283,9 @@
			var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "è¥¿è·¨æ¶å");
			outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
			}
			else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)
			{
			var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å");
			outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
			}

			var Endstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "æ´å½¢æºæ¾æä½");
			//æ·»å ä»»å¡ä¿¡æ¯
			outtask.TargetAddress = Endstation.Row + "-" + Endstation.Column + "-1";
			outtask.Grade = 1;
			outtask.NextAddress = Endstation.Row + "-" + Endstation.Column + "-1";
			@@ -280,9 +295,11 @@
			outtask.WMSId = 3;
			outtask.PalletCode = "text";
			outtask.CurrentAddress = "text";
			var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == outtask.SourceAddress &&v.TargetAddress== outtask.SourceAddress);
			//é²æ¢éå¤ä»»å¡
			var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == outtask.SourceAddress &&v.TargetAddress== outtask.TargetAddress);
			if (oldtask == null)
			{
			//çæä»»å¡
			_dt_taskRepositiry.AddData(outtask);
			}
			}
			@@ -296,17 +313,21 @@
			try
			{
			#region çæåºåºä»»å¡
			if (!OHTJob.oHTReadData.R_ZXJ_isWork)
			{
			throw new Exception($"æ´å½¢æºæå¥ä½¿ç¨ä¿¡å·ä¸ºfalse");
			}
			//if (!OHTJob.oHTReadData.R_ZXJ_isWork)
			//{
			// throw new Exception($"æ´å½¢æºæå¥ä½¿ç¨ä¿¡å·ä¸ºfalse");
			//}
			var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
			if (isout.isout == 1)
			{
			if (!OHTJob.oHTReadData.R_ZXJ_TCMode \|\| !OHTJob.oHTReadData.R_HC_isReadyWork)
			if (!OHTJob.oHTReadData.R_ZXJ_TCMode )
			{
			throw new Exception($"æ´å½¢æºä¸å±äºå¤©è½¦ä¸ææ¨¡å¼æå¤©è½¦æ¾æ¿ä¿¡å·ä¸ºfalse");
			}
			if (!OHTJob.oHTReadData.R_HC_isReadyWork)
			{
			throw new Exception($"æ´å½¢æºå¤©è½¦æ¾æ¿ä¿¡å·ä¸ºfalse");
			}
			//æ¥è¯¢å½åä»»å¡æ± ä¸æ¯å¦åå¨åºåºä»»å¡ï¼åºåºä»»å¡åªè½åå¨ä¸æ¡
			var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
			if (oldtask != null)