MeiXinLaiRui/NiuJuKongZhi.git

			@@ -3,26 +3,23 @@
			using System.Drawing.Imaging;
			using System.IO.Ports;
			using System.Linq;
			using System.Net.WebSockets;
			using System.Text;
			using System.Threading.Tasks;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
			using HslCommunication.WebSocket;
			using Newtonsoft.Json;
			using Quartz;
			using SqlSugar;
			using StackExchange.Profiling.Internal;
			using WIDESEA_ISerialPortRepository;
			using WIDESEA_SerialPortRepository;
			using WIDESEAWCS_Model.Models;
			using WIDESEAWCS_QuartzJob;
			using WIDESEAWCS_QuartzJob.DTO;
			using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
			using WIDESEAWCS_Tasks.ConveyorLineJob;
			using WIDESEAWCS_Tasks.StackerCraneJob;

			namespace WIDESEAWCS_Tasks
			{
			[DisallowConcurrentExecution]
			public class SerialPortJob : JobBase, IJob, IDisposable
			public class SerialPortJob : JobBase, IJob,IDisposable
			{
			public void Dispose()
			{
			@@ -45,11 +42,14 @@
			private readonly IPutakeRepository _putakeRepository;
			private readonly IProcessRepository _processRepository;
			private readonly ITorqueOpRepository _orqueOpRepository;
			public SerialPortJob(IPutakeRepository putakeRepository, IProcessRepository processRepository, ITorqueOpRepository torqueOpRepository)
			private WebSocketServer _webSocketContext;

			public SerialPortJob(IPutakeRepository putakeRepository, IProcessRepository processRepository, ITorqueOpRepository torqueOpRepository, WebSocketServer webSocketContext)
			{
			_putakeRepository = putakeRepository;
			_processRepository = processRepository;
			_orqueOpRepository = torqueOpRepository;
			_webSocketContext = webSocketContext;
			}

			public Task Execute(IJobExecutionContext context)
			@@ -59,6 +59,7 @@
			SerialPortDevice serialPortDevice = (SerialPortDevice)context.JobDetail.JobDataMap.Get("JobParams");
			if (serialPortDevice != null)
			{

			List<DeviceProDTO> deviceProDTOs = serialPortDevice.DeviceProDTOs;
			foreach (var item in deviceProDTOs)
			{
			@@ -67,109 +68,21 @@
			DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandType) && x.ProtocolDetailType == nameof(CommandType.Set));
			if (deviceProtocolDetail != null)
			{

			//åæ¥ç¶æåç»ï¼ææ¶é´éåº
			# region Setvalue
			string group = item.DeviceProDataBlock;


			//è¿éå¤æç»å«ä¸ä¸ªçæ¯é£ä¸ªï¼å°±æ¥é£ä¸ªå·¥èºè¡¨çå¼
			if (group == "çµæ°")
			{
			//æ¥çæ¥éª¤
			var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (5 * 1000).ToString().PadLeft(7, '0'))+"\r";
			serialPortDevice.Communicator.Write(com+"\r");
			//æå¼ä¸²å£æ¶åè®¾å¼

			// åçDt_TorqueOpè¡¨ï¼æ¥è¯¢å°ç°å¨è¿æ¡æ°æ®çä»»å¡å·åæ¥éª¤
			var take = _putakeRepository.QueryData(x => x.Pustatus == 2 && x.Grouptype == group).OrderBy(x => x.Dispatchtime).First();
			if (take==null)
			{
			//çäºç©ºå°±å
			}

			//æ¥å°æè¯¥æ¡æ°æ®äº
			var process = _processRepository.QueryData(x => x.CraftType == group).OrderBy(x => x.SetpNum).First();



			float torqueone = process.TorqueOne;//è¯»å°å¼äº
			float torquetow = process.TorqueTwo;
			if (torqueone != 0)
			{
			serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torqueone * 1000).ToString().PadLeft(7, '0')) + "\r");
			//è¿éç»å®è®¾å®å¼å°± æ¥åå¨å¼è¡¨ è¿ä¸ªæ°æ®æ¯å¦æ»¡è¶³äºï¼æ»¡è¶³äºå°±è¿è¡ä¸ä¸ä¸ªå¼ï¼ä¸æ»¡è¶³å°±ä¸åä¸ç´ç»å¼
			var num= _orqueOpRepository.QueryData(x => x.TakeId == take.Njtakeid && x.GroupOp == group && x.TorqueSize == torqueone).Count();
			if (num!= process.TorqueOneQuantity)
			{

			}

			}
			if (torquetow != 0)
			{
			serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torquetow * 1000).ToString().PadLeft(7, '0')) + "\r");
			}

			// // è®¡ç®å½åæ¥éª¤æéç Torque æ»æ°
			int requiredTorqueCount = process.TorqueOneQuantity + process.TorqueTwoQuantity;

			// æ¥è¯¢å½åæ¥éª¤ç TorqueOp è®°å½ï¼å¹é ProcessSteåç»ï¼æ£æ¥æ¯å¦è¾¾å°è¦æ±
			int torqueCount = _orqueOpRepository.QueryData(x => x.ProcessSte == process.SetpNum && x.GroupOp == group).Count();

			if (torqueCount < requiredTorqueCount)
			{
			// å¦ææ°éä¸æ»¡è¶³ï¼åæ¢è¯»å

			break;
			}
			#region

			// //åçå·¥èºè¡¨ä¸æ¥éª¤ä¸ä¸è¦æçå¼æå¤å°ä¸ª åæ¥çDt_TorqueOpè¡¨ä¸æ¯å¦æè¯¥ä»»å¡å·idåæ¥éª¤æ»æ°æ¯å¦æ»¡è¶³å·¥èºè¡¨
			// // æ¥è¯¢ææå·¥èºæ°æ®ï¼æç§æ¥éª¤å· SetpNum éå¢æåº
			// var processList = _processRepository.QueryData(x => x.CraftType == group)
			// .OrderBy(x => x.SetpNum)
			// .ToList();

			// foreach (var process in processList)
			// {
			// float torqueone = process.TorqueOne;//è¯»å°å¼äº
			// float torquetow = process.TorqueTwo;
			// if (torqueone!=0)
			// {
			// serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torqueone * 1000).ToString().PadLeft(7, '0')) + "\r");
			// }
			// if (torquetow != 0)
			// {
			// serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torquetow * 1000).ToString().PadLeft(7, '0')) + "\r");
			// }

			// // è®¡ç®å½åæ¥éª¤æéç Torque æ»æ°
			// int requiredTorqueCount = process.TorqueOneQuantity + process.TorqueTwoQuantity;

			// // æ¥è¯¢å½åæ¥éª¤ç TorqueOp è®°å½ï¼å¹é ProcessSteåç»ï¼æ£æ¥æ¯å¦è¾¾å°è¦æ±
			// int torqueCount = _orqueOpRepository.QueryData(x => x.ProcessSte == process.SetpNum&& x.GroupOp== group).Count();

			// if (torqueCount < requiredTorqueCount)
			// {
			// // å¦ææ°éä¸æ»¡è¶³ï¼åæ¢è¯»å

			// break;
			// }
			// //ç¬¦åè¦æ±ï¼ç»§ç»è¯»åä¸ä¸æ¥

			}

			//}
			//if (group == "æºæ¢°")
			//{

			//}
			//if (group == "å°æ²")
			//{

			//}

			}
			#endregion


			serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (5 * 1000).ToString().PadLeft(7, '0')) + "\r");
			//æå¼ä¸²å£æ¶åè®¾å¼
			item.DeviceProParamName = CommandType.Set.ToString();


			}
			}

			@@ -218,54 +131,38 @@
			{
			DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandResult) && x.ProtocolDetailType == nameof(CommandResult.GetOK));
			//03æå

			if (deviceProtocolDetail != null && receiveData.Contains(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue))
			{
			////è¿éæåä¹åï¼è¦åå¨å°çDt_TorqueOpï¼åä»»å¡å·ï¼ç»ï¼å¼ï¼
			//string group = "";
			//if (group == "çµæ°")
			//{
			// var putake = _putakeRepository.QueryData(x => x.Pustatus == 2 && x.Grouptype == group).OrderByDescending(x => x.Dispatchtime).FirstOrDefault();//æ¯æ¬¡é½æ¿ææ©çé£æ¡
			// var punjid = putake.ID;
			// var Nj = new Dt_TorqueOp()
			// {
			// TakeId = putake.Njtakeid,
			// GroupOp = group,
			// //ProcessSte= processList
			// TorqueSize = receiveData

			// };
			// _orqueOpRepository.AddData(Nj);

			//}
			//if (group == "æºæ¢°")
			//{

			//}
			//if (group == "å°æ²")

			string group = item.DeviceProDataBlock; // è®¾å¤æå±ç»å«
			if (group == "çµæ°")
			{

			item.DeviceProParamName = CommandType.Set.ToString();

			}
			}
			else if (item.DeviceProParamName == CommandType.Get.ToString())
			{
			DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandResult) && x.ProtocolDetailType == nameof(CommandResult.GetError));
			if (deviceProtocolDetail != null && receiveData.Contains(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue))
			{
			item.DeviceProParamName = CommandType.Set.ToString();
			}
			else if (item.DeviceProParamName == CommandType.Get.ToString())
			{
			//DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandResult) && x.ProtocolDetailType == nameof(CommandResult.GetError));
			//if (deviceProtocolDetail != null && receiveData.Contains(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue))
			//{
			// item.DeviceProParamName = CommandType.Set.ToString();



			//}
			}
			}
			}
			}


			//å»ºä¸ä¸ªå¯¹è±¡å°å¶ä¼ ç»åç«¯
			string data = JsonConvert.SerializeObject(serialPortDevice);//è¿éserialPortDeviceæ¯åè®¾æè¿ä¸ªå¯¹è±¡
			_webSocketContext.PublishAllClientPayload(data);
			}

			}

			}

			}
			catch (Exception ex)
			{
			@@ -274,5 +171,8 @@
			WriteDebug("CommonConveyorLineJob", "test");
			return Task.CompletedTask;
			}



			}
			}