From 9d616def1d1c99b923433ad65342727fcdec7693 Mon Sep 17 00:00:00 2001 From: liuwf Date: Thu, 29 Aug 2024 16:30:50 +0800 Subject: [PATCH] =?UTF-8?q?change-2F=E5=B0=8F=E5=8C=85=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs | 10 +++++++--- src/Khd.Core.Wcs/Wcs/SecondFloorLine.cs | 3 +-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs index 3a526c0..ba189a8 100644 --- a/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs +++ b/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs @@ -562,7 +562,9 @@ namespace Khd.Core.Wcs.Wcs { if (item.taskType == StaticTaskType.SecondLineToSmallPackage) { - if (true) + var agvPutPoint = StaticData.BasePlcpointList.First(t => t.id == 54); + var agvPutValue = StaticData.PlcDic[2].Read(agvPutPoint.plcpointAddress);//小包入口叫料 + if (agvPutValue !=null && Convert.ToInt32(agvPutValue) == 0) { var agvTask = new RequestAGVTaskDto { @@ -718,8 +720,10 @@ namespace Khd.Core.Wcs.Wcs } else if (item.taskType == StaticTaskType.SecondLineToSmallPackage)//输送线到小包入口 { - // 小包入口确认信号 - + // 小包入口放料完成确认信号 + //放托盘确认信号DB4.DBX310.0写true + BasePlcpoint SecondInPutOverPoint = StaticData.BasePlcpointList.First(t => t.id == 72); + StaticData.PlcDic[2].WriteToPoint(SecondInPutOverPoint.plcpointAddress, true, SecondInPutOverPoint.plcpointLength.ToString()); BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId); diff --git a/src/Khd.Core.Wcs/Wcs/SecondFloorLine.cs b/src/Khd.Core.Wcs/Wcs/SecondFloorLine.cs index 196d75d..4fd2418 100644 --- a/src/Khd.Core.Wcs/Wcs/SecondFloorLine.cs +++ b/src/Khd.Core.Wcs/Wcs/SecondFloorLine.cs @@ -59,8 +59,7 @@ namespace Khd.Core.Wcs.Wcs var rfidValue = StaticData.PlcDic[2].ReadRFID(rfidPoint.plcpointAddress,15);//小包出口的RFID if (agvGetValue != null && agvPutValue != null && rfidValue != null)//读Plc { - //待删除 - agvPutValue = 1; + if (Convert.ToInt32(agvPutValue) == 0)//小包入口叫料 {