diff --git a/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 b/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 index faf04d37..1adb90b7 100644 Binary files a/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 and b/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Admin.Core/FileContentIndex/173d11fe-0984-445d-984c-2f2c653fbd86.vsidx b/.vs/Admin.Core/FileContentIndex/173d11fe-0984-445d-984c-2f2c653fbd86.vsidx new file mode 100644 index 00000000..822db7ef Binary files /dev/null and b/.vs/Admin.Core/FileContentIndex/173d11fe-0984-445d-984c-2f2c653fbd86.vsidx differ diff --git a/.vs/Admin.Core/FileContentIndex/3684c7a0-3db9-405f-b296-787386477fb0.vsidx b/.vs/Admin.Core/FileContentIndex/3684c7a0-3db9-405f-b296-787386477fb0.vsidx new file mode 100644 index 00000000..a7d76f1a Binary files /dev/null and b/.vs/Admin.Core/FileContentIndex/3684c7a0-3db9-405f-b296-787386477fb0.vsidx differ diff --git a/.vs/Admin.Core/FileContentIndex/46d38404-671d-4ddb-827d-c864a3060ccb.vsidx b/.vs/Admin.Core/FileContentIndex/46d38404-671d-4ddb-827d-c864a3060ccb.vsidx deleted file mode 100644 index 30b2e64c..00000000 Binary files a/.vs/Admin.Core/FileContentIndex/46d38404-671d-4ddb-827d-c864a3060ccb.vsidx and /dev/null differ diff --git a/.vs/Admin.Core/v17/.futdcache.v2 b/.vs/Admin.Core/v17/.futdcache.v2 index 8dcb003e..57b0acc3 100644 Binary files a/.vs/Admin.Core/v17/.futdcache.v2 and b/.vs/Admin.Core/v17/.futdcache.v2 differ diff --git a/.vs/Admin.Core/v17/.suo b/.vs/Admin.Core/v17/.suo index 3e3e4257..5979c5c3 100644 Binary files a/.vs/Admin.Core/v17/.suo and b/.vs/Admin.Core/v17/.suo differ diff --git a/.vs/Admin.Core/v17/fileList.bin b/.vs/Admin.Core/v17/fileList.bin index 8e82f797..e8d4918c 100644 Binary files a/.vs/Admin.Core/v17/fileList.bin and b/.vs/Admin.Core/v17/fileList.bin differ diff --git a/.vs/ProjectEvaluation/admin.core.metadata.v7.bin b/.vs/ProjectEvaluation/admin.core.metadata.v7.bin index 087ac144..3c78cc41 100644 Binary files a/.vs/ProjectEvaluation/admin.core.metadata.v7.bin and b/.vs/ProjectEvaluation/admin.core.metadata.v7.bin differ diff --git a/.vs/ProjectEvaluation/admin.core.projects.v7.bin b/.vs/ProjectEvaluation/admin.core.projects.v7.bin index c9ca9160..80d3d7e7 100644 Binary files a/.vs/ProjectEvaluation/admin.core.projects.v7.bin and b/.vs/ProjectEvaluation/admin.core.projects.v7.bin differ diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_PQInStoreTask_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_PQInStoreTask_Quartz.cs index 64c21985..4cc874a4 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_PQInStoreTask_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_PQInStoreTask_Quartz.cs @@ -123,7 +123,6 @@ namespace Admin.Core.Tasks LogDelegateEvent?.Invoke($"物料条码[{materialBarCode}],任务创建失败,该条码任务记录中已存在，请检查！"); return; } - string message = $"物料[{obj.MaterialName}], 入{spaceInfo.SpaceName},入库中...."; RefreshScanMateriaCodeEvent?.Invoke(materialBarCode, obj.MaterialCode, obj.MaterialName, spaceInfo.SpaceName, message); //刷新界面扫码信息 CreateInStoreTask(spaceInfo, materialBarCode); //创建入库任务 @@ -150,7 +149,7 @@ namespace Admin.Core.Tasks try { string storeCode = Appsettings.app("StoreInfo", "StoreCode");//泡前库code - //生成入库任务依次下发至PLC + //生成入库任务依次下发至PLC RealTaskInfo realTaskInfo = new RealTaskInfo(); realTaskInfo.TaskType = 1; realTaskInfo.TaskCode = System.Guid.NewGuid().ToString("N").Substring(0, 6); diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.i.cache b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.i.cache index d3587e65..1cd5cac6 100644 --- a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.i.cache +++ b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.i.cache @@ -16,5 +16,5 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\App.xaml 420-1296433990 Assets\Styles\DefaultStyles.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\StatisticsPageView.xaml; -True +False diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.i.lref b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.i.lref deleted file mode 100644 index 390163c8..00000000 --- a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.i.lref +++ /dev/null @@ -1,5 +0,0 @@ -D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\obj\Debug\net6.0-windows\GeneratedInternalTypeHelper.g.i.cs -FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\App.xaml;; -FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\Views\IndexPageView.xaml;; -FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\Views\StatisticsPageView.xaml;; - diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.i.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.i.cache index 2be96cfd..9291f07e 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.i.cache +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.i.cache @@ -16,5 +16,5 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml 4121453728964 Assets\Styles\DefaultStyles.xaml;Views\ButtomPageView.xaml;Views\HomeWindowView.xaml;Views\IndexPage.xaml;Views\MainWindow.xaml;Views\PrintToDevView.xaml;Views\SupplementPrintPageView.xaml; -True +False diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.i.lref b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.i.lref deleted file mode 100644 index ea459eac..00000000 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.i.lref +++ /dev/null @@ -1,8 +0,0 @@ -D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\GeneratedInternalTypeHelper.g.i.cs -FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml;; -FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\ButtomPageView.xaml;; -FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\HomeWindowView.xaml;; -FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\IndexPage.xaml;; -FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\PrintToDevView.xaml;; -FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\SupplementPrintPageView.xaml;; -