diff --git a/SlnMesnac.WCS/Global/HttpHelper.cs b/SlnMesnac.WCS/Global/HttpHelper.cs index 034d0d8..0823b15 100644 --- a/SlnMesnac.WCS/Global/HttpHelper.cs +++ b/SlnMesnac.WCS/Global/HttpHelper.cs @@ -30,6 +30,7 @@ namespace SlnMesnac.WCS.Global postData = postData ?? ""; using (HttpClient client = new HttpClient()) { + client.Timeout = new TimeSpan(0, 0, timeOut); if (headers != null) { foreach (var header in headers) diff --git a/SlnMesnac.WCS/MainCentralControl.cs b/SlnMesnac.WCS/MainCentralControl.cs index 0fa0832..b6e0959 100644 --- a/SlnMesnac.WCS/MainCentralControl.cs +++ b/SlnMesnac.WCS/MainCentralControl.cs @@ -161,7 +161,7 @@ namespace SlnMesnac.WCS SqlSugarClient.Updateable(rfidDbList).ExecuteCommand(); #endregion RFID状态 - //实时获取agv状态 暂不开启,生产时打开 + //实时获取agv状态 MessageSynchronousLogic(agvEquipList); ListeningTonerLocation(); diff --git a/SlnMesnac.WCS/WCS/BearAgv.cs b/SlnMesnac.WCS/WCS/BearAgv.cs index 689a60b..44191aa 100644 --- a/SlnMesnac.WCS/WCS/BearAgv.cs +++ b/SlnMesnac.WCS/WCS/BearAgv.cs @@ -470,7 +470,15 @@ namespace SlnMesnac.WCS.WCS } else if (outFlag == 1) { //已经出来就绪,wcs通知agv取走托盘 - await ContinueTaskHandle(task); + bool result = await ContinueTaskHandle(task); + if (result) + { + //从下料点直接取,清空RFID及机台号,条码等信息--ok + workShop3Plc.writeInt16ByAddress(StaticData.GetPlcAddress("3#线体忙碌状态"), 0); + workShop3Plc.writeInt16ByAddress(StaticData.GetPlcAddress("3#接驳位到位信号"), 0); + workShop3Plc.writeBoolByAddress(StaticData.GetPlcAddress("3#出接驳位信号"), false); + workShop3Plc.writeBoolByAddress(StaticData.GetPlcAddress("3#小料箱agv已取走反馈"), true); + } } } else if (task.TaskStatus == 4) //agv已经退出接驳位,wcs把 线体忙碌状态改为0,接驳位到位信号 复位写0,出接驳位信号 0,清空RFID、机台号 @@ -480,11 +488,6 @@ namespace SlnMesnac.WCS.WCS _logger.Plc(DateTime.Now + "3#PLC未连接,请检查网络!"); return; } - //从下料点直接取,清空RFID及机台号,条码等信息--ok - workShop3Plc.writeInt16ByAddress(StaticData.GetPlcAddress("3#线体忙碌状态"), 0); - workShop3Plc.writeInt16ByAddress(StaticData.GetPlcAddress("3#接驳位到位信号"), 0); - workShop3Plc.writeBoolByAddress(StaticData.GetPlcAddress("3#出接驳位信号"), false); - workShop3Plc.writeBoolByAddress(StaticData.GetPlcAddress("3#小料箱agv已取走反馈"), true); //workShop3Plc.writeStringByAddress(StaticData.GetPlcAddress("3#小料箱下料点机台号"), "", 6); //workShop3Plc.writeStringByAddress(StaticData.GetPlcAddress("3#小料箱下料点RFID号"), "", 12);