From 0e0457a2a9d83222568f7dc33a117c418eae6470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Tue, 13 Aug 2024 16:35:47 +0800
Subject: [PATCH] 1

---
 src/Khd.Core.Wcs/MainCentralControl.cs | 4 ++--
 src/Khd.Core.Wcs/Wcs/FirstFloor.cs     | 3 +--
 src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs   | 8 ++------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs
index acaa838..0c3e843 100644
--- a/src/Khd.Core.Wcs/MainCentralControl.cs
+++ b/src/Khd.Core.Wcs/MainCentralControl.cs
@@ -62,7 +62,7 @@ namespace Khd.Core.Wcs
                     }
                 }
                 //创建定时器
-                SystemTimer systemTimer = new SystemTimer(_host);
+                SystemTimer systemTimer = new(_host);
                 systemTimer.Start();
 
                 //创建任务
@@ -94,7 +94,7 @@ namespace Khd.Core.Wcs
                 thirdFloorAGV.StartPoint();
 
                 //四楼接驳位
-                FourthFloorPoint fourthFloorPoint = new FourthFloorPoint(_host, 4);
+                FourthFloorPoint fourthFloorPoint = new(_host, 4);
                 fourthFloorPoint.StartPoint();
 
                 //五层接驳位
diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
index 8143187..6ac101c 100644
--- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
+++ b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
@@ -24,7 +24,6 @@ namespace Khd.Core.Wcs.Wcs
         /// 一楼RFID 读
         /// </summary>
         private readonly BasePlcpoint RFID001;
-        private readonly BasePlcpoint automatic;
         /// <summary>
         /// 到位信号 读
         /// </summary>
@@ -72,8 +71,8 @@ namespace Khd.Core.Wcs.Wcs
             this.linesignal01 = StaticData.BasePlcpointList.First(t => t.equipmentNo.Contains("FirstFloorLine") && t.plcpointNo.Contains("linesignal01"));
             //一楼提升机流水号 读
             this.serialno06 = StaticData.BasePlcpointList.First(t => t.equipmentNo.Contains("Hoister") && t.plcpointNo.Contains("serialno06"));
+            // Mes 关闭
             this.mesClose = StaticData.BasePlcpointList.First(t => t.equipmentNo.Contains("Hoister") && t.plcpointNo.Contains("mesclose"));
-            this.automatic = StaticData.BasePlcpointList.First(t => t.equipmentNo.Contains("Hoister") && t.plcpointNo.Contains("automatic"));
             //一楼提升机状态 读
             this.equipstate06 = StaticData.BasePlcpointList.First(t => t.equipmentNo.Contains("Hoister") && t.plcpointNo.Contains("equipstate06"));
             //一楼提升机任务状态 读
diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
index e7dbbf1..5cd2bf6 100644
--- a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
+++ b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
@@ -20,7 +20,6 @@ namespace Khd.Core.Wcs.Wcs
     /// </summary>
     public class FiveFloorCTU
     {
-        List<BasePlcpoint> ScanPoint { get; set; }//点位信息
         private readonly IHost _host;
         private readonly LoggerUtils _logger = new LoggerUtils();
         private readonly BasePlcpoint LineRFID;
@@ -151,13 +150,10 @@ namespace Khd.Core.Wcs.Wcs
                         {
                             if (task.taskType == StaticTaskType.FiveAccessoryOut)
                             {
-                                dbContext.WcsTask.Where(t => t.objid == task.objid).Delete();
+                                //dbContext.WcsTask.Where(t => t.objid == task.objid).Delete();
                                 #region 如果已经开始入库,还有出库任务，删除出库任务
                                 List<WcsTask> outTasks = dbContext.WcsTask.Where(t => t.taskType == StaticTaskType.FiveAccessoryOut && t.taskStatus == 6).ToList();
-                                if(outTasks!=null && outTasks.Count > 0)
-                                {
-                                    dbContext.RemoveRange(outTasks);
-                                }                              
+                                dbContext.RemoveRange(outTasks);
                                 #endregion
                                 //根据rfid找到库位
                                 //生成入库任务