From 14ff462b79574c50ec7a017790393842f6e5d4b8 Mon Sep 17 00:00:00 2001 From: icewint Date: Fri, 6 Sep 2024 16:20:09 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E4=BA=8C=E5=8C=BA?= =?UTF-8?q?=E7=8E=AF=E7=BA=BF=E4=B8=8D=E8=B5=B0=E4=B8=8A=E5=B1=82=E5=9B=9E?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E9=97=AE=E9=A2=98=202=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=86=E5=8C=BA=E6=AF=94=E4=BE=8B=E6=95=B0=E5=80=BC?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WcsMain/AppEntity/SystemData/AppConfigEntity.cs | 2 +- .../Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs | 6 +++--- .../Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs | 2 +- .../Properties/PublishProfiles/FolderProfile.pubxml.user | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WcsMain/AppEntity/SystemData/AppConfigEntity.cs b/WcsMain/AppEntity/SystemData/AppConfigEntity.cs index 1bdffb3..27d8e88 100644 --- a/WcsMain/AppEntity/SystemData/AppConfigEntity.cs +++ b/WcsMain/AppEntity/SystemData/AppConfigEntity.cs @@ -91,5 +91,5 @@ public class AppConfigEntity /// 去往 pick2 箱子的比率 /// [ConfigKey("Pick2Lv")] - public int Pick2Lv { get; set; } + public string? Pick2Lv { get; set; } } diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs index 67dd37b..1ffef13 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs @@ -58,7 +58,7 @@ public class Pick2StandOutC4(ConveyOperation conveyOperation, DataBaseData dataB if (!postResult.IsSend || postResult.ResponseEntity == default) { ConsoleLog.Exception($"【异常】拣选站台出口：{area} 箱码:{msg} 请求入库发生异常，异常信息：{postResult.RequestException}"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); // 连接中断一区环线运行 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); // 连接中断环线运行 string errText = conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -72,7 +72,7 @@ public class Pick2StandOutC4(ConveyOperation conveyOperation, DataBaseData dataB { ConsoleLog.Success($"拣选站台出口：{area} 箱码:{msg} 请求入库成功 {postResult.ResponseEntity.Message}"); // 给通行信号，同时将未完成的拣选任务全部结束 - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.RightMove); + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move); string errText = conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { @@ -102,7 +102,7 @@ public class Pick2StandOutC4(ConveyOperation conveyOperation, DataBaseData dataB if (conveyTasks == default) { ConsoleLog.Warning($"【警告】二区出口：{area} 箱码：{msg} 查询任务失败，和服务器连接中断"); - ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); // 连接中断去往拣选区 1 + ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go); // 连接中断环线运行 string errText = conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs index 64b26c6..26ddcec 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs @@ -132,7 +132,7 @@ public class StackerOutC1(ConveyOperation conveyOperation, DataBaseData dataBase ConsoleLog.Info($"出库分流：{area} 箱码：{msg} 存在 1~5 站台任务且存在 6~9 区域任务"); Random random = new(); var id = random.Next(0, 100); - ConveyPLCTask plcTask = new(plcId, id < CommonData.AppConfig.Pick2Lv ? (short)ConveyRouterEnum.Move : (short)ConveyRouterEnum.Go); + ConveyPLCTask plcTask = new(plcId, id < Convert.ToInt32(CommonData.AppConfig.Pick2Lv) ? (short)ConveyRouterEnum.Move : (short)ConveyRouterEnum.Go); string errText = conveyOperation.WriteTask(area, plcTask); if (string.IsNullOrEmpty(errText)) { diff --git a/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user b/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user index 98f5fac..34316f5 100644 --- a/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>F:\A开发项目\A菲达宝开项目\2024-05_苏州卡特\应用程序\WcsService\WcsMain\bin\Release\net8.0\publish\ - True|2024-08-28T07:48:21.8213718Z||;True|2024-08-28T14:10:05.4634419+08:00||;True|2024-08-15T11:33:38.2722633+08:00||;True|2024-08-15T10:25:38.1970709+08:00||;True|2024-08-15T09:10:35.3249477+08:00||;True|2024-08-15T08:54:49.3636124+08:00||;True|2024-08-14T10:23:19.0348163+08:00||;True|2024-08-07T10:16:37.1827604+08:00||;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||; + True|2024-09-06T08:18:45.0903975Z||;True|2024-09-06T13:30:31.9024648+08:00||;True|2024-09-06T13:07:27.3235992+08:00||;True|2024-08-28T15:48:21.8213718+08:00||;True|2024-08-28T14:10:05.4634419+08:00||;True|2024-08-15T11:33:38.2722633+08:00||;True|2024-08-15T10:25:38.1970709+08:00||;True|2024-08-15T09:10:35.3249477+08:00||;True|2024-08-15T08:54:49.3636124+08:00||;True|2024-08-14T10:23:19.0348163+08:00||;True|2024-08-07T10:16:37.1827604+08:00||;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