diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs index 1544c6a..836e48e 100644 --- a/src/Khd.Core.Wcs/MainCentralControl.cs +++ b/src/Khd.Core.Wcs/MainCentralControl.cs @@ -67,56 +67,56 @@ namespace Khd.Core.Wcs } //创建定时器 - SystemTimer systemTimer = new SystemTimer(_host); - systemTimer.Start(); + //SystemTimer systemTimer = new SystemTimer(_host); + //systemTimer.Start(); - //创建任务 - CreateTaskByRecord createTaskByRecord = new(_host); - createTaskByRecord.StartPoint(); + ////创建任务 + //CreateTaskByRecord createTaskByRecord = new(_host); + //createTaskByRecord.StartPoint(); - //一楼提升机以及接驳位 - FirstFloor firstFloor = new(_host); - firstFloor.StartPoint(); + ////一楼提升机以及接驳位 + //FirstFloor firstFloor = new(_host); + //firstFloor.StartPoint(); - //二层接驳位 - SecondFloorPoint secondFloorPoint = new(_host, 2); - secondFloorPoint.StartPoint(); + ////二层接驳位 + //SecondFloorPoint secondFloorPoint = new(_host, 2); + //secondFloorPoint.StartPoint(); - ////二层AGV - SecondFloorAGV secondFloorAGV = new(_host, 2); - secondFloorAGV.StartPoint(); + //////二层AGV + //SecondFloorAGV secondFloorAGV = new(_host, 2); + //secondFloorAGV.StartPoint(); - //二楼线体 - SecondFloorLine secondFloorLine = new(_host, 2); - secondFloorLine.StartPoint(); + ////二楼线体 + //SecondFloorLine secondFloorLine = new(_host, 2); + //secondFloorLine.StartPoint(); - //三层接驳位 - ThirdFloorPoint thirdFloorPoint = new(_host, 3); - thirdFloorPoint.StartPoint(); + ////三层接驳位 + //ThirdFloorPoint thirdFloorPoint = new(_host, 3); + //thirdFloorPoint.StartPoint(); - // 三层AGV - ThirdFloorAGV thirdFloorAGV = new(_host, 3); - thirdFloorAGV.StartPoint(); + //// 三层AGV + //ThirdFloorAGV thirdFloorAGV = new(_host, 3); + //thirdFloorAGV.StartPoint(); - //四楼接驳位 - FourthFloorPoint fourthFloorPoint = new FourthFloorPoint(_host, 4); - fourthFloorPoint.StartPoint(); + ////四楼接驳位 + //FourthFloorPoint fourthFloorPoint = new FourthFloorPoint(_host, 4); + //fourthFloorPoint.StartPoint(); - //五层接驳位 - FiveFloorPoint fifthFloorPoint = new(_host, 5); - fifthFloorPoint.StartPoint(); + ////五层接驳位 + //FiveFloorPoint fifthFloorPoint = new(_host, 5); + //fifthFloorPoint.StartPoint(); //五层CTU FiveFloorCTU fiveFloorCTU = new(_host, 5); fiveFloorCTU.StartPoint(); - //五层AGV - FiveFloorAGV fifthFloorAGV = new(_host, 5); - fifthFloorAGV.StartPoint(); + ////五层AGV + //FiveFloorAGV fifthFloorAGV = new(_host, 5); + //fifthFloorAGV.StartPoint(); - ////背负式Agv - FiveFloorBearAgv fiveFloorBearAgv = new(_host, 5); - fiveFloorBearAgv.StartPoint(); + //////背负式Agv + //FiveFloorBearAgv fiveFloorBearAgv = new(_host, 5); + //fiveFloorBearAgv.StartPoint(); } catch (Exception ex) { diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs index 457815b..be1df5a 100644 --- a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs +++ b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs @@ -149,7 +149,7 @@ namespace Khd.Core.Wcs.Wcs } else { - if (task.taskType == StaticTaskType.FiveAccessoryOut || task.taskType == StaticTaskType.FiveAccessoryRemove) + if (task.taskType == StaticTaskType.FiveAccessoryOut || task.taskType == StaticTaskType.FiveAccessoryRemove || task.taskType == StaticTaskType.FiveAccessoryStorage) { dbContext.WcsTask.Where(t => t.objid == task.objid).Delete(); #region 暂不使用-因为删除之后ctu无法知道还有几个箱子///如果已经开始入库,还有出库任务,删除出库任务