diff --git a/.vs/HighWayIot/FileContentIndex/55e5d5e7-ff09-4d70-b790-a93f9f8d283c.vsidx b/.vs/HighWayIot/FileContentIndex/1f3f919f-1cf2-49fa-9364-33aa2095d8ef.vsidx similarity index 74% rename from .vs/HighWayIot/FileContentIndex/55e5d5e7-ff09-4d70-b790-a93f9f8d283c.vsidx rename to .vs/HighWayIot/FileContentIndex/1f3f919f-1cf2-49fa-9364-33aa2095d8ef.vsidx index cb0015ed..4a93049e 100644 Binary files a/.vs/HighWayIot/FileContentIndex/55e5d5e7-ff09-4d70-b790-a93f9f8d283c.vsidx and b/.vs/HighWayIot/FileContentIndex/1f3f919f-1cf2-49fa-9364-33aa2095d8ef.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/a6e3f2e4-d114-4776-9820-35e4f98a2d40.vsidx b/.vs/HighWayIot/FileContentIndex/a6e3f2e4-d114-4776-9820-35e4f98a2d40.vsidx deleted file mode 100644 index eb868b25..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/a6e3f2e4-d114-4776-9820-35e4f98a2d40.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/c349839e-bedf-449c-a88f-4b342c5db2a7.vsidx b/.vs/HighWayIot/FileContentIndex/c349839e-bedf-449c-a88f-4b342c5db2a7.vsidx deleted file mode 100644 index ee737cfd..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/c349839e-bedf-449c-a88f-4b342c5db2a7.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/e99c244f-59a8-4e0c-a558-a0706f67b6d3.vsidx b/.vs/HighWayIot/FileContentIndex/e99c244f-59a8-4e0c-a558-a0706f67b6d3.vsidx deleted file mode 100644 index b1358814..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/e99c244f-59a8-4e0c-a558-a0706f67b6d3.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 4ae75cb4..e8fa409e 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs index d7327dec..ea7ce686 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -120,15 +120,15 @@ namespace Aucma.Scada.Business MvCodeHelper.RefreshLogMessageEvent += PrintLogInfoMessage; StartPassDown(); - Task.Run(() => - { - Thread.Sleep(6000); - for (int i = 1; i < 2; i++) - { - InStore("B24010181060282920010"); - Thread.Sleep(1000); - } - }); + //Task.Run(() => + //{ + // Thread.Sleep(6000); + // for (int i = 1; i < 2; i++) + // { + // InStore("B24010181060282920010"); + // Thread.Sleep(1000); + // } + //}); } #region delete 2024-01-04出库时堵塞入库 ,不需要堵塞整个库 @@ -284,6 +284,7 @@ namespace Aucma.Scada.Business Task.Run(() => { + Thread.Sleep(2000); while (true) { PassDownFoamTask(); diff --git a/Aucma.Scada.Business/InStoreTaskHandle.cs b/Aucma.Scada.Business/InStoreTaskHandle.cs index 7353c2be..35e4987e 100644 --- a/Aucma.Scada.Business/InStoreTaskHandle.cs +++ b/Aucma.Scada.Business/InStoreTaskHandle.cs @@ -91,7 +91,7 @@ namespace Aucma.Scada.Business Task.Run(() => { - + Thread.Sleep(2000); while (true) { if (_plcDictionary.Count > 0) diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index 1fc39539..2b69e98d 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -311,6 +311,7 @@ namespace Aucma.Scada.Business { Task.Run(() => { + Thread.Sleep(2000); while (true) { PassDownTaskInfo(); @@ -351,16 +352,16 @@ namespace Aucma.Scada.Business } else if (result == 2) { - PrintLogInfoMessage("泡后出库任务下发失败,PLC接收任务未就绪"); + // PrintLogInfoMessage("泡后出库任务下发失败,PLC接收任务未就绪"); } else { - PrintLogInfoMessage($"泡后出库任务:{taskInfo.taskCode};下发失败,请排除PLC连接"); + // PrintLogInfoMessage($"泡后出库任务:{taskInfo.taskCode};下发失败,请排除PLC连接"); } } else { - PrintLogInfoMessage("未获取到需要下发的出库任务"); + // PrintLogInfoMessage("未获取到需要下发的出库任务"); } } catch (Exception ex) diff --git a/Aucma.Scada.Business/OutStoreTaskHandle.cs b/Aucma.Scada.Business/OutStoreTaskHandle.cs index f68a7aa2..400515fa 100644 --- a/Aucma.Scada.Business/OutStoreTaskHandle.cs +++ b/Aucma.Scada.Business/OutStoreTaskHandle.cs @@ -93,6 +93,7 @@ namespace Aucma.Scada.Business { Task.Run(() => { + Thread.Sleep(2000); while (true) { RealTaskInfo task = GetTaskInfoByTaskStatus(appConfig.foamStoreCode).OrderBy(x => x.createTime).FirstOrDefault(); diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index 38f46969..0fa82115 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb index 13c8f23b..5bd10de3 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll index 38f46969..0fa82115 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb index 13c8f23b..5bd10de3 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll index 38f46969..0fa82115 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb index 13c8f23b..5bd10de3 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/config/App.Ini b/Aucma.Scada.UI/bin/Debug/config/App.Ini index f5f552e8..d64d660a 100644 --- a/Aucma.Scada.UI/bin/Debug/config/App.Ini +++ b/Aucma.Scada.UI/bin/Debug/config/App.Ini @@ -9,11 +9,11 @@ stationCode=1006 stationName=ݺ #ǿ -shellStoreCode=XKJCK-001 +shellStoreCode=XKK-001 #ڵ -linerStoreCode=NDJCK-001 +linerStoreCode=NDK-001 #ݺ -foamStoreCode=FPJCK-001 +foamStoreCode=PHK-001 #ݺͱ foamMaterialType=200 @@ -25,4 +25,4 @@ outstoreTaskType=2 #ݺɨIP foamHikRobotIp=169.254.100.169 -searchItems=SC232%SC233%SC234% +searchItems=SC232%SC233%SC234%150%%% diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index b5059b6d..ae5d7bb4 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ