From fd888092c8fe711e7903a9d05193cf7050ff1d98 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 6 Aug 2024 18:13:33 +0800
Subject: [PATCH] =?UTF-8?q?add-0806=E7=BF=BB=E8=BD=AC=E6=9C=BA=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wcs/MainCentralControl.cs | 6 +++---
 src/Khd.Core.Wcs/Wcs/FirstFloor.cs     | 1 +
 src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs  | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs
index ac50440..62d52e2 100644
--- a/src/Khd.Core.Wcs/MainCentralControl.cs
+++ b/src/Khd.Core.Wcs/MainCentralControl.cs
@@ -76,7 +76,7 @@ namespace Khd.Core.Wcs
                 secondFloorPoint.StartPoint();
 
                 //二层AGV
-                SecondFloorAGV secondFloorAGV = new(_host,2);
+                SecondFloorAGV secondFloorAGV = new(_host, 2);
                 secondFloorAGV.StartPoint();
 
                 //二楼线体
@@ -100,7 +100,7 @@ namespace Khd.Core.Wcs
                 fifthFloorPoint.StartPoint();
 
                 //五层CTU
-                FiveFloorCTU fiveFloorCTU = new(_host,5);
+                FiveFloorCTU fiveFloorCTU = new(_host, 5);
                 fiveFloorCTU.StartPoint();
 
                 //五层AGV
@@ -108,7 +108,7 @@ namespace Khd.Core.Wcs
                 fifthFloorAGV.StartPoint();
 
                 //背负式Agv
-                FiveFloorBearAgv fiveFloorBearAgv = new(_host,5);
+                FiveFloorBearAgv fiveFloorBearAgv = new(_host, 5);
                 fiveFloorBearAgv.StartPoint();
             }
             catch (Exception ex)
diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
index fda2bd3..3a18fee 100644
--- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
+++ b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
@@ -300,6 +300,7 @@ namespace Khd.Core.Wcs.Wcs
                             {
                                 if (StaticData.BigContainerCodes.Contains(RFID001Value))
                                 {
+                                    continue;
                                     var newTask = new WcsTask()
                                     {
                                         objid = StaticData.SnowId.NextId(),
diff --git a/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs
index d0710ed..ce8512d 100644
--- a/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs
+++ b/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs
@@ -74,7 +74,7 @@ namespace Khd.Core.Wcs.Wcs
                         {
                             StaticData.PlcDic[2].WriteToPoint(GetTrayOverPoint.plcpointAddress, false, GetTrayOverPoint.plcpointLength.ToString());
                             IsTrayGet = false;
-                            _logger.Info("三楼AGV 托盘已取走");
+                            _logger.Info("三楼AGV 托盘已取走信号复位");
                         }
                     }
                     catch
@@ -745,6 +745,7 @@ namespace Khd.Core.Wcs.Wcs
                                             BasePlcpoint basePlcpoint = StaticData.BasePlcpointList.First(t => t.plcpointNo == "GetTrayOver");
                                             StaticData.PlcDic[2].WriteToPoint(basePlcpoint.plcpointAddress, true, basePlcpoint.plcpointLength.ToString());
                                             IsTrayGet = true;
+                                            _logger.Info("通知PLC已经取走信号:true");
                                             MesBaseBarcodeInfo? mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.Where(t => t.palletInfoCode == item.containerNo).FirstOrDefault();
                                             if (mesBaseBarcodeInfo != null)
                                             {