提交

WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs

@@ -28,7 +28,7 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa
     /// <returns></returns>
     public WmsApiResponse<List<GetStackerRequest>> GetStackerTask(List<GetStackerRequest> request)
     {
-        if (request.Count < 1) return WmsApiResponseFactory.RequestErr<List<GetStackerRequest>>(null, "请求的任务数量为 0");
+        if (request.Count < 1 || request.Count > 20) return WmsApiResponseFactory.RequestErr<List<GetStackerRequest>>(null, "请求的任务数量只能在 1 至 20 范围内");
         List<GetStackerRequest> errRequest = []; // 存放错误的请求
         /* 插入库存信息 */ // ---- 库存由WMS管理，数据库表也无需操作
         List<AppWmsTask> wmsTasks = [];
@@ -70,7 +70,6 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa
                     errRequest.Add(errorRequest);
                 }
             }
-            
             /* 构造任务 */
             wmsTasks.Add(new AppWmsTask()
             {

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<string, DateTime>? 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;
-    }
-
-
-
-
-
-
 }

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);

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);

WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <_PublishTargetUrl>F:\AProject\A菲达宝开项目\2024-02_隆成立库\应用程序\wcs_serve_cs\wcs_serve_cs\bin\Release\net8.0\publish\</_PublishTargetUrl>
+    <_PublishTargetUrl>F:\A开发项目\A菲达宝开项目\2024-05_苏州卡特\应用程序\WcsService\WcsMain\bin\Release\net8.0\publish\</_PublishTargetUrl>
-    <History>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;</History>
+    <History>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||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

WcsMain/StartAction/LoadingRunningData.cs

@@ -106,7 +106,7 @@ public class LoadingRunningData
             IsAutoCloseConnection = true,
             ConfigId = "0",
             DbType = DbType.MySql,
-            ConnectionString = wcsDataBaseConnectString
+            ConnectionString = wcsDataBaseConnectString,
         });
     }
 

WcsMain/WcsMain.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>F:\A开发项目\A菲达宝开项目\2024-05_苏州卡特\应用程序\WcsService\WcsMain\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/Api</Controller_SelectedScaffolderCategoryPath>
   </PropertyGroup>

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" ]
-    
+
   }
 }