ShiDaKe/ShenYangLiku.git

			@@ -1,24 +1,18 @@
			ï»¿using Autofac.Core;
			using Microsoft.AspNetCore.Routing;
			using Quartz;
			ï»¿using Quartz;
			using SqlSugar;
			using System.Net;
			using System.Threading.Tasks;
			using WIDESEA_Comm.Http;
			using WIDESEAWCS_Common;
			using WIDESEAWCS_Common.Helper;
			using WIDESEAWCS_Common.TaskEnum;
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.BaseRepository;
			using WIDESEAWCS_Core.Helper;
			using WIDESEAWCS_ITaskInfoService;
			using WIDESEAWCS_Model.Models;
			using WIDESEAWCS_QuartzJob;
			using WIDESEAWCS_QuartzJob.ConveyorLine.Enum;
			using WIDESEAWCS_QuartzJob.DTO;
			using WIDESEAWCS_QuartzJob.Models;
			using WIDESEAWCS_QuartzJob.Repository;
			using WIDESEAWCS_QuartzJob.Service;
			using WIDESEAWCS_TaskInfoService;
			using WIDESEAWCS_Tasks.ConveyorLineJob;
			using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;

			@@ -84,22 +78,27 @@
			bool STB = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.STB, item.StationCode); //è·åSTBè¯·æ±ä¿¡æ¯
			//ConveyorLineSignal conveyorLineSignalWrite = conveyorLineInfoWrite.Signal.ByteToBoolObject<ConveyorLineSignal>();
			//åºåºç«å°

			if (item.StationType == StationTypeEnum.StationType_OnlyOutbound.ObjToInt()) //2007äº¤äºå£è¿å¥
			{
			//WriteLog.Write_Log("2æ¥¼åºåº2007äº¤äºæµç¨ï¼å åæºå®æåºåºä»»å¡å®æ", $"{item.StationType}åºæµç¨", $"ä¸2007è¿è¡äº¤äº,ç«å°ç¼å·ï¼{item.StationCode}",item.StationType);
			// åºåº
			if (conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !STB && !ACK)//2æ¥¼åºåº
			{
			if (!string.IsNullOrEmpty(conveyorLineInfoRead.Barcode))
			{

			Dt_Task dt_Ta = _taskService.GetOutTaskInfo2(conveyorLineInfoRead.Barcode);


			WriteLog.Write_Log("2æ¥¼åºåºæµç¨", $"{item.StationCode}åºåºæµç¨", $"è·å2æ¥¼åºåºä»»å¡,æçæ¡ç ï¼{dt_Ta.PalletCode}", dt_Ta);
			if (dt_Ta != null)
			{
			WriteLog.Write_Log("2åºåºæµç¨", $"{item.StationCode}åºåºæµç¨",$"è·ååºåºä»»å¡æåå¼å§åplcåå¥å½ä»¤,æçæ¡ç ï¼taskno:{dt_Ta.TaskNum}------endpos:{dt_Ta.OutboundPlatform}--------stb:{ACK}");
			device.SetValue(W_ConveyorLineDB.TaskNo, dt_Ta.TaskNum, item.StationCode);
			bool endpos = device.SetValue(W_ConveyorLineDB.EndPos, dt_Ta.OutboundPlatform, item.StationCode);
			device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);


			WriteLog.Write_Log("2æ¥¼åºåºæµç¨", $"{item.StationCode}åºåºæµç¨", $"å¼å§å é¤ä»»å¡,æçæ¡ç ï¼{dt_Ta.PalletCode}");
			//å é¤ä»»å¡
			_taskRepository.DeleteData(dt_Ta);

			@@ -116,15 +115,19 @@
			//åºå¥åºç«å°
			else if (item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt())
			{

			//è¾éçº¿å®æä¿®æ¹æè¾éçº¿å®æç¶æå¾å åæºæ§è¡ä»»å¡
			if (conveyorLineSignalRead.STB && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !ACK)
			{
			Dt_Task task = _taskService.GetTaskIninfo(conveyorLineInfoRead.Barcode);
			if (!string.IsNullOrEmpty(conveyorLineInfoRead.Barcode)&& task != null)
			Dt_Task dt_Task = _taskService.GetTaskIninfo(conveyorLineInfoRead.Barcode);
			WriteLog.Write_Log("1-2-3-4-5å¥åºæµç¨", $"{item.StationCode}å¥åºæµç¨", $"è·åå¥åºä»»å¡,æçæ¡ç ï¼{dt_Task.PalletCode}", dt_Task);
			if (!string.IsNullOrEmpty(conveyorLineInfoRead.Barcode)&& dt_Task !=null)
			{
			bool ack = device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
			bool taskno = device.SetValue(W_ConveyorLineDB.TaskNo,1, item.StationCode);
			WriteLog.Write_Log("1-3-4-5åºå¥åºæµç¨", $"{item.StationCode}åºåºæµç¨", $"è·ååºåºä»»å¡æåå¼å§åplcåå¥å½ä»¤,æçæ¡ç ï¼{dt_Task.PalletCode},taskno:{taskno}------ack:{ack}");
			WebResponseContent contentweb = _taskService.UpdateTaskIninfo(conveyorLineInfoRead.Barcode,item.StationCode); //æ ¹æ®æ¡ç è·è®¾å¤ç¼å·å»æ¥è¯¢å¹¶ä¿®æ¹ä»»å¡
			WriteLog.Write_Log("1-3-4-5åºå¥åºæµç¨", $"{item.StationCode}å¥åºæµç¨", $"åplcåå¥æåå¼å§ä¿®æ¹ä»»å¡,æçæ¡ç ï¼{dt_Task.PalletCode},ä¿®æ¹ä»»å¡æ¯å¦æå{contentweb.Status}");
			if (contentweb.Status)
			{

			@@ -166,28 +169,48 @@
			}
			}
			}*/
			Dt_Task dt_Tas = _taskService.GetOutTaskInfo(item.StationCode); //è·ååºåºä»»å¡
			if (dt_Tas != null)
			{
			WriteLog.Write_Log("1-3-4-5åºåºæµç¨", $"{item.StationCode}åºåºæµç¨", $"è·ååºåºä»»å¡,æçæ¡ç ï¼{dt_Tas.PalletCode}", new
			{
			ååconveyorLineSignalReadSTB = !conveyorLineSignalRead.STB,
			ååconveyorLineSignalReadACK = !conveyorLineSignalRead.ACK,
			èæºconveyorLineStatusOnline = conveyorLineStatus.Online,
			ææ è´§conveyorLineStatusGoods = conveyorLineStatus.Goods,
			æéææ£å¸¸ååconveyorLineStatusAlarm = !conveyorLineStatus.Alarm,
			ååæ¬å°STB = !STB,
			ååæ¬å°ACK = !ACK
			});
			}
			else if (!conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !STB && !ACK)//å¶ä»æ¥¼å±åºåº
			{

			Dt_Task dt_Ta = _taskService.GetOutTaskInfo(item.StationCode); //è·ååºåºä»»å¡


			WriteLog.Write_Log("1-3-4-5åºåºæµç¨",$"{item.StationCode}åºåºæµç¨",$"è·ååºåºä»»å¡,æçæ¡ç ï¼{dt_Ta.PalletCode}",dt_Ta);
			if (dt_Ta != null)
			{
			bool taskno = device.SetValue(W_ConveyorLineDB.TaskNo, dt_Ta.TaskNum, item.StationCode);
			bool endpos = device.SetValue(W_ConveyorLineDB.EndPos, dt_Ta.OutboundPlatform, item.StationCode);
			bool stb = device.SetValue(W_ConveyorLineDB.STB, true, item.StationCode);
			WriteLog.Write_Log("1-3-4-5åºåºæµç¨", $"{item.StationCode}åºåºæµç¨",$"è·ååºåºä»»å¡æåå¼å§åplcåå¥å½ä»¤,æçæ¡ç ï¼{dt_Ta.PalletCode},taskno:{taskno}------endpos:{endpos}--------stb:{stb}");

			if (taskno && endpos && stb)
			{

			//å åæºä»»å¡å®æä¸ä¸å°åæ¹æè¾éçº¿ä¸ä¸å°åï¼è®¾å¤ç¼å·æ¹æè¾éçº¿
			WebResponseContent webResponse = _taskService.UpdateTaskStatusToNext(dt_Ta.TaskNum);

			WriteLog.Write_Log("1-3-4-5åºåºæµç¨",$"{item.StationCode}åºåºæµç¨",$"åplcåå¥æåå¼å§ä¿®æ¹ä»»å¡,æçæ¡ç ï¼{dt_Ta.PalletCode},ä¿®æ¹ä»»å¡æ¯å¦æå{webResponse.Status}");

			if (webResponse.Status)
			{
			if (dt_Ta.TargetAddress != "2021" && dt_Ta.TargetAddress != "2020")
			{
			//å é¤ä»»å¡
			bool res = _taskRepository.DeleteData(dt_Ta);
			WriteLog.Write_Log("1-3-4-5åºåºæµç¨", $"{item.StationCode}åºåºæµç¨",$"ä¿®æ¹ä»»å¡æåå¼å§å é¤ä»»å¡,æçæ¡ç ï¼{dt_Ta.PalletCode},å é¤ä»»å¡æ¯å¦æå{res}");

			if (res)
			{
			_taskHtyService.AddTaskHistory(dt_Ta, "èªå¨å®æ");
			@@ -212,7 +235,7 @@
			if (conveyorLineSignalRead.STB && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !ACK)
			{
			Dt_Task dt_Task = _taskService.GetTaskIninfo(conveyorLineInfoRead.Barcode);

			WriteLog.Write_Log("2æ¥¼å¥åºæµç¨", $"{item.StationCode}å¥åºæµç¨", $"æçæ¡ç ï¼{dt_Task.PalletCode},ä»»å¡{dt_Task}");
			if (conveyorLineInfoRead.TaskNo == 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode)&& dt_Task != null)//éè´å¥åº
			{
			Dt_Task dt_Ta = _taskService.GetTaskIninfo(conveyorLineInfoRead.Barcode); //éè¿æ¡ç å»æ¥è¯¢ä»»å¡
			@@ -221,6 +244,7 @@
			bool endpos = device.SetValue(W_ConveyorLineDB.EndPos, dt_Ta.SourceAddress, item.StationCode);
			bool taskno = device.SetValue(W_ConveyorLineDB.TaskNo, dt_Ta.TaskNum, item.StationCode);
			bool ack = device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
			WriteLog.Write_Log("2æ¥¼å¥åºæµç¨", $"{item.StationCode}å¥åºæµç¨", $"è·åå¥åºä»»å¡æåå¼å§åplcåå¥å½ä»¤,æçæ¡ç ï¼{dt_Ta.PalletCode},taskno:{taskno}------endpos:{endpos}--------ack:{ack}");
			}

			}
			@@ -238,6 +262,7 @@

			catch (Exception ex)
			{
			//throw;
			}