From 3cf123647b3221b12ec071ab1869e997b9e38799 Mon Sep 17 00:00:00 2001 From: icewint Date: Sat, 15 Jun 2024 10:52:45 +0800 Subject: [PATCH] =?UTF-8?q?[important]=E7=BB=9F=E4=B8=80=E5=92=8CPLC?= =?UTF-8?q?=E9=80=9A=E8=AE=AF=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HisGetData/Pick1StandOutC3.cs | 26 ++++++++++++++----- .../HisGetData/Pick2StandOutC4.cs | 14 +++++----- .../HisGetData/PickStandGetData.cs | 8 +++--- .../HisGetData/PickStandP5.cs | 14 +++++----- 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs index cdd8a02..7969e02 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs @@ -22,10 +22,17 @@ public class Pick1StandOutC3(ConveyOperation conveyOperation, DataBaseData dataB private readonly DataBaseData _dataBaseData = dataBaseData; private readonly AppConveyTaskDao _conveyTaskDao = conveyTaskDao; + /// + /// 读码失败 + /// + /// + /// + /// + /// public void ReadFail(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = _dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move); // 读码失败，移栽进环线继续 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.LeftMove); // 读码失败，移栽进拣选站台 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -36,6 +43,13 @@ public class Pick1StandOutC3(ConveyOperation conveyOperation, DataBaseData dataB return; } + /// + /// 读码成功 + /// + /// + /// + /// + /// public void ReadSuccess(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = _dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; // 获取一个 plcId @@ -48,7 +62,7 @@ public class Pick1StandOutC3(ConveyOperation conveyOperation, DataBaseData dataB if (!dirs.Contains(direction)) { ConsoleLog.Warning($"【警告】一区出口：{area} 箱码：{msg} 方向：{direction} 方向不正确，允许的方向为：{routerDirection}"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -64,7 +78,7 @@ public class Pick1StandOutC3(ConveyOperation conveyOperation, DataBaseData dataB if (conveyTasks == default) { ConsoleLog.Warning($"【警告】一区出口：{area} 箱码：{msg} 查询任务失败，和服务器连接中断"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move); // 连接中断去往拣选站台 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); // 连接中断一区环线运行 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -77,7 +91,7 @@ public class Pick1StandOutC3(ConveyOperation conveyOperation, DataBaseData dataB if (conveyTasks.Count < 1) { ConsoleLog.Warning($"【警告】一区出口：{area} 箱码：{msg} 无拣选任务"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -92,7 +106,7 @@ public class Pick1StandOutC3(ConveyOperation conveyOperation, DataBaseData dataB if(pickStand1Task == default) // 不存在 1 号台任务 { ConsoleLog.Warning($"【警告】一区出口：{area} 箱码：{msg} 不存在一号台任务，环线运行"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move); // 不存在一号台任务 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); // 不存在一号台任务 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -105,7 +119,7 @@ public class Pick1StandOutC3(ConveyOperation conveyOperation, DataBaseData dataB else { ConsoleLog.Info($"一区出口：{area} 箱码：{msg} 存在一号台任务，移栽 1 号站台"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Router_1); // 存在一号台任务 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.LeftMove); // 存在一号台任务 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs index 2a707fe..1e1a1f2 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs @@ -32,7 +32,7 @@ public class Pick2StandOutC4(ConveyOperation conveyOperation, DataBaseData dataB public void ReadFail(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = _dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); // 读码失败，大环线继续 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); // 读码失败，环线继续，进入拣选一区 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -62,7 +62,7 @@ public class Pick2StandOutC4(ConveyOperation conveyOperation, DataBaseData dataB if (!dirs.Contains(direction)) { ConsoleLog.Warning($"【警告】二区出口：{area} 箱码：{msg} 方向：{direction} 方向不正确，允许的方向为：{routerDirection}"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -91,7 +91,7 @@ public class Pick2StandOutC4(ConveyOperation conveyOperation, DataBaseData dataB if (conveyTasks.Count < 1) { ConsoleLog.Warning($"【警告】二区出口：{area} 箱码：{msg} 无拣选任务"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -115,8 +115,8 @@ public class Pick2StandOutC4(ConveyOperation conveyOperation, DataBaseData dataB } if (exists) // 存在该区域任务 1~5 站台（pick1 区域） { - ConsoleLog.Info($"二区出口：{area} 箱码：{msg} 存在 1~5 站台任务"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); + ConsoleLog.Info($"二区出口：{area} 箱码：{msg} 存在 1~5 站台任务，前往拣选一区"); + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -133,7 +133,7 @@ public class Pick2StandOutC4(ConveyOperation conveyOperation, DataBaseData dataB if (pickStand6Task == default) // 不存在 6 号台任务 { ConsoleLog.Warning($"【警告】二区出口：{area} 箱码：{msg} 不存在6号台任务，环线运行"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move); // 不存在6号台任务 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); // 不存在6号台任务 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -146,7 +146,7 @@ public class Pick2StandOutC4(ConveyOperation conveyOperation, DataBaseData dataB else { ConsoleLog.Info($"二区出口：{area} 箱码：{msg} 存在6号台任务，移栽 6 号站台"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Router_1); // 存在6号台任务 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.LeftMove); // 存在6号台任务 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandGetData.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandGetData.cs index 2e3afc2..ddea70e 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandGetData.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandGetData.cs @@ -16,7 +16,7 @@ namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData; /// /// /// -/// P1、P2、P3、P4、P6、P7、P8 +/// P1、P2、P3、P4、P6、P7、P8、P9 /// public class PickStandGetData(ConveyOperation conveyOperation, DataBaseData dataBaseData, AppConveyTaskDao conveyTaskDao) : IBaseGetData { @@ -35,7 +35,7 @@ public class PickStandGetData(ConveyOperation conveyOperation, DataBaseData data public void ReadFail(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = _dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move); // 读码失败，移栽 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.LeftMove); // 读码失败，移栽进拣选站台 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -81,7 +81,7 @@ public class PickStandGetData(ConveyOperation conveyOperation, DataBaseData data if (conveyTasks == default) { ConsoleLog.Warning($"【警告】拣选站台：{area} 箱码：{msg} 查询任务失败，和服务器连接中断"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move); // 连接中断去往拣选区 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.LeftMove); // 连接中断去往拣选区 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -107,7 +107,7 @@ public class PickStandGetData(ConveyOperation conveyOperation, DataBaseData data var conveyTask = conveyTasks.First(); // 有拣选任务 ConsoleLog.Success($"拣选站台：{area} 箱码：{msg} 存在拣选任务"); - ConveyPLCTask plcTaskOk = new(plcId, (short)ConveyRouterEnum.Go); + ConveyPLCTask plcTaskOk = new(plcId, (short)ConveyRouterEnum.LeftMove); string errTextOk = _conveyOperation.WriteTask(area, plcTaskOk); if (string.IsNullOrEmpty(errTextOk)) { diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandP5.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandP5.cs index 76676ef..4516006 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandP5.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandP5.cs @@ -32,7 +32,7 @@ public class PickStandP5(ConveyOperation conveyOperation, DataBaseData dataBaseD public void ReadFail(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = _dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move); // 读码失败，移栽 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.LeftMove); // 读码失败，移栽进站台 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -62,7 +62,7 @@ public class PickStandP5(ConveyOperation conveyOperation, DataBaseData dataBaseD if (!dirs.Contains(direction)) { ConsoleLog.Warning($"【警告】拣选站台：{area} 箱码：{msg} 方向：{direction} 方向不正确，允许的方向为：{routerDirection}"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -78,7 +78,7 @@ public class PickStandP5(ConveyOperation conveyOperation, DataBaseData dataBaseD if (conveyTasks == default) { ConsoleLog.Warning($"【警告】拣选站台：{area} 箱码：{msg} 查询任务失败，和服务器连接中断"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move); // 连接中断去往拣选区 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.LeftMove); // 连接中断去往拣选区 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -91,7 +91,7 @@ public class PickStandP5(ConveyOperation conveyOperation, DataBaseData dataBaseD if (conveyTasks.Count < 1) { ConsoleLog.Warning($"【警告】拣选站台：{area} 箱码：{msg} 无拣选任务"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Router_2); // 右移栽出环线 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); // 右移栽出环线 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -102,11 +102,11 @@ public class PickStandP5(ConveyOperation conveyOperation, DataBaseData dataBaseD return; } /* 判断有没有这个站台的任务 */ - var conveyTask = conveyTasks.Find(f => f.Location == area); + var conveyTask = conveyTasks.Find(f => f.Location == area); // P5 if(conveyTask != default) // 存在任务 { ConsoleLog.Success($"拣选站台：{area} 箱码：{msg} 存在拣选任务"); - ConveyPLCTask plcTaskOk = new(plcId, (short)ConveyRouterEnum.Go); + ConveyPLCTask plcTaskOk = new(plcId, (short)ConveyRouterEnum.LeftMove); string errTextOk = _conveyOperation.WriteTask(area, plcTaskOk); if (string.IsNullOrEmpty(errTextOk)) { @@ -153,7 +153,7 @@ public class PickStandP5(ConveyOperation conveyOperation, DataBaseData dataBaseD else { ConsoleLog.Warning($"【警告】拣选站台：{area} 箱码：{msg} 无 pick2 区域拣选任务"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Router_2); // 右移栽出环线 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); // 右移栽出环线 string errText = _conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) {