From 33d1911609b08110413ff2522f4212eeb893f5f7 Mon Sep 17 00:00:00 2001 From: icewint Date: Tue, 13 Aug 2024 16:35:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/WmsService/WmsTaskService.cs | 3 +- .../CirculationTask/Convey/ReadScanCode.cs | 35 ------------------- .../HisGetData/StackerInErr.cs | 2 +- .../HisGetData/StackerInSpliter.cs | 2 +- .../PublishProfiles/FolderProfile.pubxml.user | 4 +-- WcsMain/StartAction/LoadingRunningData.cs | 2 +- WcsMain/WcsMain.csproj.user | 2 +- WcsMain/appsettings.json | 8 ++--- 8 files changed, 11 insertions(+), 47 deletions(-) diff --git a/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs b/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs index f3d6880..29ea4ea 100644 --- a/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs +++ b/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs @@ -28,7 +28,7 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa /// public WmsApiResponse> GetStackerTask(List request) { - if (request.Count < 1) return WmsApiResponseFactory.RequestErr>(null, "请求的任务数量为 0"); + if (request.Count < 1 || request.Count > 20) return WmsApiResponseFactory.RequestErr>(null, "请求的任务数量只能在 1 至 20 范围内"); List errRequest = []; // 存放错误的请求 /* 插入库存信息 */ // ---- 库存由WMS管理，数据库表也无需操作 List wmsTasks = []; @@ -70,7 +70,6 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa errRequest.Add(errorRequest); } } - /* 构造任务 */ wmsTasks.Add(new AppWmsTask() { diff --git a/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs b/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs index 308b4d4..4fb4b26 100644 --- a/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs +++ b/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs @@ -42,7 +42,6 @@ public class ReadScanCode(AppRouterMethodDao routerMethodDao, ConveyOperation co return; // 不读了，估计网断了 } if (scanOk != (short)TrueFalseEnum.TRUE) { return; } - if (!CheckCode(code, router.Area ?? "")) { return; } string clearErrText = conveyOperation.ClearScanStatus(router.Area); if (!string.IsNullOrEmpty(clearErrText)) { @@ -60,38 +59,4 @@ public class ReadScanCode(AppRouterMethodDao routerMethodDao, ConveyOperation co return true; } - - Dictionary? codeData; - DateTime firstTime = DateTime.Now; - - private bool CheckCode(string codeIn, string area) - { - string code = codeIn + area; - if(codeData == default) codeData = []; - if ((DateTime.Now - firstTime).TotalSeconds > 5.5) - { - codeData.Clear(); - } - firstTime = DateTime.Now; - if (!codeData.TryGetValue(code, out DateTime value)) - { - value = DateTime.Now; - codeData.Add(code, value); - return true; - } - DateTime dateTime = value; - TimeSpan timeSpan = DateTime.Now - dateTime; - if(timeSpan.TotalSeconds > 5) - { - codeData[code] = dateTime; - return true; - } - return false; - } - - - - - - } diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs index 54c4f6d..a987f8b 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs @@ -98,7 +98,7 @@ public class StackerInErr(ConveyOperation conveyOperation, DataBaseData dataBase ConsoleLog.Warning($"【警告】入库分流：{area} 箱码：{msg}，写入PLC失败，{plcTask}，信息：{errText}"); return; } - ConveyRouterEnum router = (ConveyRouterEnum)(6 - locationDetail.TunnelNo ?? 0); + ConveyRouterEnum router = (ConveyRouterEnum)(locationDetail.TunnelNo ?? 0); ConsoleLog.Success($"入库分流：{area} 箱码：{msg} 终点：{wcsTask.Destination} 巷道：{locationDetail.TunnelNo}"); ConveyPLCTask plcTaskOk = new(plcId, (short)router); string errTextOk = conveyOperation.WriteTask(area, plcTaskOk); diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs index 16f7fd0..93212ba 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs @@ -97,7 +97,7 @@ public class StackerInSpliter(ConveyOperation conveyOperation, DataBaseData data ConsoleLog.Warning($"【警告】入库分流：{area} 箱码：{msg}，写入PLC失败，{plcTask}，信息：{errText}"); return; } - ConveyRouterEnum router = (ConveyRouterEnum)(6 - locationDetail.TunnelNo ?? 0); + ConveyRouterEnum router = (ConveyRouterEnum)(locationDetail.TunnelNo ?? 0); ConsoleLog.Success($"入库分流：{area} 箱码：{msg} 终点：{wcsTask.Destination} 巷道：{locationDetail.TunnelNo}"); ConveyPLCTask plcTaskOk = new(plcId, (short)router); string errTextOk = conveyOperation.WriteTask(area, plcTaskOk); diff --git a/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user b/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user index 567fc04..f559023 100644 --- a/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - <_PublishTargetUrl>F:\AProject\A菲达宝开项目\2024-02_隆成立库\应用程序\wcs_serve_cs\wcs_serve_cs\bin\Release\net8.0\publish\ - True|2024-03-29T07:42:25.2332590Z;False|2024-03-29T15:41:29.1754215+08:00;True|2024-03-29T15:21:55.1373612+08:00;True|2024-03-28T09:54:32.8968372+08:00;True|2024-01-28T15:05:36.1055501+08:00;True|2024-01-28T15:02:06.6945727+08:00;True|2024-01-28T14:56:23.0500171+08:00;True|2024-01-20T20:29:00.5459863+08:00; + <_PublishTargetUrl>F:\A开发项目\A菲达宝开项目\2024-05_苏州卡特\应用程序\WcsService\WcsMain\bin\Release\net8.0\publish\ + True|2024-08-07T02:16:37.1827604Z||;True|2024-03-29T15:42:25.2332590+08:00||;False|2024-03-29T15:41:29.1754215+08:00||;True|2024-03-29T15:21:55.1373612+08:00||;True|2024-03-28T09:54:32.8968372+08:00||;True|2024-01-28T15:05:36.1055501+08:00||;True|2024-01-28T15:02:06.6945727+08:00||;True|2024-01-28T14:56:23.0500171+08:00||;True|2024-01-20T20:29:00.5459863+08:00||; \ No newline at end of file diff --git a/WcsMain/StartAction/LoadingRunningData.cs b/WcsMain/StartAction/LoadingRunningData.cs index 993e305..4d23040 100644 --- a/WcsMain/StartAction/LoadingRunningData.cs +++ b/WcsMain/StartAction/LoadingRunningData.cs @@ -106,7 +106,7 @@ public class LoadingRunningData IsAutoCloseConnection = true, ConfigId = "0", DbType = DbType.MySql, - ConnectionString = wcsDataBaseConnectString + ConnectionString = wcsDataBaseConnectString, }); } diff --git a/WcsMain/WcsMain.csproj.user b/WcsMain/WcsMain.csproj.user index 2add57c..c577a93 100644 --- a/WcsMain/WcsMain.csproj.user +++ b/WcsMain/WcsMain.csproj.user @@ -1,7 +1,7 @@  - FolderProfile + F:\A开发项目\A菲达宝开项目\2024-05_苏州卡特\应用程序\WcsService\WcsMain\Properties\PublishProfiles\FolderProfile.pubxml ApiControllerEmptyScaffolder root/Common/Api diff --git a/WcsMain/appsettings.json b/WcsMain/appsettings.json index d992eb4..cc39f90 100644 --- a/WcsMain/appsettings.json +++ b/WcsMain/appsettings.json @@ -7,17 +7,17 @@ }, "AllowedHosts": "*", "Settings": { - "DBMysql": "server=192.168.103.200;port=3306;user=developer;password=developer;database=wcs_main;", + "DBMysql": "server=10.90.36.71;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;", "ApplicationConfig": { - "ApiOnly": true, + "ApiOnly": false, "Language": "zh-CN" }, "UseUrls": [ "http://*:18990" ] - + } }