diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/LoginGetData.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/LoginGetData.cs index 31cf38a..59cf9f3 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/LoginGetData.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/LoginGetData.cs @@ -34,20 +34,8 @@ public class LoginGetData(WmsWebApiPost wmsWebApiPost) : IBaseGetData /// public void ReadSuccess(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { - (string code, string direction) = msg.FormatDir(); - /* 判断方向是否正确 */ - string? routerDirection = routerMethodData.AllowDirection; - if(!string.IsNullOrEmpty(routerDirection)) - { - string[] dirs = routerDirection.Split(','); - if(!dirs.Contains(direction)) - { - ConsoleLog.Warning($"【警告】注册口:{area} 箱码:{msg} 方向:{direction} 方向不正确,允许的方向为:{routerDirection}"); - return; - } - } /* 发送 WMS 请求入库 */ - ApplyInRequest applyInRequest = new(area, code, msg); + ApplyInRequest applyInRequest = new(area, msg, msg); var postResult = wmsWebApiPost.HttpPost(applyInRequest, CommonData.AppApiBaseInfos.GetAddress("ApplyEnterApiAddress") ?? ""); if(!postResult.IsSend || postResult.ResponseEntity == default) { diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs index 0f881ed..b216fec 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs @@ -49,28 +49,8 @@ public class Pick1StandOutC3(ConveyOperation conveyOperation, DataBaseData dataB public void ReadSuccess(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; // 获取一个 plcId - (string code, string direction) = msg.FormatDir(); - /* 判断方向是否正确 */ - string? routerDirection = routerMethodData.AllowDirection; - if (!string.IsNullOrEmpty(routerDirection)) - { - string[] dirs = routerDirection.Split(','); - if (!dirs.Contains(direction)) - { - ConsoleLog.Warning($"【警告】一区出口:{area} 箱码:{msg} 方向:{direction} 方向不正确,允许的方向为:{routerDirection}"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); - string errText = conveyOperation.WriteTask(area, plcTask); - if (string.IsNullOrEmpty(errText)) - { - ConsoleLog.Success($"一区出口:{area} 箱码:{msg},写入PLC成功,{plcTask}"); - return; - } - ConsoleLog.Warning($"【警告】一区出口:{area} 箱码:{msg},写入PLC失败,{plcTask},信息:{errText}"); - return; - } - } /* 判断条码有没有拣选任务 */ - List? conveyTasks = conveyTaskDao.Query(new AppConveyTask { VehicleNo = code, TaskStatus = (int)ConveyTaskStatusEnum.create }); + List? conveyTasks = conveyTaskDao.Query(new AppConveyTask { VehicleNo = msg, TaskStatus = (int)ConveyTaskStatusEnum.create }); if (conveyTasks == default) { ConsoleLog.Warning($"【警告】一区出口:{area} 箱码:{msg} 查询任务失败,和服务器连接中断"); diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs index 873ea33..81b2512 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs @@ -50,28 +50,8 @@ public class Pick2StandOutC4(ConveyOperation conveyOperation, DataBaseData dataB public void ReadSuccess(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; // 获取一个 plcId - (string code, string direction) = msg.FormatDir(); - /* 判断方向是否正确 */ - string? routerDirection = routerMethodData.AllowDirection; - if (!string.IsNullOrEmpty(routerDirection)) - { - string[] dirs = routerDirection.Split(','); - if (!dirs.Contains(direction)) - { - ConsoleLog.Warning($"【警告】二区出口:{area} 箱码:{msg} 方向:{direction} 方向不正确,允许的方向为:{routerDirection}"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); - string errText = conveyOperation.WriteTask(area, plcTask); - if (string.IsNullOrEmpty(errText)) - { - ConsoleLog.Success($"二区出口:{area} 箱码:{msg},写入PLC成功,{plcTask}"); - return; - } - ConsoleLog.Warning($"【警告】二区出口:{area} 箱码:{msg},写入PLC失败,{plcTask},信息:{errText}"); - return; - } - } /* 判断条码有没有拣选任务 */ - List? conveyTasks = conveyTaskDao.Query(new AppConveyTask { VehicleNo = code, TaskStatus = (int)ConveyTaskStatusEnum.create }); + List? conveyTasks = conveyTaskDao.Query(new AppConveyTask { VehicleNo = msg, TaskStatus = (int)ConveyTaskStatusEnum.create }); if (conveyTasks == default) { ConsoleLog.Warning($"【警告】二区出口:{area} 箱码:{msg} 查询任务失败,和服务器连接中断"); diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandGetData.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandGetData.cs index cfae820..507d5eb 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandGetData.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandGetData.cs @@ -51,28 +51,8 @@ public class PickStandGetData(ConveyOperation conveyOperation, DataBaseData data public void ReadSuccess(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; // 获取一个 plcId - (string code, string direction) = msg.FormatDir(); - /* 判断方向是否正确 */ - string? routerDirection = routerMethodData.AllowDirection; - if (!string.IsNullOrEmpty(routerDirection)) - { - string[] dirs = routerDirection.Split(','); - if (!dirs.Contains(direction)) - { - ConsoleLog.Warning($"【警告】拣选站台:{area} 箱码:{msg} 方向:{direction} 方向不正确,允许的方向为:{routerDirection}"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); - string errText = conveyOperation.WriteTask(area, plcTask); - if (string.IsNullOrEmpty(errText)) - { - ConsoleLog.Success($"拣选站台:{area} 箱码:{msg},写入PLC成功,{plcTask}"); - return; - } - ConsoleLog.Warning($"【警告】拣选站台:{area} 箱码:{msg},写入PLC失败,{plcTask},信息:{errText}"); - return; - } - } /* 判断条码有没有这个拣选站台的拣选任务 */ - List? conveyTasks = conveyTaskDao.Query(new AppConveyTask { VehicleNo = code, TaskStatus = (int)ConveyTaskStatusEnum.create, Location = area }); + List? conveyTasks = conveyTaskDao.Query(new AppConveyTask { VehicleNo = msg, TaskStatus = (int)ConveyTaskStatusEnum.create, Location = area }); if (conveyTasks == default) { ConsoleLog.Warning($"【警告】拣选站台:{area} 箱码:{msg} 查询任务失败,和服务器连接中断"); diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandP5.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandP5.cs index b0c5741..51db5c3 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandP5.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandP5.cs @@ -49,28 +49,8 @@ public class PickStandP5(ConveyOperation conveyOperation, DataBaseData dataBaseD public void ReadSuccess(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; // 获取一个 plcId - (string code, string direction) = msg.FormatDir(); - /* 判断方向是否正确 */ - string? routerDirection = routerMethodData.AllowDirection; - if (!string.IsNullOrEmpty(routerDirection)) - { - string[] dirs = routerDirection.Split(','); - if (!dirs.Contains(direction)) - { - ConsoleLog.Warning($"【警告】拣选站台:{area} 箱码:{msg} 方向:{direction} 方向不正确,允许的方向为:{routerDirection}"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); - string errText = conveyOperation.WriteTask(area, plcTask); - if (string.IsNullOrEmpty(errText)) - { - ConsoleLog.Success($"拣选站台:{area} 箱码:{msg},写入PLC成功,{plcTask}"); - return; - } - ConsoleLog.Warning($"【警告】拣选站台:{area} 箱码:{msg},写入PLC失败,{plcTask},信息:{errText}"); - return; - } - } /* 判断条码有没有拣选任务 */ - List? conveyTasks = conveyTaskDao.Query(new AppConveyTask { VehicleNo = code, TaskStatus = (int)ConveyTaskStatusEnum.create}); + List? conveyTasks = conveyTaskDao.Query(new AppConveyTask { VehicleNo = msg, TaskStatus = (int)ConveyTaskStatusEnum.create}); if (conveyTasks == default) { ConsoleLog.Warning($"【警告】拣选站台:{area} 箱码:{msg} 查询任务失败,和服务器连接中断"); diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs index 633c6b9..68d928b 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs @@ -47,28 +47,8 @@ public class StackerInErr(ConveyOperation conveyOperation, DataBaseData dataBase public void ReadSuccess(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; // 获取一个 plcId - (string code, string direction) = msg.FormatDir(); - /* 判断方向是否正确 */ - string? routerDirection = routerMethodData.AllowDirection; - if (!string.IsNullOrEmpty(routerDirection)) - { - string[] dirs = routerDirection.Split(','); - if (!dirs.Contains(direction)) - { - ConsoleLog.Warning($"【警告】入库异常口:{area} 箱码:{msg} 方向:{direction} 方向不正确,允许的方向为:{routerDirection}"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.WcsErr); - string errText = conveyOperation.WriteTask(area, plcTask); - if (string.IsNullOrEmpty(errText)) - { - ConsoleLog.Success($"入库异常口:{area} 箱码:{msg},写入PLC成功,{plcTask}"); - return; - } - ConsoleLog.Warning($"【警告】入库异常口:{area} 箱码:{msg},写入PLC失败,{plcTask},信息:{errText}"); - return; - } - } /* 查询任务 */ - List? wcsTasks = wcsTaskDao.Select(new AppWcsTask { VehicleNo = code, TaskStatus = (int)WcsTaskStatusEnum.create }); + List? wcsTasks = wcsTaskDao.Select(new AppWcsTask { VehicleNo = msg, TaskStatus = (int)WcsTaskStatusEnum.create }); if (wcsTasks == default) { // 数据库服务器连接失败 diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs index f6a6492..3da0087 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs @@ -51,28 +51,8 @@ public class StackerInSpliter(ConveyOperation conveyOperation, DataBaseData data public void ReadSuccess(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; // 获取一个 plcId - (string code, string direction) = msg.FormatDir(); - /* 判断方向是否正确 */ - string? routerDirection = routerMethodData.AllowDirection; - if (!string.IsNullOrEmpty(routerDirection)) - { - string[] dirs = routerDirection.Split(','); - if (!dirs.Contains(direction)) - { - ConsoleLog.Warning($"【警告】入库分流:{area} 箱码:{msg} 方向:{direction} 方向不正确,允许的方向为:{routerDirection}"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.WcsErr); - string errText = conveyOperation.WriteTask(area, plcTask); - if (string.IsNullOrEmpty(errText)) - { - ConsoleLog.Success($"入库分流:{area} 箱码:{msg},写入PLC成功,{plcTask}"); - return; - } - ConsoleLog.Warning($"【警告】入库分流:{area} 箱码:{msg},写入PLC失败,{plcTask},信息:{errText}"); - return; - } - } /* 查询任务 */ - List? wcsTasks = wcsTaskDao.Select(new AppWcsTask { VehicleNo = code, TaskStatus = (int)WcsTaskStatusEnum.create }); + List? wcsTasks = wcsTaskDao.Select(new AppWcsTask { VehicleNo = msg, TaskStatus = (int)WcsTaskStatusEnum.create }); if(wcsTasks == default) { // 数据库服务器连接失败 diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs index 6a7e2c5..401a713 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs @@ -49,28 +49,8 @@ public class StackerOutC1(ConveyOperation conveyOperation, DataBaseData dataBase public void ReadSuccess(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; // 获取一个 plcId - (string code, string direction) = msg.FormatDir(); - /* 判断方向是否正确 */ - string? routerDirection = routerMethodData.AllowDirection; - if (!string.IsNullOrEmpty(routerDirection)) - { - string[] dirs = routerDirection.Split(','); - if (!dirs.Contains(direction)) - { - ConsoleLog.Warning($"【警告】出库分流:{area} 箱码:{msg} 方向:{direction} 方向不正确,允许的方向为:{routerDirection}"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move); - string errText = conveyOperation.WriteTask(area, plcTask); - if (string.IsNullOrEmpty(errText)) - { - ConsoleLog.Success($"出库分流:{area} 箱码:{msg},写入PLC成功,{plcTask}"); - return; - } - ConsoleLog.Warning($"【警告】出库分流:{area} 箱码:{msg},写入PLC失败,{plcTask},信息:{errText}"); - return; - } - } /* 判断条码有没有拣选任务 */ - List? conveyTasks = conveyTaskDao.Query(new AppConveyTask { VehicleNo = code, TaskStatus = (int)ConveyTaskStatusEnum.create }); + List? conveyTasks = conveyTaskDao.Query(new AppConveyTask { VehicleNo = msg, TaskStatus = (int)ConveyTaskStatusEnum.create }); if(conveyTasks == default) { ConsoleLog.Warning($"【警告】出库分流:{area} 箱码:{msg} 查询任务失败,和服务器连接中断"); diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutErrC2.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutErrC2.cs index b3dae41..2d3b792 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutErrC2.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutErrC2.cs @@ -35,28 +35,8 @@ public class StackerOutErrC2(ConveyOperation conveyOperation, DataBaseData dataB public void ReadSuccess(string? disPlayName, string msg, string? area, AppRouterMethod routerMethodData) { int plcId = dataBaseData.GetNewPlcTaskId() ?? StaticData.StaticInt.ErrPlcId; // 获取一个 plcId - (string code, string direction) = msg.FormatDir(); - /* 判断方向是否正确 */ - string? routerDirection = routerMethodData.AllowDirection; - if (!string.IsNullOrEmpty(routerDirection)) - { - string[] dirs = routerDirection.Split(','); - if (!dirs.Contains(direction)) - { - ConsoleLog.Warning($"【警告】出库异常口:{area} 箱码:{msg} 方向:{direction} 方向不正确,允许的方向为:{routerDirection}"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move); - string errText = conveyOperation.WriteTask(area, plcTask); - if (string.IsNullOrEmpty(errText)) - { - ConsoleLog.Success($"出库异常口:{area} 箱码:{msg},写入PLC成功,{plcTask}"); - return; - } - ConsoleLog.Warning($"【警告】出库异常口:{area} 箱码:{msg},写入PLC失败,{plcTask},信息:{errText}"); - return; - } - } /* 判断条码有没有拣选任务 */ - List? conveyTasks = conveyTaskDao.Query(new AppConveyTask { VehicleNo = code, TaskStatus = (int)ConveyTaskStatusEnum.create }); + List? conveyTasks = conveyTaskDao.Query(new AppConveyTask { VehicleNo = msg, TaskStatus = (int)ConveyTaskStatusEnum.create }); if (conveyTasks == default) { ConsoleLog.Warning($"【警告】出库异常口:{area} 箱码:{msg} 查询任务失败,和服务器连接中断"); diff --git a/WcsMain/ExtendMethod/StringExtendMethod.cs b/WcsMain/ExtendMethod/StringExtendMethod.cs index 9543725..f1a69eb 100644 --- a/WcsMain/ExtendMethod/StringExtendMethod.cs +++ b/WcsMain/ExtendMethod/StringExtendMethod.cs @@ -64,6 +64,7 @@ public static partial class StringExtendMethod /// /// /// + [Obsolete("客户变更需求,不使用方向码", true)] public static (string code, string direction) FormatDir(this string? value) { if (string.IsNullOrEmpty(value)) return (string.Empty, string.Empty); diff --git a/WcsMain/appsettings.json b/WcsMain/appsettings.json index c9c447d..b5973b5 100644 --- a/WcsMain/appsettings.json +++ b/WcsMain/appsettings.json @@ -8,7 +8,7 @@ "AllowedHosts": "*", "Settings": { "DBMysql": "server=192.168.103.200;port=3306;user=developer;password=developer;database=wcs_main;", - "DBMysqlLocal": "server=192.168.234.128;port=3306;user=developer;password=developer;database=wcs_kate_suzhou;", + "DBMysqlLocal": "server=192.168.234.134;port=3306;user=developer;password=developer;database=wcs_kate_suzhou;", "DBMssql": "Data Source=192.168.142.131;Initial Catalog=wcs;User Id=sa;Password=Sa123;", "DBMssqlLocal": "Data Source=192.168.142.131;Initial Catalog=wcs_stacker;User Id=sa;Password=Sa123;",