diff --git a/.vs/Admin.Core/FileContentIndex/7190d5cf-d3d9-4dcd-87f9-85c5b5cc1460.vsidx b/.vs/Admin.Core/FileContentIndex/5afc0e01-ad1f-4370-a2e0-87f8080db93f.vsidx similarity index 62% rename from .vs/Admin.Core/FileContentIndex/7190d5cf-d3d9-4dcd-87f9-85c5b5cc1460.vsidx rename to .vs/Admin.Core/FileContentIndex/5afc0e01-ad1f-4370-a2e0-87f8080db93f.vsidx index f3e90283..cc18bc63 100644 Binary files a/.vs/Admin.Core/FileContentIndex/7190d5cf-d3d9-4dcd-87f9-85c5b5cc1460.vsidx and b/.vs/Admin.Core/FileContentIndex/5afc0e01-ad1f-4370-a2e0-87f8080db93f.vsidx differ diff --git a/.vs/Admin.Core/FileContentIndex/50c6557e-8c61-4df5-b3fc-5196a8404bc0.vsidx b/.vs/Admin.Core/FileContentIndex/7b74bc73-4f84-41a4-9dc2-05e2df24ed19.vsidx similarity index 81% rename from .vs/Admin.Core/FileContentIndex/50c6557e-8c61-4df5-b3fc-5196a8404bc0.vsidx rename to .vs/Admin.Core/FileContentIndex/7b74bc73-4f84-41a4-9dc2-05e2df24ed19.vsidx index 7de87ca0..84f9aa49 100644 Binary files a/.vs/Admin.Core/FileContentIndex/50c6557e-8c61-4df5-b3fc-5196a8404bc0.vsidx and b/.vs/Admin.Core/FileContentIndex/7b74bc73-4f84-41a4-9dc2-05e2df24ed19.vsidx differ diff --git a/.vs/Admin.Core/v17/.suo b/.vs/Admin.Core/v17/.suo index ab2a89a3..156da071 100644 Binary files a/.vs/Admin.Core/v17/.suo and b/.vs/Admin.Core/v17/.suo differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 7320a550..28d5e1be 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Api.dll b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Api.dll index 6c8d9c6b..4bbb3510 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Api.dll and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Api.dll differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Api.pdb b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Api.pdb index d9da6dca..54062c65 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Api.pdb and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Api.pdb differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Extensions.dll b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Extensions.dll index 116dc88d..0b89c9e3 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Extensions.dll and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Extensions.dll differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Extensions.pdb b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Extensions.pdb index 2cb92b6a..8ab55a3b 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Extensions.pdb and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Extensions.pdb differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IService.dll index 2fc76371..b17bfcb6 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IService.pdb index 1a6937e4..e90b50fb 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Repository.dll b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Repository.dll index eb364657..74f99d5b 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Repository.dll and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Repository.pdb b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Repository.pdb index 3f4215ea..314becf3 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Repository.pdb and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Repository.pdb differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Service.dll b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Service.dll index 1d64c1f5..c94c16f4 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Service.dll and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Service.dll differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Service.pdb b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Service.pdb index 44ceedd7..073d3b9c 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Service.pdb and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Service.pdb differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Tasks.dll b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Tasks.dll index 1c4deb88..4d06ff01 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Tasks.dll and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Tasks.dll differ diff --git a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Tasks.pdb b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Tasks.pdb index 9d34f860..275e98f3 100644 Binary files a/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Tasks.pdb and b/Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Tasks.pdb differ diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache index 1a9f48ea..67e5fc42 100644 Binary files a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache and b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.dll b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.dll index 6c8d9c6b..4bbb3510 100644 Binary files a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.dll and b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.dll differ diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.pdb b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.pdb index d9da6dca..54062c65 100644 Binary files a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.pdb and b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.pdb differ diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.csproj.AssemblyReference.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.csproj.AssemblyReference.cache index 9667d8fd..6000aa89 100644 Binary files a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.csproj.AssemblyReference.cache and b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.csproj.AssemblyReference.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.csproj.AssemblyReference.cache index d2ad04d8..7269181b 100644 Binary files a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.csproj.AssemblyReference.cache and b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.dll index 116dc88d..0b89c9e3 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.pdb index 2cb92b6a..8ab55a3b 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.pdb differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.dll index 2fc76371..b17bfcb6 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.pdb index 1a6937e4..e90b50fb 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.dll index eb364657..74f99d5b 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.pdb index 3f4215ea..314becf3 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.pdb differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.dll index 1d64c1f5..c94c16f4 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.pdb index 44ceedd7..073d3b9c 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.pdb differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.dll index 1c4deb88..4d06ff01 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.pdb index 9d34f860..275e98f3 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.pdb differ diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache index 033bc432..30ad9f2c 100644 Binary files a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache and b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.dll b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.dll index 116dc88d..0b89c9e3 100644 Binary files a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.dll and b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.dll differ diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.pdb b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.pdb index 2cb92b6a..8ab55a3b 100644 Binary files a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.pdb and b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.pdb differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache index d1b999ed..673dbdf4 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache and b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.dll index 2fc76371..b17bfcb6 100644 Binary files a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.pdb index 1a6937e4..e90b50fb 100644 Binary files a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache index d1b999ed..673dbdf4 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache and b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.dll index 2fc76371..b17bfcb6 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.pdb index 1a6937e4..e90b50fb 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.Model/Model_New/BaseOrderInfo.cs b/Admin.Core.Model/Model_New/BaseOrderInfo.cs index 81dd752b..43df5c0d 100644 --- a/Admin.Core.Model/Model_New/BaseOrderInfo.cs +++ b/Admin.Core.Model/Model_New/BaseOrderInfo.cs @@ -54,12 +54,12 @@ namespace Admin.Core.Model.Model_New /// 订单计划数量 /// [SugarColumn(ColumnName = "ORDER_AMOUNT")] - public string OrderAmount { get; set; } + public int OrderAmount { get; set; } /// /// 完成数量 /// [SugarColumn(ColumnName = "COMPLETE_AMOUNT")] - public string CompleteAmount { get; set; } + public int CompleteAmount { get; set; } /// /// ORDER_TYPE /// @@ -84,12 +84,12 @@ namespace Admin.Core.Model.Model_New /// 工厂编码 /// [SugarColumn(ColumnName = "FACTORY_CODE")] - public DateTime FactoryCode { get; set; } + public string FactoryCode { get; set; } /// /// 是否标识 /// [SugarColumn(ColumnName = "IS_FLAG")] - public DateTime IsFlag { get; set; } + public int IsFlag { get; set; } /// /// 创建人 /// @@ -119,6 +119,6 @@ namespace Admin.Core.Model.Model_New /// 是否已下达计划（0-是，1-否） /// [SugarColumn(ColumnName = "IS_RELEASE")] - public DateTime IsRelease { get; set; } + public int IsRelease { get; set; } } } diff --git a/Admin.Core.Model/ViewModels/PlanMaintenanceView.cs b/Admin.Core.Model/ViewModels/PlanMaintenanceView.cs index 50af8220..cbb78b22 100644 --- a/Admin.Core.Model/ViewModels/PlanMaintenanceView.cs +++ b/Admin.Core.Model/ViewModels/PlanMaintenanceView.cs @@ -13,9 +13,9 @@ namespace Admin.Core.Model /// public int No { get; set; } /// - /// 计划号 + /// 订单号 /// - public string PlanCode { get; set; } + public string OrderCode { get; set; } /// /// 物料名称 /// @@ -25,10 +25,6 @@ namespace Admin.Core.Model /// public string MaterialName { get; set; } /// - /// 订单号 - /// - public string OrderCode { get; set; } - /// /// 产品编码 /// public string ProductCode { get; set; } diff --git a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.csproj.AssemblyReference.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.csproj.AssemblyReference.cache index 6ee1b1eb..717e0ab9 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.csproj.AssemblyReference.cache and b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Model/obj/Debug/net6.0/ref/Admin.Core.Model.dll b/Admin.Core.Model/obj/Debug/net6.0/ref/Admin.Core.Model.dll index 3125f6da..5b26a55a 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/ref/Admin.Core.Model.dll and b/Admin.Core.Model/obj/Debug/net6.0/ref/Admin.Core.Model.dll differ diff --git a/Admin.Core.Model/obj/Debug/net6.0/refint/Admin.Core.Model.dll b/Admin.Core.Model/obj/Debug/net6.0/refint/Admin.Core.Model.dll index 3125f6da..5b26a55a 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/refint/Admin.Core.Model.dll and b/Admin.Core.Model/obj/Debug/net6.0/refint/Admin.Core.Model.dll differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Extensions.dll b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Extensions.dll index 116dc88d..0b89c9e3 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Extensions.dll and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Extensions.dll differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Extensions.pdb b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Extensions.pdb index 2cb92b6a..8ab55a3b 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Extensions.pdb and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Extensions.pdb differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IService.dll index 2fc76371..b17bfcb6 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IService.pdb index 1a6937e4..e90b50fb 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.RealTimeService.dll b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.RealTimeService.dll index 80378a3b..1900cd01 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.RealTimeService.dll and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.RealTimeService.dll differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.RealTimeService.pdb b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.RealTimeService.pdb index 17676778..341acd3b 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.RealTimeService.pdb and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.RealTimeService.pdb differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Repository.dll b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Repository.dll index eb364657..74f99d5b 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Repository.dll and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Repository.dll differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Repository.pdb b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Repository.pdb index 3f4215ea..314becf3 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Repository.pdb and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Repository.pdb differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Service.dll b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Service.dll index 1d64c1f5..c94c16f4 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Service.dll and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Service.dll differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Service.pdb b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Service.pdb index 44ceedd7..073d3b9c 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Service.pdb and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Service.pdb differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Tasks.dll b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Tasks.dll index 1c4deb88..4d06ff01 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Tasks.dll and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Tasks.dll differ diff --git a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Tasks.pdb b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Tasks.pdb index 9d34f860..275e98f3 100644 Binary files a/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Tasks.pdb and b/Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Tasks.pdb differ diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache index b009fa11..685f9ce5 100644 Binary files a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache and b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.dll b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.dll index 80378a3b..1900cd01 100644 Binary files a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.dll and b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.dll differ diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.pdb b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.pdb index 17676778..341acd3b 100644 Binary files a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.pdb and b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.pdb differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.dll b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.dll index eb364657..74f99d5b 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.dll and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.pdb b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.pdb index 3f4215ea..314becf3 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.pdb and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.pdb differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache index 7d8d3edc..53f97c24 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache and b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.dll b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.dll index eb364657..74f99d5b 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.dll and b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.pdb b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.pdb index 3f4215ea..314becf3 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.pdb and b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.pdb differ diff --git a/Admin.Core.Service/Service_New/ProductPlanInfoServices.cs b/Admin.Core.Service/Service_New/ProductPlanInfoServices.cs index 79e6aef0..3e08a895 100644 --- a/Admin.Core.Service/Service_New/ProductPlanInfoServices.cs +++ b/Admin.Core.Service/Service_New/ProductPlanInfoServices.cs @@ -54,26 +54,24 @@ namespace Admin.Core.Service.Service_New #endregion /// - /// 获取打印信息 + /// 获取打印订单信息 /// /// - /// public async Task> QueryPrintInfo() { - List planList = await _baseOrderInfoServices.QueryAsync(); + List orderList = await _baseOrderInfoServices.QueryAsync(); List bomInfoList = await _baseBomInfoRepository.QueryAsync(); - //var list = (from p in planList - // join b in bomInfoList on p.PlanCode equals b.PlanCode - // select new PlanMaintenanceView - // { - // PlanCode = p.PlanCode, - // MaterialCode = b.MaterialCode, - // MaterialName = b.MaterialName, - // OrderCode = p.OrderCode, - // PlanAmount = b.StandardAmount, - // ResidueAmount = p.PlanAmount - p.CompleteAmount - // }).ToList(); + var list = (from p in orderList + join b in bomInfoList on p.MaterialCode equals b.MaterialCode + select new PlanMaintenanceView + { + OrderCode = p.OrderCode, + MaterialCode = b.MaterialCode, + MaterialName = b.MaterialName, + PlanAmount = p.OrderAmount//, + // ResidueAmount = p.PlanAmount - p.CompleteAmount + }).ToList(); return null; } diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.dll index 2fc76371..b17bfcb6 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.pdb index 1a6937e4..e90b50fb 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll index 1d64c1f5..c94c16f4 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.pdb b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.pdb index 44ceedd7..073d3b9c 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.pdb and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.pdb differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache index 1dd5e9e4..68f9802f 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache and b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.dll b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.dll index 1d64c1f5..c94c16f4 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.dll and b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.dll differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.pdb b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.pdb index 44ceedd7..073d3b9c 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.pdb and b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.pdb differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/ref/Admin.Core.Service.dll b/Admin.Core.Service/obj/Debug/net6.0/ref/Admin.Core.Service.dll index e56a19f7..908a5be9 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/ref/Admin.Core.Service.dll and b/Admin.Core.Service/obj/Debug/net6.0/ref/Admin.Core.Service.dll differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/refint/Admin.Core.Service.dll b/Admin.Core.Service/obj/Debug/net6.0/refint/Admin.Core.Service.dll index e56a19f7..908a5be9 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/refint/Admin.Core.Service.dll and b/Admin.Core.Service/obj/Debug/net6.0/refint/Admin.Core.Service.dll differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.dll index 2fc76371..b17bfcb6 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.pdb index 1a6937e4..e90b50fb 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.dll b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.dll index 1d64c1f5..c94c16f4 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.dll and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.dll differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.pdb b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.pdb index 44ceedd7..073d3b9c 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.pdb and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.pdb differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.dll b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.dll index 1c4deb88..4d06ff01 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.dll and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.dll differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.pdb b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.pdb index 9d34f860..275e98f3 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.pdb and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.pdb differ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache index 2e4e521b..399c673a 100644 Binary files a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache and b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.dll b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.dll index 1c4deb88..4d06ff01 100644 Binary files a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.dll and b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.dll differ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.pdb b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.pdb index 9d34f860..275e98f3 100644 Binary files a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.pdb and b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.pdb differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll index 116dc88d..0b89c9e3 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb index 2cb92b6a..8ab55a3b 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.dll b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.dll index 2fc76371..b17bfcb6 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.dll and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.dll differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.pdb b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.pdb index 1a6937e4..e90b50fb 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.pdb and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.pdb differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.dll b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.dll and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.dll differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.pdb b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.pdb and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.pdb differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.xml b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.xml +++ b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.dll b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.dll index eb364657..74f99d5b 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.dll and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.dll differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb index 3f4215ea..314becf3 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.dll b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.dll index 1d64c1f5..c94c16f4 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.dll and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.dll differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.pdb b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.pdb index 44ceedd7..073d3b9c 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.pdb and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.pdb differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll index 1c4deb88..4d06ff01 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb index 9d34f860..275e98f3 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Aucma.Core.BoxFoaming.dll b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Aucma.Core.BoxFoaming.dll index 29b26a3a..d71a6588 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Aucma.Core.BoxFoaming.dll and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Aucma.Core.BoxFoaming.dll differ diff --git a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Aucma.Core.BoxFoaming.pdb b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Aucma.Core.BoxFoaming.pdb index 2a33e52f..397bdb12 100644 Binary files a/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Aucma.Core.BoxFoaming.pdb and b/Aucma.Core.BoxFoaming/bin/Debug/net6.0-windows/Aucma.Core.BoxFoaming.pdb differ diff --git a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming.csproj.AssemblyReference.cache b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming.csproj.AssemblyReference.cache index a41fe6b8..60251824 100644 Binary files a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming.csproj.AssemblyReference.cache and b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming.dll b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming.dll index 29b26a3a..d71a6588 100644 Binary files a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming.dll and b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming.dll differ diff --git a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming.pdb b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming.pdb index 2a33e52f..397bdb12 100644 Binary files a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming.pdb and b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming.pdb differ diff --git a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_ixkcics2_wpftmp.AssemblyInfo.cs b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_ixkcics2_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..8064f0c3 --- /dev/null +++ b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_ixkcics2_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.BoxFoaming")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.BoxFoaming")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.BoxFoaming")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_ixkcics2_wpftmp.AssemblyInfoInputs.cache b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_ixkcics2_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..2a3f5a3d --- /dev/null +++ b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_ixkcics2_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +bc5a0e2c5a077f2ccc5ebef728be777032c5173c diff --git a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_ixkcics2_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_ixkcics2_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..2d006ab1 --- /dev/null +++ b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_ixkcics2_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.BoxFoaming_ixkcics2_wpftmp +build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.BoxFoaming\ diff --git a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_ixkcics2_wpftmp.assets.cache b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_ixkcics2_wpftmp.assets.cache new file mode 100644 index 00000000..4dd8c833 Binary files /dev/null and b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_ixkcics2_wpftmp.assets.cache differ diff --git a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_jgwn04xf_wpftmp.AssemblyInfo.cs b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_jgwn04xf_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..8064f0c3 --- /dev/null +++ b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_jgwn04xf_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.BoxFoaming")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.BoxFoaming")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.BoxFoaming")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_jgwn04xf_wpftmp.AssemblyInfoInputs.cache b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_jgwn04xf_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..2a3f5a3d --- /dev/null +++ b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_jgwn04xf_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +bc5a0e2c5a077f2ccc5ebef728be777032c5173c diff --git a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_jgwn04xf_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_jgwn04xf_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..974d2d13 --- /dev/null +++ b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_jgwn04xf_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.BoxFoaming_jgwn04xf_wpftmp +build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.BoxFoaming\ diff --git a/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_jgwn04xf_wpftmp.assets.cache b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_jgwn04xf_wpftmp.assets.cache new file mode 100644 index 00000000..5f78064b Binary files /dev/null and b/Aucma.Core.BoxFoaming/obj/Debug/net6.0-windows/Aucma.Core.BoxFoaming_jgwn04xf_wpftmp.assets.cache differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll index 116dc88d..0b89c9e3 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb index 2cb92b6a..8ab55a3b 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.dll b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.dll index 2fc76371..b17bfcb6 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.dll and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.dll differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.pdb b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.pdb index 1a6937e4..e90b50fb 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.pdb and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.IService.pdb differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.dll b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.dll and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.dll differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.pdb b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.pdb and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.pdb differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.xml b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.xml +++ b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.dll b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.dll index eb364657..74f99d5b 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.dll and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.dll differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb index 3f4215ea..314becf3 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.dll b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.dll index 1d64c1f5..c94c16f4 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.dll and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.dll differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.pdb b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.pdb index 44ceedd7..073d3b9c 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.pdb and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Service.pdb differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll index 1c4deb88..4d06ff01 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb index 9d34f860..275e98f3 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Aucma.Core.DoorFoaming.dll b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Aucma.Core.DoorFoaming.dll index 768d5ad0..94e80fc0 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Aucma.Core.DoorFoaming.dll and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Aucma.Core.DoorFoaming.dll differ diff --git a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Aucma.Core.DoorFoaming.pdb b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Aucma.Core.DoorFoaming.pdb index 348e69a9..c490160e 100644 Binary files a/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Aucma.Core.DoorFoaming.pdb and b/Aucma.Core.DoorFoaming/bin/Debug/net6.0-windows/Aucma.Core.DoorFoaming.pdb differ diff --git a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming.csproj.AssemblyReference.cache b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming.csproj.AssemblyReference.cache index a41fe6b8..60251824 100644 Binary files a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming.csproj.AssemblyReference.cache and b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming.dll b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming.dll index 768d5ad0..94e80fc0 100644 Binary files a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming.dll and b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming.dll differ diff --git a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming.pdb b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming.pdb index 348e69a9..c490160e 100644 Binary files a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming.pdb and b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming.pdb differ diff --git a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp.AssemblyInfo.cs b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..d14cf665 --- /dev/null +++ b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.DoorFoaming")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.DoorFoaming")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.DoorFoaming")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp.AssemblyInfoInputs.cache b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..ec928e2d --- /dev/null +++ b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +d86c7bb71279a913dd32d1b1a676829cea6f5b46 diff --git a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..d0f90c6d --- /dev/null +++ b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp +build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.DoorFoaming\ diff --git a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp.assets.cache b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp.assets.cache new file mode 100644 index 00000000..d58d4514 Binary files /dev/null and b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_pkjf3dcf_wpftmp.assets.cache differ diff --git a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_yugjcejl_wpftmp.AssemblyInfo.cs b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_yugjcejl_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..d14cf665 --- /dev/null +++ b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_yugjcejl_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.DoorFoaming")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.DoorFoaming")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.DoorFoaming")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_yugjcejl_wpftmp.AssemblyInfoInputs.cache b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_yugjcejl_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..ec928e2d --- /dev/null +++ b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_yugjcejl_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +d86c7bb71279a913dd32d1b1a676829cea6f5b46 diff --git a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_yugjcejl_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_yugjcejl_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..f558be5c --- /dev/null +++ b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_yugjcejl_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.DoorFoaming_yugjcejl_wpftmp +build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.DoorFoaming\ diff --git a/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_yugjcejl_wpftmp.assets.cache b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_yugjcejl_wpftmp.assets.cache new file mode 100644 index 00000000..93ddb672 Binary files /dev/null and b/Aucma.Core.DoorFoaming/obj/Debug/net6.0-windows/Aucma.Core.DoorFoaming_yugjcejl_wpftmp.assets.cache differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll index 116dc88d..0b89c9e3 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb index 2cb92b6a..8ab55a3b 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IService.dll b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IService.dll index 2fc76371..b17bfcb6 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IService.dll and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IService.dll differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IService.pdb b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IService.pdb index 1a6937e4..e90b50fb 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IService.pdb and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.IService.pdb differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Model.dll b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Model.dll and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Model.dll differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Model.pdb b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Model.pdb and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Model.pdb differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Model.xml b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Model.xml +++ b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Repository.dll b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Repository.dll index eb364657..74f99d5b 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Repository.dll and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Repository.dll differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb index 3f4215ea..314becf3 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Service.dll b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Service.dll index 1d64c1f5..c94c16f4 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Service.dll and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Service.dll differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Service.pdb b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Service.pdb index 44ceedd7..073d3b9c 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Service.pdb and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Service.pdb differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll index 1c4deb88..4d06ff01 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb index 9d34f860..275e98f3 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Aucma.Core.Palletiz.dll b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Aucma.Core.Palletiz.dll index 1ec91c4e..649fef95 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Aucma.Core.Palletiz.dll and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Aucma.Core.Palletiz.dll differ diff --git a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Aucma.Core.Palletiz.pdb b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Aucma.Core.Palletiz.pdb index 7b0d149f..8cebcc34 100644 Binary files a/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Aucma.Core.Palletiz.pdb and b/Aucma.Core.Palletiz/bin/Debug/net6.0-windows/Aucma.Core.Palletiz.pdb differ diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache index a41fe6b8..60251824 100644 Binary files a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache and b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.dll b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.dll index 1ec91c4e..649fef95 100644 Binary files a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.dll and b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.dll differ diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.pdb b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.pdb index 7b0d149f..8cebcc34 100644 Binary files a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.pdb and b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.pdb differ diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_mjxgziio_wpftmp.AssemblyInfo.cs b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_mjxgziio_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..d691a125 --- /dev/null +++ b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_mjxgziio_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.Palletiz")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.Palletiz")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.Palletiz")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_mjxgziio_wpftmp.AssemblyInfoInputs.cache b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_mjxgziio_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..b394662f --- /dev/null +++ b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_mjxgziio_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +db07d866d64485ddee91e2b5350d73c814393883 diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_mjxgziio_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_mjxgziio_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..0e772f31 --- /dev/null +++ b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_mjxgziio_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.Palletiz_mjxgziio_wpftmp +build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.Palletiz\ diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_mjxgziio_wpftmp.assets.cache b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_mjxgziio_wpftmp.assets.cache new file mode 100644 index 00000000..08facb20 Binary files /dev/null and b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_mjxgziio_wpftmp.assets.cache differ diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_ws3c4bwn_wpftmp.AssemblyInfo.cs b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_ws3c4bwn_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..d691a125 --- /dev/null +++ b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_ws3c4bwn_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.Palletiz")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.Palletiz")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.Palletiz")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_ws3c4bwn_wpftmp.AssemblyInfoInputs.cache b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_ws3c4bwn_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..b394662f --- /dev/null +++ b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_ws3c4bwn_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +db07d866d64485ddee91e2b5350d73c814393883 diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_ws3c4bwn_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_ws3c4bwn_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..56f8f9d8 --- /dev/null +++ b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_ws3c4bwn_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.Palletiz_ws3c4bwn_wpftmp +build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.Palletiz\ diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_ws3c4bwn_wpftmp.assets.cache b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_ws3c4bwn_wpftmp.assets.cache new file mode 100644 index 00000000..c16d77d8 Binary files /dev/null and b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_ws3c4bwn_wpftmp.assets.cache differ diff --git a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs index b4a45a31..ffcdea97 100644 --- a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs @@ -47,7 +47,7 @@ namespace Admin.Core.Wpf.ViewModels foreach(var item in list) { - Datalist.Add(new OrderInfo() { plan_code= item.PlanCode, order_code=item.OrderCode, material_code = item.MaterialCode, material_name = item.MaterialName, plan_amount =item.PlanAmount }); + Datalist.Add(new OrderInfo() { order_code=item.OrderCode, material_code = item.MaterialCode, material_name = item.MaterialName, plan_amount =item.PlanAmount }); } } diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll index 116dc88d..0b89c9e3 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb index 2cb92b6a..8ab55a3b 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.dll index 2fc76371..b17bfcb6 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.pdb index 1a6937e4..e90b50fb 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.xml b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.xml +++ b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.dll index eb364657..74f99d5b 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb index 3f4215ea..314becf3 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.dll index 1d64c1f5..c94c16f4 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.pdb index 44ceedd7..073d3b9c 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll index 1c4deb88..4d06ff01 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb index 9d34f860..275e98f3 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.dll index 2b6937cd..dd0ffb78 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb index 622cf966..8601ebad 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb differ diff --git a/Aucma.Core.PrintTo/obj/Aucma.Core.PrintTo_sn02dx4l_wpftmp.csproj.nuget.dgspec.json b/Aucma.Core.PrintTo/obj/Aucma.Core.PrintTo_sn02dx4l_wpftmp.csproj.nuget.dgspec.json new file mode 100644 index 00000000..c06eb5c5 --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Aucma.Core.PrintTo_sn02dx4l_wpftmp.csproj.nuget.dgspec.json @@ -0,0 +1,887 @@ +{ + "format": 1, + "restore": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Aucma.Core.PrintTo\\Aucma.Core.PrintTo.csproj": {} + }, + "projects": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "projectName": "Admin.Core.Common", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "dependencies": { + "AspNetCoreRateLimit": { + "target": "Package", + "version": "[4.0.1, )" + }, + "AutoMapper": { + "target": "Package", + "version": "[10.1.1, )" + }, + "AutoMapper.Extensions.Microsoft.DependencyInjection": { + "target": "Package", + "version": "[8.1.1, )" + }, + "Autofac": { + "target": "Package", + "version": "[6.2.0, )" + }, + "Autofac.Extensions.DependencyInjection": { + "target": "Package", + "version": "[7.1.0, )" + }, + "Autofac.Extras.DynamicProxy": { + "target": "Package", + "version": "[6.0.0, )" + }, + "Consul": { + "target": "Package", + "version": "[1.6.10.3, )" + }, + "InitQ": { + "target": "Package", + "version": "[1.0.0.7, )" + }, + "Microsoft.AspNetCore.Http": { + "target": "Package", + "version": "[2.2.2, )" + }, + "Microsoft.AspNetCore.Session": { + "target": "Package", + "version": "[2.2.0, )" + }, + "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson": { + "target": "Package", + "version": "[5.0.9, )" + }, + "Microsoft.Extensions.Caching.Memory": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.Configuration.Json": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.DependencyInjection": { + "target": "Package", + "version": "[5.0.2, )" + }, + "Microsoft.Extensions.Logging": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.Logging.Debug": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.Logging.Log4Net.AspNetCore": { + "target": "Package", + "version": "[5.0.3, )" + }, + "Microsoft.Extensions.Options": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "target": "Package", + "version": "[5.0.0, )" + }, + "MiniProfiler.AspNetCore.Mvc": { + "target": "Package", + "version": "[4.2.22, )" + }, + "NPOI": { + "target": "Package", + "version": "[2.5.5, )" + }, + "Newtonsoft.Json": { + "target": "Package", + "version": "[13.0.2, )" + }, + "Portable.BouncyCastle": { + "target": "Package", + "version": "[1.8.10, )" + }, + "Serilog": { + "target": "Package", + "version": "[2.10.0, )" + }, + "Serilog.AspNetCore": { + "target": "Package", + "version": "[4.1.0, )" + }, + "Serilog.Sinks.Elasticsearch": { + "target": "Package", + "version": "[8.4.1, )" + }, + "SqlSugarCore": { + "target": "Package", + "version": "[5.1.4.100, )" + }, + "StackExchange.Redis": { + "target": "Package", + "version": "[2.2.50, )" + }, + "Swashbuckle.AspNetCore.Filters": { + "target": "Package", + "version": "[7.0.2, )" + }, + "Swashbuckle.AspNetCore.SwaggerUI": { + "target": "Package", + "version": "[6.1.5, )" + }, + "UAParser": { + "target": "Package", + "version": "[3.1.47, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "projectName": "Admin.Core.EventBus", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.EventBus\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "dependencies": { + "Polly": { + "target": "Package", + "version": "[7.2.2, )" + }, + "RabbitMQ.Client": { + "target": "Package", + "version": "[6.2.2, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "projectName": "Admin.Core.Extensions", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Extensions\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "dependencies": { + "Microsoft.AspNetCore.Authentication.JwtBearer": { + "target": "Package", + "version": "[5.0.9, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "projectName": "Admin.Core.IRepository", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "projectName": "Admin.Core.IService", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IService\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "projectName": "Admin.Core.Model", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "projectName": "Admin.Core.Repository", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Repository\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "projectName": "Admin.Core.Serilog.Es", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": { + "target": "Package", + "version": "[2.2.0, )" + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.Configuration.Json": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.DependencyInjection": { + "target": "Package", + "version": "[5.0.2, )" + }, + "Microsoft.Extensions.Options": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Serilog": { + "target": "Package", + "version": "[2.10.0, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "projectName": "Admin.Core.Service", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "projectName": "Admin.Core.Tasks", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Tasks\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "dependencies": { + "Quartz": { + "target": "Package", + "version": "[3.3.3, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Aucma.Core.PrintTo\\Aucma.Core.PrintTo.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Aucma.Core.PrintTo\\Aucma.Core.PrintTo.csproj", + "projectName": "Aucma.Core.PrintTo", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Aucma.Core.PrintTo\\Aucma.Core.PrintTo.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Aucma.Core.PrintTo\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0-windows" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0-windows7.0": { + "targetAlias": "net6.0-windows", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0-windows7.0": { + "targetAlias": "net6.0-windows", + "dependencies": { + "CommunityToolkit.Mvvm": { + "target": "Package", + "version": "[8.1.0, )" + }, + "MaterialDesignThemes": { + "target": "Package", + "version": "[4.8.0, )" + }, + "Microsoft.Extensions.Configuration": { + "target": "Package", + "version": "[7.0.0, )" + }, + "Microsoft.Extensions.Configuration.Json": { + "target": "Package", + "version": "[7.0.0, )" + }, + "Microsoft.Extensions.DependencyInjection": { + "target": "Package", + "version": "[7.0.0, )" + }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "target": "Package", + "version": "[7.0.0, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + }, + "Microsoft.WindowsDesktop.App": { + "privateAssets": "none" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + } + } +} \ No newline at end of file diff --git a/Aucma.Core.PrintTo/obj/Aucma.Core.PrintTo_sn02dx4l_wpftmp.csproj.nuget.g.props b/Aucma.Core.PrintTo/obj/Aucma.Core.PrintTo_sn02dx4l_wpftmp.csproj.nuget.g.props new file mode 100644 index 00000000..b9ae215e --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Aucma.Core.PrintTo_sn02dx4l_wpftmp.csproj.nuget.g.props @@ -0,0 +1,19 @@ + + + + True + NuGet + $(MSBuildThisFileDirectory)project.assets.json + $(UserProfile)\.nuget\packages\ + C:\Users\Robin\.nuget\packages\ + PackageReference + 6.5.0 + + + + + + C:\Users\Robin\.nuget\packages\microsoft.xaml.behaviors.wpf\1.1.39 + C:\Users\Robin\.nuget\packages\materialdesignthemes\4.8.0 + + \ No newline at end of file diff --git a/Aucma.Core.PrintTo/obj/Aucma.Core.PrintTo_sn02dx4l_wpftmp.csproj.nuget.g.targets b/Aucma.Core.PrintTo/obj/Aucma.Core.PrintTo_sn02dx4l_wpftmp.csproj.nuget.g.targets new file mode 100644 index 00000000..1fde6cbc --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Aucma.Core.PrintTo_sn02dx4l_wpftmp.csproj.nuget.g.targets @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache index 87d4acbe..d079f743 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.dll b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.dll index 2b6937cd..dd0ffb78 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.dll and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.dll differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb index 622cf966..8601ebad 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_4o4yw1xa_wpftmp.AssemblyInfo.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_4o4yw1xa_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..09700e39 --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_4o4yw1xa_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.PrintTo")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.PrintTo")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.PrintTo")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_4o4yw1xa_wpftmp.AssemblyInfoInputs.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_4o4yw1xa_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..c6c0011d --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_4o4yw1xa_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +bd8498adce299fe4d9fba9a89012729f53a012bb diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_4o4yw1xa_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_4o4yw1xa_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..f5daa446 --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_4o4yw1xa_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.PrintTo_4o4yw1xa_wpftmp +build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_4o4yw1xa_wpftmp.assets.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_4o4yw1xa_wpftmp.assets.cache new file mode 100644 index 00000000..ddb4f547 Binary files /dev/null and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_4o4yw1xa_wpftmp.assets.cache differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_sn02dx4l_wpftmp.AssemblyInfo.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_sn02dx4l_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..09700e39 --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_sn02dx4l_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.PrintTo")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.PrintTo")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.PrintTo")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_sn02dx4l_wpftmp.AssemblyInfoInputs.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_sn02dx4l_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..c6c0011d --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_sn02dx4l_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +bd8498adce299fe4d9fba9a89012729f53a012bb diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_sn02dx4l_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_sn02dx4l_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..c2aed47b --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_sn02dx4l_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.PrintTo_sn02dx4l_wpftmp +build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_sn02dx4l_wpftmp.assets.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_sn02dx4l_wpftmp.assets.cache new file mode 100644 index 00000000..a8f06fa5 Binary files /dev/null and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_sn02dx4l_wpftmp.assets.cache differ diff --git a/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs index ae4e5a21..6749e544 100644 --- a/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs @@ -43,7 +43,6 @@ namespace Aucma.Core.SheetMetal.ViewModels MaterialDataGrid.Add(new PlanMaintenanceModel() { No = i, - PlanCode= item.PlanCode, MaterialCode = item.MaterialCode, MaterialName = item.MaterialName, OrderCode = item.OrderCode, @@ -58,13 +57,12 @@ namespace Aucma.Core.SheetMetal.ViewModels { int i = 1; List list = await _productPlanInfoServices.QueryPlanInfo(); - var queryList = list.Where(d=>d.PlanCode.Contains(obj)|| d.OrderCode.Contains(obj)|| d.MaterialCode.Contains(obj) || d.MaterialName.Contains(obj)); + var queryList = list.Where(d=>d.OrderCode.Contains(obj)|| d.MaterialCode.Contains(obj) || d.MaterialName.Contains(obj)); foreach (var item in queryList) { MaterialDataGrid.Add(new PlanMaintenanceModel() { No = i, - PlanCode = item.PlanCode, MaterialCode = item.MaterialCode, MaterialName = item.MaterialName, OrderCode = item.OrderCode, diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll index 116dc88d..0b89c9e3 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb index 2cb92b6a..8ab55a3b 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll index 75a1a7ea..e79189e9 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb index 1db8c0b4..9759285e 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IService.dll b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IService.dll index 2fc76371..b17bfcb6 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IService.dll and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IService.dll differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IService.pdb b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IService.pdb index 1a6937e4..e90b50fb 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IService.pdb and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.IService.pdb differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Model.dll b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Model.dll index b58cfb8b..6bd173a8 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Model.dll and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Model.dll differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Model.pdb b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Model.pdb index 7d853912..361a1b90 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Model.pdb and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Model.pdb differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Model.xml b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Model.xml index 77ec19c1..3dd32656 100644 --- a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Model.xml +++ b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Model.xml @@ -2431,9 +2431,9 @@ 序号 - + - 计划号 + 订单号 @@ -2446,11 +2446,6 @@ 物料名称 - - - 订单号 - - 产品编码 diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Repository.dll b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Repository.dll index eb364657..74f99d5b 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Repository.dll and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Repository.dll differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb index 3f4215ea..314becf3 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Service.dll b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Service.dll index 1d64c1f5..c94c16f4 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Service.dll and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Service.dll differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Service.pdb b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Service.pdb index 44ceedd7..073d3b9c 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Service.pdb and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Service.pdb differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll index 1c4deb88..4d06ff01 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb index 9d34f860..275e98f3 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Aucma.Core.SheetMetal.dll b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Aucma.Core.SheetMetal.dll index 27a09b00..22a0c7dd 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Aucma.Core.SheetMetal.dll and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Aucma.Core.SheetMetal.dll differ diff --git a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Aucma.Core.SheetMetal.pdb b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Aucma.Core.SheetMetal.pdb index 09039618..77ada032 100644 Binary files a/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Aucma.Core.SheetMetal.pdb and b/Aucma.Core.SheetMetal/bin/Debug/net6.0-windows/Aucma.Core.SheetMetal.pdb differ diff --git a/Aucma.Core.SheetMetal/obj/Aucma.Core.SheetMetal_fgbjok21_wpftmp.csproj.nuget.dgspec.json b/Aucma.Core.SheetMetal/obj/Aucma.Core.SheetMetal_fgbjok21_wpftmp.csproj.nuget.dgspec.json new file mode 100644 index 00000000..04c4b73d --- /dev/null +++ b/Aucma.Core.SheetMetal/obj/Aucma.Core.SheetMetal_fgbjok21_wpftmp.csproj.nuget.dgspec.json @@ -0,0 +1,891 @@ +{ + "format": 1, + "restore": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Aucma.Core.SheetMetal\\Aucma.Core.SheetMetal.csproj": {} + }, + "projects": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "projectName": "Admin.Core.Common", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "dependencies": { + "AspNetCoreRateLimit": { + "target": "Package", + "version": "[4.0.1, )" + }, + "AutoMapper": { + "target": "Package", + "version": "[10.1.1, )" + }, + "AutoMapper.Extensions.Microsoft.DependencyInjection": { + "target": "Package", + "version": "[8.1.1, )" + }, + "Autofac": { + "target": "Package", + "version": "[6.2.0, )" + }, + "Autofac.Extensions.DependencyInjection": { + "target": "Package", + "version": "[7.1.0, )" + }, + "Autofac.Extras.DynamicProxy": { + "target": "Package", + "version": "[6.0.0, )" + }, + "Consul": { + "target": "Package", + "version": "[1.6.10.3, )" + }, + "InitQ": { + "target": "Package", + "version": "[1.0.0.7, )" + }, + "Microsoft.AspNetCore.Http": { + "target": "Package", + "version": "[2.2.2, )" + }, + "Microsoft.AspNetCore.Session": { + "target": "Package", + "version": "[2.2.0, )" + }, + "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson": { + "target": "Package", + "version": "[5.0.9, )" + }, + "Microsoft.Extensions.Caching.Memory": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.Configuration.Json": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.DependencyInjection": { + "target": "Package", + "version": "[5.0.2, )" + }, + "Microsoft.Extensions.Logging": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.Logging.Debug": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.Logging.Log4Net.AspNetCore": { + "target": "Package", + "version": "[5.0.3, )" + }, + "Microsoft.Extensions.Options": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "target": "Package", + "version": "[5.0.0, )" + }, + "MiniProfiler.AspNetCore.Mvc": { + "target": "Package", + "version": "[4.2.22, )" + }, + "NPOI": { + "target": "Package", + "version": "[2.5.5, )" + }, + "Newtonsoft.Json": { + "target": "Package", + "version": "[13.0.2, )" + }, + "Portable.BouncyCastle": { + "target": "Package", + "version": "[1.8.10, )" + }, + "Serilog": { + "target": "Package", + "version": "[2.10.0, )" + }, + "Serilog.AspNetCore": { + "target": "Package", + "version": "[4.1.0, )" + }, + "Serilog.Sinks.Elasticsearch": { + "target": "Package", + "version": "[8.4.1, )" + }, + "SqlSugarCore": { + "target": "Package", + "version": "[5.1.4.100, )" + }, + "StackExchange.Redis": { + "target": "Package", + "version": "[2.2.50, )" + }, + "Swashbuckle.AspNetCore.Filters": { + "target": "Package", + "version": "[7.0.2, )" + }, + "Swashbuckle.AspNetCore.SwaggerUI": { + "target": "Package", + "version": "[6.1.5, )" + }, + "UAParser": { + "target": "Package", + "version": "[3.1.47, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "projectName": "Admin.Core.EventBus", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.EventBus\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "dependencies": { + "Polly": { + "target": "Package", + "version": "[7.2.2, )" + }, + "RabbitMQ.Client": { + "target": "Package", + "version": "[6.2.2, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "projectName": "Admin.Core.Extensions", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Extensions\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "dependencies": { + "Microsoft.AspNetCore.Authentication.JwtBearer": { + "target": "Package", + "version": "[5.0.9, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "projectName": "Admin.Core.IRepository", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "projectName": "Admin.Core.IService", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IService\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "projectName": "Admin.Core.Model", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "projectName": "Admin.Core.Repository", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Repository\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "projectName": "Admin.Core.Serilog.Es", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": { + "target": "Package", + "version": "[2.2.0, )" + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.Configuration.Json": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.DependencyInjection": { + "target": "Package", + "version": "[5.0.2, )" + }, + "Microsoft.Extensions.Options": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "target": "Package", + "version": "[5.0.0, )" + }, + "Serilog": { + "target": "Package", + "version": "[2.10.0, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "projectName": "Admin.Core.Service", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "projectName": "Admin.Core.Tasks", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Tasks\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "dependencies": { + "Quartz": { + "target": "Package", + "version": "[3.3.3, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Aucma.Core.SheetMetal\\Aucma.Core.SheetMetal.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Aucma.Core.SheetMetal\\Aucma.Core.SheetMetal.csproj", + "projectName": "Aucma.Core.SheetMetal", + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Aucma.Core.SheetMetal\\Aucma.Core.SheetMetal.csproj", + "packagesPath": "C:\\Users\\Robin\\.nuget\\packages\\", + "outputPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Aucma.Core.SheetMetal\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Robin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0-windows" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0-windows7.0": { + "targetAlias": "net6.0-windows", + "projectReferences": { + "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "D:\\gitea\\AUCMA\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0-windows7.0": { + "targetAlias": "net6.0-windows", + "dependencies": { + "CommunityToolkit.Mvvm": { + "target": "Package", + "version": "[8.1.0, )" + }, + "LiveChartsCore.SkiaSharpView.WPF": { + "target": "Package", + "version": "[2.0.0-rc1.2, )" + }, + "MaterialDesignThemes": { + "target": "Package", + "version": "[4.8.0, )" + }, + "Microsoft.Extensions.Configuration": { + "target": "Package", + "version": "[7.0.0, )" + }, + "Microsoft.Extensions.Configuration.Json": { + "target": "Package", + "version": "[7.0.0, )" + }, + "Microsoft.Extensions.DependencyInjection": { + "target": "Package", + "version": "[7.0.0, )" + }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "target": "Package", + "version": "[7.0.0, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + }, + "Microsoft.WindowsDesktop.App": { + "privateAssets": "none" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + } + } + } + } +} \ No newline at end of file diff --git a/Aucma.Core.SheetMetal/obj/Aucma.Core.SheetMetal_fgbjok21_wpftmp.csproj.nuget.g.props b/Aucma.Core.SheetMetal/obj/Aucma.Core.SheetMetal_fgbjok21_wpftmp.csproj.nuget.g.props new file mode 100644 index 00000000..b9ae215e --- /dev/null +++ b/Aucma.Core.SheetMetal/obj/Aucma.Core.SheetMetal_fgbjok21_wpftmp.csproj.nuget.g.props @@ -0,0 +1,19 @@ + + + + True + NuGet + $(MSBuildThisFileDirectory)project.assets.json + $(UserProfile)\.nuget\packages\ + C:\Users\Robin\.nuget\packages\ + PackageReference + 6.5.0 + + + + + + C:\Users\Robin\.nuget\packages\microsoft.xaml.behaviors.wpf\1.1.39 + C:\Users\Robin\.nuget\packages\materialdesignthemes\4.8.0 + + \ No newline at end of file diff --git a/Aucma.Core.SheetMetal/obj/Aucma.Core.SheetMetal_fgbjok21_wpftmp.csproj.nuget.g.targets b/Aucma.Core.SheetMetal/obj/Aucma.Core.SheetMetal_fgbjok21_wpftmp.csproj.nuget.g.targets new file mode 100644 index 00000000..1fde6cbc --- /dev/null +++ b/Aucma.Core.SheetMetal/obj/Aucma.Core.SheetMetal_fgbjok21_wpftmp.csproj.nuget.g.targets @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache index d3052d33..60251824 100644 Binary files a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache and b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.dll b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.dll index 27a09b00..22a0c7dd 100644 Binary files a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.dll and b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.dll differ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.pdb b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.pdb index 09039618..77ada032 100644 Binary files a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.pdb and b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.pdb differ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_fgbjok21_wpftmp.AssemblyInfo.cs b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_fgbjok21_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..9fa6a756 --- /dev/null +++ b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_fgbjok21_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.SheetMetal")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.SheetMetal")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.SheetMetal")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_fgbjok21_wpftmp.AssemblyInfoInputs.cache b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_fgbjok21_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..a69e2636 --- /dev/null +++ b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_fgbjok21_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +77683b6629df1d75b131603fea0b9ef0d8738544 diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_fgbjok21_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_fgbjok21_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..2b3537a8 --- /dev/null +++ b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_fgbjok21_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.SheetMetal_fgbjok21_wpftmp +build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.SheetMetal\ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_fgbjok21_wpftmp.assets.cache b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_fgbjok21_wpftmp.assets.cache new file mode 100644 index 00000000..ad7b738b Binary files /dev/null and b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_fgbjok21_wpftmp.assets.cache differ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_wuwnywr1_wpftmp.AssemblyInfo.cs b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_wuwnywr1_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..9fa6a756 --- /dev/null +++ b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_wuwnywr1_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.SheetMetal")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.SheetMetal")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.SheetMetal")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_wuwnywr1_wpftmp.AssemblyInfoInputs.cache b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_wuwnywr1_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..a69e2636 --- /dev/null +++ b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_wuwnywr1_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +77683b6629df1d75b131603fea0b9ef0d8738544 diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_wuwnywr1_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_wuwnywr1_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..fd261b49 --- /dev/null +++ b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_wuwnywr1_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.SheetMetal_wuwnywr1_wpftmp +build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.SheetMetal\ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_wuwnywr1_wpftmp.assets.cache b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_wuwnywr1_wpftmp.assets.cache new file mode 100644 index 00000000..90f92bd9 Binary files /dev/null and b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_wuwnywr1_wpftmp.assets.cache differ diff --git a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll index f2b30b1d..f8b1849b 100644 Binary files a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll and b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll differ diff --git a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb index 4551e70e..07b06f4f 100644 Binary files a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb and b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb differ diff --git a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs index 6e2e519f..c65238fb 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -1,62 +1,2 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace XamlGeneratedNamespace { - - - /// - /// GeneratedInternalTypeHelper - /// - [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { - - /// - /// CreateInstance - /// - protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { - return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) - | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); - } - - /// - /// GetPropertyValue - /// - protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { - return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); - } - - /// - /// SetPropertyValue - /// - protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { - propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); - } - - /// - /// CreateDelegate - /// - protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { - return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod - | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { - delegateType, - handler}, null))); - } - - /// - /// AddEventHandler - /// - protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { - eventInfo.AddEventHandler(target, handler); - } - } -} + diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.dll b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.dll index f2b30b1d..f8b1849b 100644 Binary files a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.dll and b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.dll differ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.pdb b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.pdb index 4551e70e..07b06f4f 100644 Binary files a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.pdb and b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.pdb differ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_1y5rxv4d_wpftmp.AssemblyInfo.cs b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_1y5rxv4d_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..83802a68 --- /dev/null +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_1y5rxv4d_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("HwControlLib")] +[assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_1y5rxv4d_wpftmp.AssemblyInfoInputs.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_1y5rxv4d_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..36364a8e --- /dev/null +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_1y5rxv4d_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +42cf648ef8280b16e9d1d1de3415777f5d872126 diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_1y5rxv4d_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_1y5rxv4d_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..c2ce3788 --- /dev/null +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_1y5rxv4d_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,11 @@ +is_global = true +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = HwControlLib_1y5rxv4d_wpftmp +build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\HwControlLib\ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_1y5rxv4d_wpftmp.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_1y5rxv4d_wpftmp.assets.cache new file mode 100644 index 00000000..38e608e9 Binary files /dev/null and b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_1y5rxv4d_wpftmp.assets.cache differ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.lref b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.lref index 1d08ddda..b3b37954 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.lref +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.lref @@ -1,4 +1,4 @@ - +D:\gitea\AUCMA\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\GeneratedInternalTypeHelper.g.cs FD:\gitea\AUCMA\AUCMA_SCADA\HwControlLib\Themes\Generic.xaml;; diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_eeyicgm0_wpftmp.AssemblyInfo.cs b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_eeyicgm0_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..83802a68 --- /dev/null +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_eeyicgm0_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("HwControlLib")] +[assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_eeyicgm0_wpftmp.AssemblyInfoInputs.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_eeyicgm0_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..36364a8e --- /dev/null +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_eeyicgm0_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +42cf648ef8280b16e9d1d1de3415777f5d872126 diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_eeyicgm0_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_eeyicgm0_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..0f56e908 --- /dev/null +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_eeyicgm0_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,11 @@ +is_global = true +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = HwControlLib_eeyicgm0_wpftmp +build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\HwControlLib\ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_eeyicgm0_wpftmp.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_eeyicgm0_wpftmp.assets.cache new file mode 100644 index 00000000..04bdf0b1 Binary files /dev/null and b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_eeyicgm0_wpftmp.assets.cache differ diff --git a/HwControlLib/obj/Debug/net6.0-windows/ref/HwControlLib.dll b/HwControlLib/obj/Debug/net6.0-windows/ref/HwControlLib.dll index d5335658..f7d8bc81 100644 Binary files a/HwControlLib/obj/Debug/net6.0-windows/ref/HwControlLib.dll and b/HwControlLib/obj/Debug/net6.0-windows/ref/HwControlLib.dll differ diff --git a/HwControlLib/obj/Debug/net6.0-windows/refint/HwControlLib.dll b/HwControlLib/obj/Debug/net6.0-windows/refint/HwControlLib.dll index d5335658..f7d8bc81 100644 Binary files a/HwControlLib/obj/Debug/net6.0-windows/refint/HwControlLib.dll and b/HwControlLib/obj/Debug/net6.0-windows/refint/HwControlLib.dll differ