diff --git a/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 b/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 index 3fcd9d9d..2bdc6b45 100644 Binary files a/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 and b/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Admin.Core/v17/.futdcache.v2 b/.vs/Admin.Core/v17/.futdcache.v2 index b0878d03..f29aed85 100644 Binary files a/.vs/Admin.Core/v17/.futdcache.v2 and b/.vs/Admin.Core/v17/.futdcache.v2 differ diff --git a/.vs/Admin.Core/v17/.suo b/.vs/Admin.Core/v17/.suo index 01a75cc1..8e917d8d 100644 Binary files a/.vs/Admin.Core/v17/.suo and b/.vs/Admin.Core/v17/.suo differ diff --git a/.vs/Admin.Core/v17/fileList.bin b/.vs/Admin.Core/v17/fileList.bin index eaf70196..a4266b52 100644 Binary files a/.vs/Admin.Core/v17/fileList.bin and b/.vs/Admin.Core/v17/fileList.bin differ diff --git a/.vs/ProjectEvaluation/admin.core.metadata.v7.bin b/.vs/ProjectEvaluation/admin.core.metadata.v7.bin index 61bad1ee..2631aabd 100644 Binary files a/.vs/ProjectEvaluation/admin.core.metadata.v7.bin and b/.vs/ProjectEvaluation/admin.core.metadata.v7.bin differ diff --git a/.vs/ProjectEvaluation/admin.core.projects.v7.bin b/.vs/ProjectEvaluation/admin.core.projects.v7.bin index a3c0a4bb..4f3b216e 100644 Binary files a/.vs/ProjectEvaluation/admin.core.projects.v7.bin and b/.vs/ProjectEvaluation/admin.core.projects.v7.bin differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 4f2c33b9..77da10ad 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite 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 666373d7..1da745f9 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/Release/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.assets.cache index 358507ed..314a86a9 100644 Binary files a/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.assets.cache and b/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.assets.cache differ diff --git a/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache b/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache index 9e83a8ac..b2ad9b01 100644 Binary files a/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache and b/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache 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 2c9f4753..d9b37528 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 1cc91258..7431dc67 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 780b4620..740516bd 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 b24a93bf..d92a0a79 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.Model.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.dll index 031fb309..a8e3e26b 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 865ac280..50a70ce1 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.Service.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.dll index ab66dc40..2784ab08 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 1c8cf51c..83882dda 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 cdf9fa1f..b599fa51 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 dc462a56..7e3dc738 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 b117afd0..8035bce1 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 780b4620..740516bd 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 b24a93bf..d92a0a79 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.Extensions/obj/Release/net6.0/Admin.Core.Extensions.assets.cache b/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.assets.cache index 85ca98b4..84551658 100644 Binary files a/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.assets.cache and b/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.assets.cache differ diff --git a/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache b/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache index 7c813344..b8c31cf8 100644 Binary files a/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache and b/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache 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 031fb309..a8e3e26b 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 865ac280..50a70ce1 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/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 76a8c62c..0b5325b9 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.IService/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll index 031fb309..a8e3e26b 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 865ac280..50a70ce1 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/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 76a8c62c..0b5325b9 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.Model/ViewModels/PrintPlanInfoView.cs b/Admin.Core.Model/ViewModels/PrintPlanInfoView.cs index c4ddaca1..9c10c52f 100644 --- a/Admin.Core.Model/ViewModels/PrintPlanInfoView.cs +++ b/Admin.Core.Model/ViewModels/PrintPlanInfoView.cs @@ -42,23 +42,23 @@ namespace Admin.Core.Model.ViewModels /// /// 物料数量 /// - public int StandardAmount { get; set; } + public int StandardAmount { get; set; } = 0; /// /// 异常量 /// - public int ErrorAmount { get; set; } + public int ErrorAmount { get; set; } = 0; /// /// 内胆码已打量 /// - public int LinerAmount { get; set; } + public int LinerAmount { get; set; } = 0; /// /// 箱壳码已打量 /// - public int BoxAmount { get; set; } + public int BoxAmount { get; set; } = 0; /// /// 剩余数量 /// - public int ResidueAmount { get; set; } + public int ResidueAmount { get; set; } = 0; /// /// 创建时间 /// 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 031fb309..a8e3e26b 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 865ac280..50a70ce1 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/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 83f05b7d..431f71ad 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 031fb309..a8e3e26b 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 865ac280..50a70ce1 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.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 273a921d..44f86374 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/Release/net6.0/Admin.Core.RealTimeService.assets.cache b/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.assets.cache index f3899365..9a455333 100644 Binary files a/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.assets.cache and b/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.assets.cache differ diff --git a/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache b/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache index 13b11492..938cfcc7 100644 Binary files a/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache and b/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache 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 031fb309..a8e3e26b 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 865ac280..50a70ce1 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/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 5bd17946..e4349899 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.Service/Service_New/BaseOrderInfoServices.cs b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs index 0b41bceb..bfaa9f52 100644 --- a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs @@ -113,7 +113,7 @@ namespace Admin.Core.Service } } return bbinfolist; - } + } #endregion #region 得到子节点列表 @@ -126,20 +126,13 @@ namespace Admin.Core.Service public List GetChildList(List list, string materialCode) { List tlist = new List(); - //IEnumerator it = list.GetEnumerator(); - //while (it.MoveNext()) - //{ - // BaseBomInfo n = it.Current; - // if (n.BomCode.IsNotEmptyOrNull() && n.BomCode == t.MaterialCode) - // { - // tlist.Add(n); - // } - //} - foreach (var item in list.Where(d=>d.BomCode== materialCode)) + IEnumerator it = list.Where(d => d.ParentId == materialCode).GetEnumerator(); + while (it.MoveNext()) { - if (item.MaterialCode.IsNotEmptyOrNull()) + BaseBomInfo n = it.Current; + if (n.ParentId.IsNotEmptyOrNull()) { - tlist.Add(item); + tlist.Add(n); } } return tlist; @@ -160,7 +153,7 @@ namespace Admin.Core.Service public List IsExist(List list, string materialCode) { - List tlist = list.Where(d => d.BomCode == materialCode&& d.BomCode!= d.MaterialCode).ToList(); + List tlist = list.Where(d => d.ParentId == materialCode).ToList(); return tlist; } #endregion 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 031fb309..a8e3e26b 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 865ac280..50a70ce1 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.Service.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll index ab66dc40..2784ab08 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 1c8cf51c..83882dda 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 11a8f016..8a2f9127 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 ab66dc40..2784ab08 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 1c8cf51c..83882dda 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 22d013f5..d3839199 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 22d013f5..d3839199 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.Model.dll b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.dll index 031fb309..a8e3e26b 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 865ac280..50a70ce1 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.Service.dll b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.dll index ab66dc40..2784ab08 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 1c8cf51c..83882dda 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 cdf9fa1f..b599fa51 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 dc462a56..7e3dc738 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 d88bd712..5e468e37 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 cdf9fa1f..b599fa51 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 dc462a56..7e3dc738 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/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.assets.cache b/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.assets.cache index 2db264a0..1f6951f7 100644 Binary files a/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.assets.cache and b/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.assets.cache differ diff --git a/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache b/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache index 7fe8eaac..965dde64 100644 Binary files a/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache and b/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache index 9125cce3..a4655438 100644 Binary files a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache and b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache index 2915daf8..7ed519eb 100644 --- a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache +++ b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache @@ -16,5 +16,5 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\App.xaml 4152067969098 Assets\Styles\DefaultStyles.xaml;Views\EnterWarehouseStatisticsPageView.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\MonitorPageView.xaml;Views\RealTimeInventoryPageView.xaml;Views\UserPage\AfterFoamingPageView.xaml;Views\UserPage\BeforeFoamingPageView.xaml;Views\UserPage\SpaceDetailPageView.xaml; -False +True diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs index c65238fb..36288f46 100644 --- a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -1,2 +1,62 @@ - +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.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/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.assets.cache b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.assets.cache index 5e3599b9..9fa9b437 100644 Binary files a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.assets.cache and b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.assets.cache differ diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache index 5704f1aa..f054a8f2 100644 Binary files a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache and b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache index be3574fd..a546cd12 100644 --- a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache @@ -13,7 +13,7 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\App.xaml 9-1290854581 21064389523 281610457503 -415286307481 +415-1316205814 Assets\Styles\DefaultStyles.xaml;Views\EnterWarehouseStatisticsPageView.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\MonitorPageView.xaml;Views\RealTimeInventoryPageView.xaml;Views\UserPage\AfterFoamingPageView.xaml;Views\UserPage\BeforeFoamingPageView.xaml;Views\UserPage\SpaceDetailPageView.xaml; True diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.lref b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.lref index deba4caf..74827328 100644 --- a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.lref +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.lref @@ -1,4 +1,4 @@ - +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\obj\Release\net6.0-windows\GeneratedInternalTypeHelper.g.cs FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\App.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\Views\EnterWarehouseStatisticsPageView.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\Views\IndexPageView.xaml;; diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache index 60357035..1d6aec01 100644 Binary files a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache and b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache index 4bbc524d..5c624fdd 100644 --- a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache +++ b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache @@ -16,5 +16,5 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\App.xaml 417-1046291176 Assets\Styles\DefaultStyles.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\StatisticsPageView.xaml; -False +True diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs index c65238fb..36288f46 100644 --- a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -1,2 +1,62 @@ - +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.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/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.assets.cache b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.assets.cache index 2430443d..d14d3b20 100644 Binary files a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.assets.cache and b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.assets.cache differ diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache index ecdbb02c..3d152920 100644 Binary files a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache and b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache index c3f86edf..c7e63f88 100644 --- a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache @@ -13,7 +13,7 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\App.xaml 4820000597 21064389523 171935592671 -4171467014503 +417-135498792 Assets\Styles\DefaultStyles.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\StatisticsPageView.xaml; True diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.lref b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.lref index e13476fd..7a514bda 100644 --- a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.lref +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.lref @@ -1,4 +1,4 @@ - +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\obj\Release\net6.0-windows\GeneratedInternalTypeHelper.g.cs FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\App.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\Views\IndexPageView.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\Views\StatisticsPageView.xaml;; diff --git a/Aucma.Core.Melsec/obj/Debug/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache b/Aucma.Core.Melsec/obj/Debug/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache index 45b59a44..76c1b7ed 100644 Binary files a/Aucma.Core.Melsec/obj/Debug/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache and b/Aucma.Core.Melsec/obj/Debug/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.assets.cache b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.assets.cache index f19c56ce..20bb5514 100644 Binary files a/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.assets.cache and b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.assets.cache differ diff --git a/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache index 930e6220..a7749783 100644 Binary files a/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache and b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.assets.cache b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.assets.cache index 97b7b78e..9abfff02 100644 Binary files a/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.assets.cache and b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.assets.cache differ diff --git a/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.csproj.AssemblyReference.cache b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.csproj.AssemblyReference.cache index 165b5e2a..e2646e2b 100644 Binary files a/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.csproj.AssemblyReference.cache and b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.csproj.AssemblyReference.cache 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 60357035..746ad3ff 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_MarkupCompile.cache b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache index 6c915b64..d7a0aa57 100644 --- a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache +++ b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache @@ -16,5 +16,5 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\App.xaml 417-1046291176 Assets\Styles\DefaultStyles.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\StatisticsPageView.xaml; -False +True diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs index c65238fb..36288f46 100644 --- a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -1,2 +1,62 @@ - +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.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/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.assets.cache b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.assets.cache index 74ce2245..f08c84bb 100644 Binary files a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.assets.cache and b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.assets.cache differ diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache index ecdbb02c..3d152920 100644 Binary files a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache and b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache index 4c941a2e..180b1e56 100644 --- a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache +++ b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache @@ -13,7 +13,7 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\App.xaml 4820000597 21064389523 16764066740 -4171467014503 +417-135498792 Assets\Styles\DefaultStyles.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\StatisticsPageView.xaml; True diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.lref b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.lref index 711d1034..93a446d1 100644 --- a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.lref +++ b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.lref @@ -1,4 +1,4 @@ - +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\obj\Release\net6.0-windows\GeneratedInternalTypeHelper.g.cs FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\App.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\Views\IndexPageView.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\Views\StatisticsPageView.xaml;; diff --git a/Aucma.Core.PrintTo/App.xaml b/Aucma.Core.PrintTo/App.xaml index 6015b5c7..73939176 100644 --- a/Aucma.Core.PrintTo/App.xaml +++ b/Aucma.Core.PrintTo/App.xaml @@ -1,9 +1,9 @@ - diff --git a/Aucma.Core.PrintTo/App.xaml.cs b/Aucma.Core.PrintTo/App.xaml.cs index 0dda0568..468a50b0 100644 --- a/Aucma.Core.PrintTo/App.xaml.cs +++ b/Aucma.Core.PrintTo/App.xaml.cs @@ -1,4 +1,4 @@ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using System; @@ -10,7 +10,7 @@ using Autofac.Extensions.DependencyInjection; using Microsoft.AspNetCore.Hosting; using Admin.Core.Common; -namespace Admin.Core.Wpf +namespace Aucma.Core.PrintTo { /// /// Interaction logic for App.xaml diff --git a/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj b/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj index e126c1b4..c049aac6 100644 --- a/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj +++ b/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj @@ -78,4 +78,22 @@ + + + ..\dll\FastReport.dll + + + ..\dll\FastReport.Bars.dll + + + ..\dll\FastReport.Editor.dll + + + + + + PreserveNewest + + + diff --git a/Aucma.Core.PrintTo/Common/PrintHelper.cs b/Aucma.Core.PrintTo/Common/PrintHelper.cs new file mode 100644 index 00000000..f666fb6d --- /dev/null +++ b/Aucma.Core.PrintTo/Common/PrintHelper.cs @@ -0,0 +1,42 @@ +using FastReport; +using log4net; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.PrintTo +{ + public class PrintHelper + { + private static readonly log4net.ILog log = LogManager.GetLogger(typeof(PrintHelper)); + public static bool Print(string printer,string orderNo,string materialName,string barCode) + { + try + { + //对接打印机 + Report barReport = new Report(); + barReport.Load(System.Environment.CurrentDirectory + @"\Report\MaterialBar.frx");//打印报表位置 + + // 设置打印机和打印选项 + barReport.PrintSettings.ShowDialog = false; + barReport.PrintSettings.Printer = printer; // 设置打印机名称 + barReport.PrintSettings.Copies = 1; // 设置打印份数 + //barReport.PrintSettings.PageRange = "1-3"; // 设置打印页范围 + + barReport.SetParameterValue("BoxBarData.Order_No", orderNo);//订单码 + barReport.SetParameterValue("BoxBarData.Order_Material_Name", materialName);//物料名称 + barReport.SetParameterValue("BoxBarData.Bar_Code", barCode);//二维码 + + barReport.Print(); + return true; + } + catch (Exception ex) + { + log.Error($"打印出错:{ex.Message}"); + return false; + } + } + } +} diff --git a/Aucma.Core.PrintTo/Common/WindowManager.cs b/Aucma.Core.PrintTo/Common/WindowManager.cs deleted file mode 100644 index 04b9599a..00000000 --- a/Aucma.Core.PrintTo/Common/WindowManager.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Admin.Core.Wpf.Common -{ - /// - /// 窗口管理器 - /// - public class WindowManager - { - static Dictionary _regWindowContainer = new Dictionary(); - - /// - /// 注册类型 - /// - /// - /// - /// - public static void Register(string name, System.Windows.Window owner = null) - { - if (!_regWindowContainer.ContainsKey(name)) - { - _regWindowContainer.Add(name, new WindowStruct { WindowType = typeof(T), Owner = owner }); - } - } - - /// - /// 获取对象 - /// - /// - /// - /// - /// - public static bool ShowDialog(string name, T dataContext) - { - if (_regWindowContainer.ContainsKey(name)) - { - Type type = _regWindowContainer[name].WindowType; - //反射创建窗体对象 - var window = (System.Windows.Window)Activator.CreateInstance(type); - window.Owner = _regWindowContainer[name].Owner; - window.DataContext = dataContext; - return window.ShowDialog() == true; - } - - return false; - } - } - public class WindowStruct - { - public Type WindowType { get; set; } - public System.Windows.Window Owner { get; set; } - } -} diff --git a/Aucma.Core.PrintTo/ConvertTo/MultiFaultAppConverter.cs b/Aucma.Core.PrintTo/ConvertTo/MultiFaultAppConverter.cs index 5d99cbdd..1f80e238 100644 --- a/Aucma.Core.PrintTo/ConvertTo/MultiFaultAppConverter.cs +++ b/Aucma.Core.PrintTo/ConvertTo/MultiFaultAppConverter.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Data; -namespace Admin.Core.Wpf.ConvertTo +namespace Aucma.Core.PrintTo.ConvertTo { public class MultiFaultAppConverter : IMultiValueConverter { diff --git a/Aucma.Core.PrintTo/Filter/AutofacPropertityModuleReg.cs b/Aucma.Core.PrintTo/Filter/AutofacPropertityModuleReg.cs index db77b3a6..47d595bf 100644 --- a/Aucma.Core.PrintTo/Filter/AutofacPropertityModuleReg.cs +++ b/Aucma.Core.PrintTo/Filter/AutofacPropertityModuleReg.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Admin.Core.Wpf +namespace Aucma.Core.PrintTo { public class AutofacPropertityModuleReg : Autofac.Module { diff --git a/Aucma.Core.PrintTo/Models/BarCodeModel.cs b/Aucma.Core.PrintTo/Models/BarCodeModel.cs index bfe00c38..650ede85 100644 --- a/Aucma.Core.PrintTo/Models/BarCodeModel.cs +++ b/Aucma.Core.PrintTo/Models/BarCodeModel.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Admin.Core.Wpf.Models +namespace Aucma.Core.PrintTo.Models { public class BarCodeModel { diff --git a/Aucma.Core.PrintTo/Models/MainModel.cs b/Aucma.Core.PrintTo/Models/MainModel.cs index c5d2e3bd..dba530e5 100644 --- a/Aucma.Core.PrintTo/Models/MainModel.cs +++ b/Aucma.Core.PrintTo/Models/MainModel.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Admin.Core.Wpf.Models +namespace Aucma.Core.PrintTo.Models { public class MainModel : ObservableObject { diff --git a/Aucma.Core.PrintTo/Models/OrderInfo.cs b/Aucma.Core.PrintTo/Models/OrderInfo.cs index cbaa0fee..0caf8c05 100644 --- a/Aucma.Core.PrintTo/Models/OrderInfo.cs +++ b/Aucma.Core.PrintTo/Models/OrderInfo.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Admin.Core.Wpf.Models +namespace Aucma.Core.PrintTo.Models { /// /// 打印数据 @@ -15,51 +15,51 @@ namespace Admin.Core.Wpf.Models /// /// 订单日期 /// - public string? created_time { get; set; } + public DateTime CreatedTime { get; set; } /// /// 工单编码 /// - public string? order_code { get; set; } + public string OrderCode { get; set; } /// /// 产品编码 /// - public string? product_code { get; set; } + public string ProductCode { get; set; } /// /// 产品名称 /// - public string? product_name { get; set; } + public string ProductName { get; set; } /// /// 计划数量 /// - public int plan_amount { get; set; } + public int PlanAmount { get; set; } = 0; /// /// 完成量 /// - public int complete_amount { get; set; } + public int CompleteAmount { get; set; } /// /// 物料编码 /// - public string? material_code { get; set; } + public string MaterialCode { get; set; } /// /// 物料名称 /// - public string? material_name { get; set; } + public string MaterialName { get; set; } /// /// 物料数量 /// - public int standard_amount { get; set; } + public int StandardAmount { get; set; } = 0; /// /// 异常量 /// - public int ErrorNum { get; set; } + public int ErrorNum { get; set; } = 0; /// /// 内胆码已打量 /// - public int LinerCodeNum { get; set; } + public int LinerCodeNum { get; set; } = 0; /// /// 箱体码已打量 /// - public int BoxCodeNum { get; set; } + public int BoxCodeNum { get; set; } = 0; } } diff --git a/Aucma.Core.PrintTo/Report/MaterialBar.frx b/Aucma.Core.PrintTo/Report/MaterialBar.frx new file mode 100644 index 00000000..c7f3e091 --- /dev/null +++ b/Aucma.Core.PrintTo/Report/MaterialBar.frx @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aucma.Core.PrintTo/Startup.cs b/Aucma.Core.PrintTo/Startup.cs index e3c64b1e..099bfbfa 100644 --- a/Aucma.Core.PrintTo/Startup.cs +++ b/Aucma.Core.PrintTo/Startup.cs @@ -14,7 +14,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using System.Text; -namespace Admin.Core.Wpf +namespace Aucma.Core.PrintTo { /// /// Startup diff --git a/Aucma.Core.PrintTo/ViewModels/HomeWindowViewModel.cs b/Aucma.Core.PrintTo/ViewModels/HomeWindowViewModel.cs index cbfe2798..352e54c4 100644 --- a/Aucma.Core.PrintTo/ViewModels/HomeWindowViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/HomeWindowViewModel.cs @@ -1,5 +1,5 @@ -using Admin.Core.Wpf.Models; -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Models; +using Aucma.Core.PrintTo.Views; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using MaterialDesignThemes.Wpf; @@ -17,7 +17,7 @@ using System.Windows.Input; * 首页信息 * */ -namespace Admin.Core.Wpf.ViewModels +namespace Aucma.Core.PrintTo.ViewModels { public partial class HomeWindowViewModel : ObservableObject { diff --git a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs index 95989dfe..553e9128 100644 --- a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs @@ -1,6 +1,6 @@ using Admin.Core.IService; -using Admin.Core.Wpf.Models; -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Models; +using Aucma.Core.PrintTo.Views; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using log4net; @@ -15,12 +15,12 @@ using System.Windows; * 首页信息 * */ -namespace Admin.Core.Wpf.ViewModels +namespace Aucma.Core.PrintTo.ViewModels { public partial class IndexPageViewModel : ObservableObject { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(IndexPageViewModel)); - protected readonly IBaseOrderInfoServices? _baseOrderInfoServices; + protected readonly IBaseOrderInfoServices _baseOrderInfoServices; public IndexPageViewModel() { @@ -32,25 +32,24 @@ namespace Admin.Core.Wpf.ViewModels private async Task LoadData() { Datalist.Clear(); - var list= await _baseOrderInfoServices.QueryPrintInfo(); + var list = await _baseOrderInfoServices.QueryPrintInfo(); - foreach(var item in list) + foreach (var item in list) { - Datalist.Add(new OrderInfo() { - created_time = item.CreateTime.ToString(), - order_code = item.OrderCode, - product_code = item.ProductCode, - product_name = item.ProductName, - plan_amount = item.PlanAmount, - complete_amount = item.CompleteAmount.ToString() == "" ? 0 : item.CompleteAmount, - material_code = item.MaterialCode, - material_name = item.MaterialName, - standard_amount = item.StandardAmount, - ErrorNum = item.ErrorAmount, - LinerCodeNum = item.LinerAmount, - BoxCodeNum = item.BoxAmount - - }); + OrderInfo info = new OrderInfo(); + info.CreatedTime = item.CreateTime; + info.OrderCode = item.OrderCode; + info.ProductCode = item.ProductCode; + info.ProductName = item.ProductName; + info.PlanAmount = item.PlanAmount; + info.CompleteAmount = item.CompleteAmount; + info.MaterialCode = item.MaterialCode; + info.MaterialName = item.MaterialName; + info.StandardAmount = item.StandardAmount; + info.ErrorNum = item.ErrorAmount; + info.LinerCodeNum = item.LinerAmount; + info.BoxCodeNum = item.BoxAmount; + Datalist.Add(info); } } @@ -81,20 +80,20 @@ namespace Admin.Core.Wpf.ViewModels var orderList = list.Where(d => d.OrderCode.Contains(queryStr) || d.ProductCode.Contains(queryStr) || d.ProductName.Contains(queryStr) || d.MaterialCode.Contains(queryStr) || d.MaterialName.Contains(queryStr)); foreach (var item in orderList) { - Datalist.Add(new OrderInfo() { - created_time = item.CreateTime.ToString(), - order_code = item.OrderCode, - product_code = item.ProductCode, - product_name = item.ProductName, - plan_amount = item.PlanAmount, - complete_amount = item.CompleteAmount.ToString() == "" ? 0 : item.CompleteAmount, - material_code = item.MaterialCode, - material_name = item.MaterialName, - standard_amount = item.StandardAmount, - ErrorNum = item.ErrorAmount, - LinerCodeNum = item.LinerAmount, - BoxCodeNum = item.BoxAmount - }); + OrderInfo info = new OrderInfo(); + info.CreatedTime = item.CreateTime; + info.OrderCode = item.OrderCode; + info.ProductCode = item.ProductCode; + info.ProductName = item.ProductName; + info.PlanAmount = item.PlanAmount; + info.CompleteAmount = item.CompleteAmount; + info.MaterialCode = item.MaterialCode; + info.MaterialName = item.MaterialName; + info.StandardAmount = item.StandardAmount; + info.ErrorNum = item.ErrorAmount; + info.LinerCodeNum = item.LinerAmount; + info.BoxCodeNum = item.BoxAmount; + Datalist.Add(info); } } else @@ -127,20 +126,20 @@ namespace Admin.Core.Wpf.ViewModels var orderList = list.Where(d => d.MaterialName.Contains(query) ); foreach (var item in orderList) { - Datalist.Add(new OrderInfo() { - created_time = item.CreateTime.ToString(), - order_code = item.OrderCode, - product_code = item.ProductCode, - product_name = item.ProductName, - plan_amount = item.PlanAmount, - complete_amount = item.CompleteAmount.ToString() == "" ? 0 : item.CompleteAmount, - material_code = item.MaterialCode, - material_name = item.MaterialName, - standard_amount = item.StandardAmount, - ErrorNum = item.ErrorAmount, - LinerCodeNum = item.LinerAmount, - BoxCodeNum = item.BoxAmount - }); + OrderInfo info = new OrderInfo(); + info.CreatedTime = item.CreateTime; + info.OrderCode = item.OrderCode; + info.ProductCode = item.ProductCode; + info.ProductName = item.ProductName; + info.PlanAmount = item.PlanAmount; + info.CompleteAmount = item.CompleteAmount; + info.MaterialCode = item.MaterialCode; + info.MaterialName = item.MaterialName; + info.StandardAmount = item.StandardAmount; + info.ErrorNum = item.ErrorAmount; + info.LinerCodeNum = item.LinerAmount; + info.BoxCodeNum = item.BoxAmount; + Datalist.Add(info); } } catch (Exception ex) @@ -163,12 +162,12 @@ namespace Admin.Core.Wpf.ViewModels return; } - string order_code = SelectedCells.product_code; - string product_code = SelectedCells.product_code; - string product_name = SelectedCells.product_name; - string material_code = SelectedCells.material_code; - string material_name = SelectedCells.material_name; - int standard_amount = SelectedCells.standard_amount; + string order_code = SelectedCells.OrderCode; + string product_code = SelectedCells.ProductCode; + string product_name = SelectedCells.ProductName; + string material_code = SelectedCells.MaterialCode; + string material_name = SelectedCells.MaterialName; + int standard_amount = SelectedCells.StandardAmount; PrintToDevView printToDev= new PrintToDevView(product_code, material_code, material_name, standard_amount); printToDev.ShowDialog(); @@ -188,12 +187,12 @@ namespace Admin.Core.Wpf.ViewModels return; } - string order_code = SelectedCells.order_code; - string product_code = SelectedCells.product_code; - string product_name = SelectedCells.product_name; - string material_code = SelectedCells.material_code; - string material_name = SelectedCells.material_name; - int standard_amount = SelectedCells.standard_amount; + string order_code = SelectedCells.OrderCode; + string product_code = SelectedCells.ProductCode; + string product_name = SelectedCells.ProductName; + string material_code = SelectedCells.MaterialCode; + string material_name = SelectedCells.MaterialName; + int standard_amount = SelectedCells.StandardAmount; SupplementPrintPageView printToDev = new SupplementPrintPageView(order_code,product_code, material_code, material_name); printToDev.ShowDialog(); diff --git a/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs b/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs index a94b670d..52127837 100644 --- a/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs @@ -1,5 +1,5 @@ using Admin.Core.Common; -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using AutoMapper.Configuration; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; @@ -11,7 +11,7 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Input; -namespace Admin.Core.Wpf.ViewModels +namespace Aucma.Core.PrintTo.ViewModels { public partial class MainWindowViewModel : ObservableObject { diff --git a/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs b/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs index 1a3daddd..d7842620 100644 --- a/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs @@ -1,6 +1,8 @@ using Admin.Core.Common; +using Aucma.Core.PrintTo; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; +using FastReport; using System; using System.Collections.Generic; using System.Linq; @@ -8,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows; -namespace Admin.Core.Wpf.ViewModels +namespace Aucma.Core.PrintTo.ViewModels { public partial class PrintToDevViewModel : ObservableObject { @@ -85,8 +87,12 @@ namespace Admin.Core.Wpf.ViewModels /// public void ExecPrint(string orderNo, string materialName, int planAmount) { - //对接打印机 + string printer = "ZDesigner ZT411-300dpi ZPL"; + orderNo = "11219219"; + materialName = "BCD-610";//物料名称 + string barCode = "B23102383055009730507"; + PrintHelper.Print(printer, orderNo, materialName, barCode); } #endregion diff --git a/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs index 62db95ec..65b5f9c2 100644 --- a/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs @@ -1,8 +1,8 @@ using Admin.Core.IRepository; using Admin.Core.IService; using Admin.Core.Service; -using Admin.Core.Wpf.Models; -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Models; +using Aucma.Core.PrintTo.Views; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using log4net; @@ -15,7 +15,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows; -namespace Admin.Core.Wpf.ViewModels +namespace Aucma.Core.PrintTo.ViewModels { public partial class SupplementPrintPageViewModel : ObservableObject { diff --git a/Aucma.Core.PrintTo/Views/ButtomPageView.xaml b/Aucma.Core.PrintTo/Views/ButtomPageView.xaml index d3dff1cd..e8726b4b 100644 --- a/Aucma.Core.PrintTo/Views/ButtomPageView.xaml +++ b/Aucma.Core.PrintTo/Views/ButtomPageView.xaml @@ -1,9 +1,9 @@ - diff --git a/Aucma.Core.PrintTo/Views/ButtomPageView.xaml.cs b/Aucma.Core.PrintTo/Views/ButtomPageView.xaml.cs index 9b5af1a8..43ccec2f 100644 --- a/Aucma.Core.PrintTo/Views/ButtomPageView.xaml.cs +++ b/Aucma.Core.PrintTo/Views/ButtomPageView.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace Admin.Core.Wpf.Views +namespace Aucma.Core.PrintTo.Views { /// /// ButtomPageView.xaml 的交互逻辑 diff --git a/Aucma.Core.PrintTo/Views/HomeWindowView.xaml b/Aucma.Core.PrintTo/Views/HomeWindowView.xaml index a2053edd..3deb82ef 100644 --- a/Aucma.Core.PrintTo/Views/HomeWindowView.xaml +++ b/Aucma.Core.PrintTo/Views/HomeWindowView.xaml @@ -1,10 +1,10 @@ - /// HomeWindowView.xaml 的交互逻辑 diff --git a/Aucma.Core.PrintTo/Views/IndexPage.xaml b/Aucma.Core.PrintTo/Views/IndexPage.xaml index df23b979..389c5d64 100644 --- a/Aucma.Core.PrintTo/Views/IndexPage.xaml +++ b/Aucma.Core.PrintTo/Views/IndexPage.xaml @@ -1,12 +1,13 @@ - --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -122,18 +174,18 @@ ItemsSource="{Binding Datalist}" ColumnWidth="*" AutoGenerateColumns="False" IsReadOnly="True" CanUserAddRows="False" SelectionMode="Single" SelectedItem="{Binding SelectedCells, Mode=OneWayToSource}"> - - - - - - + + + + + + - - - - - + + + + + @@ -154,24 +206,25 @@ - - - - + + - + + diff --git a/Aucma.Core.PrintTo/Views/IndexPage.xaml.cs b/Aucma.Core.PrintTo/Views/IndexPage.xaml.cs index 66f26fcf..4cf74907 100644 --- a/Aucma.Core.PrintTo/Views/IndexPage.xaml.cs +++ b/Aucma.Core.PrintTo/Views/IndexPage.xaml.cs @@ -1,21 +1,7 @@ -using Admin.Core.Wpf.Common; -using Admin.Core.Wpf.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; +using Aucma.Core.PrintTo.ViewModels; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -namespace Admin.Core.Wpf.Views +namespace Aucma.Core.PrintTo.Views { /// /// IndexPage.xaml 的交互逻辑 diff --git a/Aucma.Core.PrintTo/Views/MainWindow.xaml b/Aucma.Core.PrintTo/Views/MainWindow.xaml index 4d82a5dd..ba4c233c 100644 --- a/Aucma.Core.PrintTo/Views/MainWindow.xaml +++ b/Aucma.Core.PrintTo/Views/MainWindow.xaml @@ -1,4 +1,4 @@ - /// Interaction logic for MainWindow.xaml diff --git a/Aucma.Core.PrintTo/Views/Page/NumUpDown.xaml b/Aucma.Core.PrintTo/Views/Page/NumUpDown.xaml new file mode 100644 index 00000000..27d06d9a --- /dev/null +++ b/Aucma.Core.PrintTo/Views/Page/NumUpDown.xaml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aucma.Core.PrintTo/Views/Page/NumUpDown.xaml.cs b/Aucma.Core.PrintTo/Views/Page/NumUpDown.xaml.cs new file mode 100644 index 00000000..77480727 --- /dev/null +++ b/Aucma.Core.PrintTo/Views/Page/NumUpDown.xaml.cs @@ -0,0 +1,418 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Aucma.Core.PrintTo.Views.Page +{ + /// + /// NumUpDown.xaml 的交互逻辑 + /// + public partial class NumUpDown : UserControl + { + public NumUpDown() + { + InitializeComponent(); + } + /// + /// 当前值 + /// + private decimal AvaliableVal = 0; + + /// + /// Sync Resource + /// + private static object lockObj = new object(); + + /// + /// label 显示内容 + /// + public string LabeContent + { + get { return GetValue(LabeContentProperty).ToString(); } + set { SetValue(LabeContentProperty, value); } + } + + /// + /// 最小值 + /// + public decimal MinValue + { + get { return Convert.ToDecimal(GetValue(MinValueProperty)); } + set { SetValue(MinValueProperty, value); } + } + + /// + /// 最大值 + /// + public decimal MaxValue + { + get { return Convert.ToDecimal(GetValue(MaxValueProperty)); } + set + { + SetValue(MaxValueProperty, value); + } + } + + /// + /// 默认值 + /// + public decimal DefaultValue + { + get { return Convert.ToDecimal(GetValue(DefaultValueProperty)); } + set + { + SetValue(DefaultValueProperty, value); + NumericValue = DefaultValue; + } + } + + /// + /// 是否整数 + /// + public bool IsInteger + { + get { return Convert.ToBoolean(GetValue(IsIntegerProperty)); } + set { SetValue(IsIntegerProperty, value); } + } + + /// + /// 步长 + /// + public decimal OffsetValue + { + get { return Convert.ToDecimal(GetValue(OffsetValueProperty)); } + set { SetValue(OffsetValueProperty, value); } + } + + /// + /// 输入框值 + /// + public decimal NumericValue + { + get { return Convert.ToDecimal(GetValue(NumericValueProperty)); } + set + { + SetValue(NumericValueProperty, value); + } + } + + /// + /// 左侧的Label的宽度 + /// + public double LabelWidth + { + get { return Convert.ToDouble(GetValue(LabelWidthValueProperty)); } + set { SetValue(LabelWidthValueProperty, value); } + } + + /// + /// 标签的可见性 + /// + public string LabelVisibility + { + get { return Convert.ToString(GetValue(LabelVisibilityValueProperty)); } + set { SetValue(LabelVisibilityValueProperty, value); } + } + + public static readonly DependencyProperty LabeContentProperty = + DependencyProperty.Register("LabeContent", + typeof(string), + typeof(NumUpDown), + new PropertyMetadata("", new PropertyChangedCallback(LabelContentCallback)) + ); + + private static void LabelContentCallback(DependencyObject obj, DependencyPropertyChangedEventArgs e) + { + NumUpDown control = obj as NumUpDown; + //control.myNumLabelName.Content = e.NewValue.ToString(); + } + + public static readonly DependencyProperty MinValueProperty = + DependencyProperty.Register("MinValue", + typeof(decimal), + typeof(NumUpDown), + new PropertyMetadata(-1m, null) + ); + + public static readonly DependencyProperty MaxValueProperty = + DependencyProperty.Register("MaxValue", + typeof(decimal), + typeof(NumUpDown), + new PropertyMetadata(-1m, new PropertyChangedCallback(MaxValueChangedCallback)) + ); + + public static readonly DependencyProperty DefaultValueProperty = + DependencyProperty.Register("DefaultValue", + typeof(decimal), + typeof(NumUpDown) + ); + + public static readonly DependencyProperty IsIntegerProperty = + DependencyProperty.Register("IsInteger", + typeof(bool), + typeof(NumUpDown), new PropertyMetadata(false) + ); + + public static readonly DependencyProperty OffsetValueProperty = + DependencyProperty.Register("OffsetValue", + typeof(decimal), + typeof(NumUpDown), new PropertyMetadata(1m) + ); + + public static readonly DependencyProperty NumericValueProperty = + DependencyProperty.Register("NumericValue", + typeof(decimal), + typeof(NumUpDown), + new PropertyMetadata(new PropertyChangedCallback(NumericValueChangedCallback)) + ); + + public static readonly DependencyProperty LabelWidthValueProperty = + DependencyProperty.Register("LabelWidth", + typeof(double), + typeof(NumUpDown), + new PropertyMetadata(0.0, new PropertyChangedCallback(LabelWidthCallback)) + ); + + public static readonly DependencyProperty LabelVisibilityValueProperty = + DependencyProperty.Register("LabelVisibility", + typeof(string), + typeof(NumUpDown), + new PropertyMetadata("Visible", new PropertyChangedCallback(LabelVisibilityCallback)) + ); + + private static void LabelWidthCallback(DependencyObject obj, DependencyPropertyChangedEventArgs e) + { + NumUpDown control = obj as NumUpDown; + //control.myNumLabelName.Width = double.Parse(string.IsNullOrEmpty(e.NewValue.ToString()) ? "0" : e.NewValue.ToString()); + } + + private static void LabelVisibilityCallback(DependencyObject obj, DependencyPropertyChangedEventArgs e) + { + NumUpDown control = obj as NumUpDown; + string visi = e.NewValue.ToString(); + //if (visi.Equals(Visibility.Visible.ToString())) + // control.myNumLabelName.Visibility = Visibility.Visible; + //else if (visi.Equals(Visibility.Hidden.ToString())) + // control.myNumLabelName.Visibility = Visibility.Hidden; + //else + // control.myNumLabelName.Visibility = Visibility.Collapsed; + } + + private static void MaxValueChangedCallback(DependencyObject obj, DependencyPropertyChangedEventArgs e) + { + NumUpDown control = obj as NumUpDown; + control.tbContent.MaxLength = e.NewValue.ToString().Length; + } + + private static void NumericValueChangedCallback(DependencyObject obj, DependencyPropertyChangedEventArgs e) + { + NumUpDown control = obj as NumUpDown; + control.AvaliableVal = Convert.ToDecimal(e.NewValue); + control.tbContent.Text = e.NewValue.ToString(); + control.tbContent.SelectionStart = control.tbContent.Text.Length; + } + + /// + /// 增加按钮 + /// + /// + /// + private void btnAddClick(object sender, RoutedEventArgs e) + { + decimal offsetValue = OffsetValue; + AvaliableVal = Convert.ToDecimal(tbContent.Text); + decimal newValue; + + if (AvaliableVal > MaxValue) + { + NumericValue = MaxValue; + return; + } + if (AvaliableVal + offsetValue > MaxValue) + { + NumericValue = MaxValue; + return; + } + newValue = AvaliableVal + offsetValue; + if (newValue < MinValue) + { + NumericValue = MinValue; + return; + } + if (IsInteger) + newValue = decimal.Parse(newValue.ToString("0")); + else + newValue = decimal.Parse(newValue.ToString("0.######")); + tbContent.Text = newValue.ToString(); + NumericValue = newValue; + } + + /// + /// 减少按钮 + /// + /// + /// + private void btnSubClick(object sender, RoutedEventArgs e) + { + AvaliableVal = Convert.ToDecimal(tbContent.Text); + if (AvaliableVal < MinValue) + { + NumericValue = MinValue; + return; + } + if (AvaliableVal - OffsetValue < MinValue) + { + NumericValue = MinValue; + return; + } + if (AvaliableVal > MaxValue) + { + NumericValue = MaxValue; + return; + } + decimal newValue; + newValue = AvaliableVal - OffsetValue; + if (IsInteger) + newValue = decimal.Parse(newValue.ToString("0")); + else + newValue = decimal.Parse(newValue.ToString("0.######")); + tbContent.Text = newValue.ToString(); + NumericValue = newValue; + } + + /// + /// 获取焦点 + /// + /// + /// + private void tbContentGotFocus(object sender, RoutedEventArgs e) + { + TextBox tb = sender as System.Windows.Controls.TextBox; + this.AvaliableVal = Convert.ToDecimal(tb.Text); + } + + /// + /// 是否数字 + /// + /// + /// + private bool IsNumber(string input) + { + string pattern = "^-?\\d+$|^(-?\\d+)(\\.\\d+)?$"; + Regex regex = new Regex(pattern); + return regex.IsMatch(input); + } + + /// + /// 是否整数 + /// + /// + /// + private bool IsWholeNumber(string strNumber) + { + Regex g = new Regex(@"^[0-9]\d*$"); + return g.IsMatch(strNumber); + } + + /// + /// 数字Text变动Event + /// + /// + /// + private void tbContentTextChanged(object sender, TextChangedEventArgs e) + { + lock (lockObj) + { + TextBox tb = sender as TextBox; + if (tb != null) + { + bool isNumeric = IsNumber(tb.Text); + if (isNumeric) + { + var vv = Convert.ToDecimal(tb.Text); + if (vv > MaxValue && MaxValue != -1) + { + //此句为了解决实际应用时数据刷新的问题 + NumericValue = MaxValue - 1; + try + { + System.Threading.Thread.Sleep(0); + } + catch { } + NumericValue = MaxValue; + return; + } + NumericValue = vv; + } + else + { + //NumericValue = null; + } + } + } + } + + /// + /// Lost焦点事件处理 + /// + /// + /// + private void tbCntLostFocus(object sender, RoutedEventArgs e) + { + lock (lockObj) + { + TextBox tb = sender as TextBox; + bool isNumeric = IsNumber(tb.Text); + if (isNumeric && IsInteger) + { + isNumeric = IsWholeNumber(tb.Text); + } + decimal oldValue = this.AvaliableVal; + if (isNumeric) + { + decimal ctrlValue = Convert.ToDecimal(tb.Text); + if (ctrlValue < MinValue) + { + if (oldValue <= MaxValue && oldValue >= MinValue) + NumericValue = oldValue; + else + NumericValue = MinValue; + AvaliableVal = NumericValue; + } + else if (ctrlValue > MaxValue) + { + if (oldValue <= MaxValue && oldValue >= MinValue) + NumericValue = oldValue; + else + NumericValue = MaxValue; + AvaliableVal = NumericValue; + } + else + { + AvaliableVal = ctrlValue; + NumericValue = AvaliableVal; + } + } + else + { + if (oldValue > MaxValue || oldValue < MinValue) + oldValue = DefaultValue; + tb.Text = oldValue.ToString(); + NumericValue = oldValue; + } + } + } + } +} diff --git a/Aucma.Core.PrintTo/Views/PrintToDevView.xaml b/Aucma.Core.PrintTo/Views/PrintToDevView.xaml index 9113bc0e..c4412343 100644 --- a/Aucma.Core.PrintTo/Views/PrintToDevView.xaml +++ b/Aucma.Core.PrintTo/Views/PrintToDevView.xaml @@ -1,9 +1,9 @@ - diff --git a/Aucma.Core.PrintTo/Views/PrintToDevView.xaml.cs b/Aucma.Core.PrintTo/Views/PrintToDevView.xaml.cs index 01ad6b9b..6dfbac77 100644 --- a/Aucma.Core.PrintTo/Views/PrintToDevView.xaml.cs +++ b/Aucma.Core.PrintTo/Views/PrintToDevView.xaml.cs @@ -1,4 +1,4 @@ -using Admin.Core.Wpf.ViewModels; +using Aucma.Core.PrintTo.ViewModels; using System; using System.Collections.Generic; using System.Linq; @@ -13,7 +13,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; -namespace Admin.Core.Wpf.Views +namespace Aucma.Core.PrintTo.Views { /// /// PrintToDevView.xaml 的交互逻辑 diff --git a/Aucma.Core.PrintTo/Views/SupplementPrintPageView.xaml b/Aucma.Core.PrintTo/Views/SupplementPrintPageView.xaml index c715041a..8be0b15e 100644 --- a/Aucma.Core.PrintTo/Views/SupplementPrintPageView.xaml +++ b/Aucma.Core.PrintTo/Views/SupplementPrintPageView.xaml @@ -1,13 +1,13 @@ - diff --git a/Aucma.Core.PrintTo/Views/SupplementPrintPageView.xaml.cs b/Aucma.Core.PrintTo/Views/SupplementPrintPageView.xaml.cs index 2403ca17..6668b717 100644 --- a/Aucma.Core.PrintTo/Views/SupplementPrintPageView.xaml.cs +++ b/Aucma.Core.PrintTo/Views/SupplementPrintPageView.xaml.cs @@ -1,4 +1,4 @@ -using Admin.Core.Wpf.ViewModels; +using Aucma.Core.PrintTo.ViewModels; using System; using System.Collections.Generic; using System.Linq; @@ -13,7 +13,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; -namespace Admin.Core.Wpf.Views +namespace Aucma.Core.PrintTo.Views { /// /// SupplementPrintPageView.xaml 的交互逻辑 diff --git a/Aucma.Core.PrintTo/appsettings.json b/Aucma.Core.PrintTo/appsettings.json index dab43c9f..75ee43ec 100644 --- a/Aucma.Core.PrintTo/appsettings.json +++ b/Aucma.Core.PrintTo/appsettings.json @@ -20,44 +20,6 @@ "Name": "Admin.Core" } }, - "AppSettings": { - "RedisCachingAOP": { - "Enabled": false, - "ConnectionString": "" - }, - "MemoryCachingAOP": { - "Enabled": false - }, - "LogAOP": { - "Enabled": false - }, - "TranAOP": { - "Enabled": false - }, - "SqlAOP": { - "Enabled": false, - "OutToLogFile": { - "Enabled": false - }, - "OutToConsole": { - "Enabled": false - } - }, - "FileRootPath": "/file/", - "Date": "2018-08-28", - "Author": "Admin.Core", - "UseLoadTest": true, - "CacheTimeOut": 60, //服务器本地缓存过期时间：分钟 - "ApiRoot": "http://localhost:55014" - }, - "Audience": { - "Secret": "dk6Vv3oTuo2OMU18w86E3j11DtM7RUX5icQtA0DCKuhYDRUqBLIiL", //不要太短，16位+ - "SecretFile": "E:\\my-file\\admin.core.audience.secret.txt", //安全，内容就是Secret - "Issuer": "Admin.Core", - "Audience": "wr", - "Expiration": "6000000" //接口的过期时间 - }, - // 请配置MainDB为你想要的主库的ConnId值,并设置对应的Enabled为true； // *** 单库操作，把 MutiDBEnabled 设为false ***； // *** 多库操作，把 MutiDBEnabled 设为true，其他的从库Enabled也为true **； @@ -118,51 +80,9 @@ "UpdateTime": "2023-08-07 16:45:45.0530000" } ], - "Startup": { - "Cors": { - "PolicyName": "CorsIpAccess", //策略名称 - "EnableAllIPs": true, //当为true时，开放所有IP均可访问。 - // 支持多个域名端口，注意端口号后不要带/斜杆：比如localhost:8000/，是错的 - // 注意，http://127.0.0.1:1818 和 http://localhost:1818 是不一样的 - "IPs": "http://localhost:81,http://127.0.0.1:81" - }, - "AppConfigAlert": { - "Enabled": true - }, - "ApiName": "Admin.Core", - "IdentityServer4": { - "Enabled": false, // 这里默认是false，表示使用jwt，如果设置为true，则表示系统使用Ids4模式 - "AuthorizationUrl": "http://localhost:5004", // 认证中心域名 - "ApiName": "admin.core.api" // 资源服务器 - }, - "RedisMq": { - "Enabled": false //redis 消息队列 - }, - "MiniProfiler": { - "Enabled": false //性能分析开启 - }, - "Nacos": { - "Enabled": false //Nacos注册中心 - } - }, - "Redis": { - //"ConnectionString": "127.0.0.1:6379" - "ConnectionString": "127.0.0.1:6379" - }, - "RabbitMQ": { - "Enabled": true, - "Connection": "http://localhost:15672/", - "UserName": "robin", - "Password": "123456", - "RetryCount": 3 - }, - "EventBus": { - "Enabled": true, - "SubscriptionClientName": "Admin.Core" - }, "Middleware": { "QuartzNetJob": { - "Enabled": true + "Enabled": false }, "Scanner": { //扫码器 "Enabled": true @@ -174,52 +94,5 @@ "PortB": 6000, "Enabled": true } - }, - "IpRateLimiting": { - "EnableEndpointRateLimiting": false, //False: globally executed, true: executed for each - "StackBlockedRequests": false, //False: Number of rejections should be recorded on another counter - "RealIpHeader": "X-Real-IP", - "ClientIdHeader": "X-ClientId", - "IpWhitelist": [], //白名单 - "EndpointWhitelist": [ "get:/api/xxx", "*:/api/yyy" ], - "ClientWhitelist": [ "dev-client-1", "dev-client-2" ], - "QuotaExceededResponse": { - "Content": "{{\"status\":429,\"msg\":\"访问过于频繁，请稍后重试\",\"success\":false}}", - "ContentType": "application/json", - "StatusCode": 429 - }, - "HttpStatusCode": 429, //返回状态码 - "GeneralRules": [ //api规则,结尾一定要带* - { - "Endpoint": "*:/api/Admin*", - "Period": "1m", - "Limit": 20 - }, - { - "Endpoint": "*/api/*", - "Period": "1s", - "Limit": 3 - }, - { - "Endpoint": "*/api/*", - "Period": "1m", - "Limit": 30 - }, - { - "Endpoint": "*/api/*", - "Period": "12h", - "Limit": 500 - } - ] - }, - "LogFiedOutPutConfigs": { - "tcpAddressHost": "", // 输出elk的tcp连接地址 - "tcpAddressPort": 0, // 输出elk的tcp端口号 - "ConfigsInfo": [ // 配置的输出elk节点内容 常用语动态标识 - { - "FiedName": "applicationName", - "FiedValue": "Admin.Core.Api" - } - ] } } 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 780b4620..740516bd 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 b24a93bf..d92a0a79 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.Model.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.dll index 031fb309..a8e3e26b 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 865ac280..50a70ce1 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.Service.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.dll index ab66dc40..2784ab08 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 1c8cf51c..83882dda 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 cdf9fa1f..b599fa51 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 dc462a56..7e3dc738 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.deps.json b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.deps.json index 13ace91c..a73deedc 100644 --- a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.deps.json +++ b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.deps.json @@ -14,7 +14,10 @@ "Microsoft.Extensions.Configuration": "7.0.0", "Microsoft.Extensions.Configuration.Json": "7.0.0", "Microsoft.Extensions.DependencyInjection": "7.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "7.0.0" + "Microsoft.Extensions.Options.ConfigurationExtensions": "7.0.0", + "FastReport.Bars": "2013.2.5.0", + "FastReport": "2013.2.5.0", + "FastReport.Editor": "2013.2.5.0" }, "runtime": { "Aucma.Core.PrintTo.dll": {} @@ -2448,6 +2451,30 @@ "Aucma.Core.Scanner.dll": {} } }, + "FastReport.Bars/2013.2.5.0": { + "runtime": { + "FastReport.Bars.dll": { + "assemblyVersion": "2013.2.5.0", + "fileVersion": "2013.2.5.0" + } + } + }, + "FastReport/2013.2.5.0": { + "runtime": { + "FastReport.dll": { + "assemblyVersion": "2013.2.5.0", + "fileVersion": "0.0.0.0" + } + } + }, + "FastReport.Editor/2013.2.5.0": { + "runtime": { + "FastReport.Editor.dll": { + "assemblyVersion": "2013.2.5.0", + "fileVersion": "2013.2.5.0" + } + } + }, "HslCommunication/11.0.6.0": { "runtime": { "HslCommunication.dll": { @@ -4049,6 +4076,21 @@ "serviceable": false, "sha512": "" }, + "FastReport.Bars/2013.2.5.0": { + "type": "reference", + "serviceable": false, + "sha512": "" + }, + "FastReport/2013.2.5.0": { + "type": "reference", + "serviceable": false, + "sha512": "" + }, + "FastReport.Editor/2013.2.5.0": { + "type": "reference", + "serviceable": false, + "sha512": "" + }, "HslCommunication/11.0.6.0": { "type": "reference", "serviceable": false, 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 d01986b9..3ecc6113 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 4c259483..8893828c 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/bin/Debug/net6.0-windows/appsettings.json b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/appsettings.json index dab43c9f..75ee43ec 100644 --- a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/appsettings.json +++ b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/appsettings.json @@ -20,44 +20,6 @@ "Name": "Admin.Core" } }, - "AppSettings": { - "RedisCachingAOP": { - "Enabled": false, - "ConnectionString": "" - }, - "MemoryCachingAOP": { - "Enabled": false - }, - "LogAOP": { - "Enabled": false - }, - "TranAOP": { - "Enabled": false - }, - "SqlAOP": { - "Enabled": false, - "OutToLogFile": { - "Enabled": false - }, - "OutToConsole": { - "Enabled": false - } - }, - "FileRootPath": "/file/", - "Date": "2018-08-28", - "Author": "Admin.Core", - "UseLoadTest": true, - "CacheTimeOut": 60, //服务器本地缓存过期时间：分钟 - "ApiRoot": "http://localhost:55014" - }, - "Audience": { - "Secret": "dk6Vv3oTuo2OMU18w86E3j11DtM7RUX5icQtA0DCKuhYDRUqBLIiL", //不要太短，16位+ - "SecretFile": "E:\\my-file\\admin.core.audience.secret.txt", //安全，内容就是Secret - "Issuer": "Admin.Core", - "Audience": "wr", - "Expiration": "6000000" //接口的过期时间 - }, - // 请配置MainDB为你想要的主库的ConnId值,并设置对应的Enabled为true； // *** 单库操作，把 MutiDBEnabled 设为false ***； // *** 多库操作，把 MutiDBEnabled 设为true，其他的从库Enabled也为true **； @@ -118,51 +80,9 @@ "UpdateTime": "2023-08-07 16:45:45.0530000" } ], - "Startup": { - "Cors": { - "PolicyName": "CorsIpAccess", //策略名称 - "EnableAllIPs": true, //当为true时，开放所有IP均可访问。 - // 支持多个域名端口，注意端口号后不要带/斜杆：比如localhost:8000/，是错的 - // 注意，http://127.0.0.1:1818 和 http://localhost:1818 是不一样的 - "IPs": "http://localhost:81,http://127.0.0.1:81" - }, - "AppConfigAlert": { - "Enabled": true - }, - "ApiName": "Admin.Core", - "IdentityServer4": { - "Enabled": false, // 这里默认是false，表示使用jwt，如果设置为true，则表示系统使用Ids4模式 - "AuthorizationUrl": "http://localhost:5004", // 认证中心域名 - "ApiName": "admin.core.api" // 资源服务器 - }, - "RedisMq": { - "Enabled": false //redis 消息队列 - }, - "MiniProfiler": { - "Enabled": false //性能分析开启 - }, - "Nacos": { - "Enabled": false //Nacos注册中心 - } - }, - "Redis": { - //"ConnectionString": "127.0.0.1:6379" - "ConnectionString": "127.0.0.1:6379" - }, - "RabbitMQ": { - "Enabled": true, - "Connection": "http://localhost:15672/", - "UserName": "robin", - "Password": "123456", - "RetryCount": 3 - }, - "EventBus": { - "Enabled": true, - "SubscriptionClientName": "Admin.Core" - }, "Middleware": { "QuartzNetJob": { - "Enabled": true + "Enabled": false }, "Scanner": { //扫码器 "Enabled": true @@ -174,52 +94,5 @@ "PortB": 6000, "Enabled": true } - }, - "IpRateLimiting": { - "EnableEndpointRateLimiting": false, //False: globally executed, true: executed for each - "StackBlockedRequests": false, //False: Number of rejections should be recorded on another counter - "RealIpHeader": "X-Real-IP", - "ClientIdHeader": "X-ClientId", - "IpWhitelist": [], //白名单 - "EndpointWhitelist": [ "get:/api/xxx", "*:/api/yyy" ], - "ClientWhitelist": [ "dev-client-1", "dev-client-2" ], - "QuotaExceededResponse": { - "Content": "{{\"status\":429,\"msg\":\"访问过于频繁，请稍后重试\",\"success\":false}}", - "ContentType": "application/json", - "StatusCode": 429 - }, - "HttpStatusCode": 429, //返回状态码 - "GeneralRules": [ //api规则,结尾一定要带* - { - "Endpoint": "*:/api/Admin*", - "Period": "1m", - "Limit": 20 - }, - { - "Endpoint": "*/api/*", - "Period": "1s", - "Limit": 3 - }, - { - "Endpoint": "*/api/*", - "Period": "1m", - "Limit": 30 - }, - { - "Endpoint": "*/api/*", - "Period": "12h", - "Limit": 500 - } - ] - }, - "LogFiedOutPutConfigs": { - "tcpAddressHost": "", // 输出elk的tcp连接地址 - "tcpAddressPort": 0, // 输出elk的tcp端口号 - "ConfigsInfo": [ // 配置的输出elk节点内容 常用语动态标识 - { - "FiedName": "applicationName", - "FiedValue": "Admin.Core.Api" - } - ] } } diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.cs index 0cbee99d..203b2f31 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "57F3955820CFE7EB5354FD1FCC89EAA9C6B292AD" +#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7DDDC43E619425402846E0CEEAA32978A4959126" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf; +using Aucma.Core.PrintTo; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf { +namespace Aucma.Core.PrintTo { /// @@ -70,7 +70,7 @@ namespace Admin.Core.Wpf { [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public static void Main() { - Admin.Core.Wpf.App app = new Admin.Core.Wpf.App(); + Aucma.Core.PrintTo.App app = new Aucma.Core.PrintTo.App(); app.InitializeComponent(); app.Run(); } diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.i.cs index 02e3a588..203b2f31 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "57F3955820CFE7EB5354FD1FCC89EAA9C6B292AD" +#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7DDDC43E619425402846E0CEEAA32978A4959126" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf; +using Aucma.Core.PrintTo; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf { +namespace Aucma.Core.PrintTo { /// @@ -54,7 +54,7 @@ namespace Admin.Core.Wpf { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/app.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/app.xaml", System.UriKind.Relative); #line 1 "..\..\..\App.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -70,7 +70,7 @@ namespace Admin.Core.Wpf { [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public static void Main() { - Admin.Core.Wpf.App app = new Admin.Core.Wpf.App(); + Aucma.Core.PrintTo.App app = new Aucma.Core.PrintTo.App(); app.InitializeComponent(); app.Run(); } 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 9125cce3..09f8b50d 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.csproj.CoreCompileInputs.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.CoreCompileInputs.cache index 7c9b722b..eec1cbe0 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.CoreCompileInputs.cache +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -4bba49aac12b7b68d5ee8a96f71808fce09f66cf +a2739eabffe9c48e8b6d0b31533c4c33bb703c29 diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.FileListAbsolute.txt b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.FileListAbsolute.txt index 55e6a4bc..833146d8 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.FileListAbsolute.txt +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.FileListAbsolute.txt @@ -565,3 +565,10 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MvCodeR D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.Melsec.pdb D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.MelsecPLc.pdb D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.Scanner.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\FastReport.Bars.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\FastReport.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\FastReport.Editor.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Report\MaterialBar.frx +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\Page\NumUpDown.g.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\GeneratedInternalTypeHelper.g.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\Page\NumUpDown.baml diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.designer.deps.json b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.designer.deps.json index eb5d7e62..2b393a03 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.designer.deps.json +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.designer.deps.json @@ -146,14 +146,14 @@ } } }, - "log4net/2.0.12": { + "log4net/2.0.15": { "dependencies": { "System.Configuration.ConfigurationManager": "6.0.0" }, "runtime": { "lib/netstandard2.0/log4net.dll": { - "assemblyVersion": "2.0.12.0", - "fileVersion": "2.0.12.0" + "assemblyVersion": "2.0.15.0", + "fileVersion": "2.0.15.0" } } }, @@ -647,7 +647,7 @@ "Microsoft.Extensions.Configuration.Abstractions": "7.0.0", "Microsoft.Extensions.Configuration.Binder": "7.0.0", "Microsoft.Extensions.Logging": "5.0.0", - "log4net": "2.0.12" + "log4net": "2.0.15" }, "runtime": { "lib/net5.0/Microsoft.Extensions.Logging.Log4Net.AspNetCore.dll": { @@ -821,19 +821,19 @@ } } }, - "Microsoft.Win32.SystemEvents/6.0.0": { + "Microsoft.Win32.SystemEvents/7.0.0": { "runtime": { "lib/net6.0/Microsoft.Win32.SystemEvents.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.21.52210" + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" } }, "runtimeTargets": { "runtimes/win/lib/net6.0/Microsoft.Win32.SystemEvents.dll": { "rid": "win", "assetType": "runtime", - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.21.52210" + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" } } }, @@ -969,7 +969,7 @@ "Portable.BouncyCastle": "1.8.10", "SharpZipLib": "1.3.2", "System.Configuration.ConfigurationManager": "6.0.0", - "System.Drawing.Common": "6.0.0" + "System.Drawing.Common": "7.0.0" }, "runtime": { "lib/netstandard2.1/NPOI.OOXML.dll": { @@ -1942,28 +1942,22 @@ } } }, - "System.Drawing.Common/6.0.0": { + "System.Drawing.Common/7.0.0": { "dependencies": { - "Microsoft.Win32.SystemEvents": "6.0.0" + "Microsoft.Win32.SystemEvents": "7.0.0" }, "runtime": { "lib/net6.0/System.Drawing.Common.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.21.52210" + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" } }, "runtimeTargets": { - "runtimes/unix/lib/net6.0/System.Drawing.Common.dll": { - "rid": "unix", - "assetType": "runtime", - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.21.52210" - }, "runtimes/win/lib/net6.0/System.Drawing.Common.dll": { "rid": "win", "assetType": "runtime", - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.21.52210" + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" } } }, @@ -2913,7 +2907,7 @@ }, "System.Windows.Extensions/6.0.0": { "dependencies": { - "System.Drawing.Common": "6.0.0" + "System.Drawing.Common": "7.0.0" }, "runtime": { "lib/net6.0/System.Windows.Extensions.dll": { @@ -3085,12 +3079,12 @@ "path": "initq/1.0.0.7", "hashPath": "initq.1.0.0.7.nupkg.sha512" }, - "log4net/2.0.12": { + "log4net/2.0.15": { "type": "package", "serviceable": true, - "sha512": "sha512-9P67BCftJ7KG+B7rNOM1A9KczUwyEDed6zbAddy5Cj/73xVkzi+rEAHeOgUnW5wDqy1JFlY8+oTP0m1PgJ03Tg==", - "path": "log4net/2.0.12", - "hashPath": "log4net.2.0.12.nupkg.sha512" + "sha512": "sha512-GahnO9ZgFka+xYcFwAfIFjW+k86P2nxFoaEpH6t3v4hiGj7tv2ksVZphxCVIHmJxoySS0HeU3dgCW+bSCcfD0A==", + "path": "log4net/2.0.15", + "hashPath": "log4net.2.0.15.nupkg.sha512" }, "MaterialDesignColors/2.1.2": { "type": "package", @@ -3484,12 +3478,12 @@ "path": "microsoft.win32.registry/4.7.0", "hashPath": "microsoft.win32.registry.4.7.0.nupkg.sha512" }, - "Microsoft.Win32.SystemEvents/6.0.0": { + "Microsoft.Win32.SystemEvents/7.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==", - "path": "microsoft.win32.systemevents/6.0.0", - "hashPath": "microsoft.win32.systemevents.6.0.0.nupkg.sha512" + "sha512": "sha512-2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ==", + "path": "microsoft.win32.systemevents/7.0.0", + "hashPath": "microsoft.win32.systemevents.7.0.0.nupkg.sha512" }, "Microsoft.Xaml.Behaviors.Wpf/1.1.39": { "type": "package", @@ -4051,12 +4045,12 @@ "path": "system.directoryservices.protocols/6.0.1", "hashPath": "system.directoryservices.protocols.6.0.1.nupkg.sha512" }, - "System.Drawing.Common/6.0.0": { + "System.Drawing.Common/7.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", - "path": "system.drawing.common/6.0.0", - "hashPath": "system.drawing.common.6.0.0.nupkg.sha512" + "sha512": "sha512-KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==", + "path": "system.drawing.common/7.0.0", + "hashPath": "system.drawing.common.7.0.0.nupkg.sha512" }, "System.Dynamic.Runtime/4.3.0": { "type": "package", diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.designer.runtimeconfig.json b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.designer.runtimeconfig.json index 0571605e..1152362e 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.designer.runtimeconfig.json +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.designer.runtimeconfig.json @@ -16,8 +16,8 @@ } ], "additionalProbingPaths": [ - "C:\\Users\\Robin\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\Robin\\.nuget\\packages" + "C:\\Users\\admin\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\admin\\.nuget\\packages" ], "configProperties": { "Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true 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 d01986b9..3ecc6113 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.g.resources b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.g.resources index af91e880..fbcd4010 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.g.resources and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.g.resources 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 4c259483..8893828c 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_MarkupCompile.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache index 8b7fa582..8b8a8ec3 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache @@ -10,11 +10,11 @@ none false TRACE;DEBUG;NET;NET6_0;NETCOREAPP D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml -7-1193702131 +8-1065211271 21064389523 -20-584291401 -4152067969098 -Assets\Styles\DefaultStyles.xaml;Views\ButtomPageView.xaml;Views\HomeWindowView.xaml;Views\IndexPage.xaml;Views\MainWindow.xaml;Views\PrintToDevView.xaml;Views\SupplementPrintPageView.xaml; +211934508404 +418-191831438 +Assets\Styles\DefaultStyles.xaml;Views\ButtomPageView.xaml;Views\HomeWindowView.xaml;Views\IndexPage.xaml;Views\MainWindow.xaml;Views\Page\NumUpDown.xaml;Views\PrintToDevView.xaml;Views\SupplementPrintPageView.xaml; -False +True diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.i.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.i.cache index 43883669..c813e47b 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.i.cache +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.i.cache @@ -10,11 +10,11 @@ none false TRACE;DEBUG;NET;NET6_0;NETCOREAPP D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml -7-1193702131 +8-1065211271 21064389523 -22480644388 -4152067969098 -Assets\Styles\DefaultStyles.xaml;Views\ButtomPageView.xaml;Views\HomeWindowView.xaml;Views\IndexPage.xaml;Views\MainWindow.xaml;Views\PrintToDevView.xaml;Views\SupplementPrintPageView.xaml; +23-1295523103 +418-191831438 +Assets\Styles\DefaultStyles.xaml;Views\ButtomPageView.xaml;Views\HomeWindowView.xaml;Views\IndexPage.xaml;Views\MainWindow.xaml;Views\Page\NumUpDown.xaml;Views\PrintToDevView.xaml;Views\SupplementPrintPageView.xaml; True diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref index 540539cb..38af0999 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref @@ -3,6 +3,7 @@ FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\ButtomPageView.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\HomeWindowView.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\IndexPage.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\Page\NumUpDown.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\PrintToDevView.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\SupplementPrintPageView.xaml;; diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs index 6e2e519f..36288f46 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.cs index e26e0dbb..3e382ed9 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\ButtomPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "22DBA06FC3DDBBD792B974D7A574E28A7BB6FD1B" +#pragma checksum "..\..\..\..\Views\ButtomPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6E774F39BB19E00A3125C563EFA6632946FBD45D" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.i.cs index 4a6960fa..3e382ed9 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\ButtomPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "22DBA06FC3DDBBD792B974D7A574E28A7BB6FD1B" +#pragma checksum "..\..\..\..\Views\ButtomPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6E774F39BB19E00A3125C563EFA6632946FBD45D" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// @@ -102,7 +102,7 @@ namespace Admin.Core.Wpf.Views { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/buttompageview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/buttompageview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\ButtomPageView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.cs index 7bb8501b..872854c0 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\HomeWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CA7E88C30A0F19FE2CCB63E734A6F5CC81DF5406" +#pragma checksum "..\..\..\..\Views\HomeWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "904E4C53BB8DAAF4E060169467016EC7A39C0F58" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf.Converters; using MaterialDesignThemes.Wpf.Transitions; @@ -37,7 +37,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.i.cs index 21481c95..872854c0 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\HomeWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CA7E88C30A0F19FE2CCB63E734A6F5CC81DF5406" +#pragma checksum "..\..\..\..\Views\HomeWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "904E4C53BB8DAAF4E060169467016EC7A39C0F58" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf.Converters; using MaterialDesignThemes.Wpf.Transitions; @@ -37,7 +37,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// @@ -57,7 +57,7 @@ namespace Admin.Core.Wpf.Views { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/homewindowview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/homewindowview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\HomeWindowView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.cs index 0d3ea251..01db6a69 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\IndexPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B160123D6CD58ECF9A8C91185B14E0F5C8F579E8" +#pragma checksum "..\..\..\..\Views\IndexPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3749AD74C5EE15C020F09690F0AF67B24ED46CDC" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,8 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; +using Aucma.Core.PrintTo.Views.Page; using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf.Converters; using MaterialDesignThemes.Wpf.Transitions; @@ -37,7 +38,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// @@ -46,7 +47,7 @@ namespace Admin.Core.Wpf.Views { public partial class IndexPage : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 109 "..\..\..\..\Views\IndexPage.xaml" + #line 161 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox queryParam; @@ -54,7 +55,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 114 "..\..\..\..\Views\IndexPage.xaml" + #line 166 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Primitives.UniformGrid HeightPanel; @@ -62,7 +63,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 120 "..\..\..\..\Views\IndexPage.xaml" + #line 172 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid dgvMH; @@ -70,7 +71,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 157 "..\..\..\..\Views\IndexPage.xaml" + #line 209 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox ProductNo; @@ -78,7 +79,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 163 "..\..\..\..\Views\IndexPage.xaml" + #line 215 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox ProductName; @@ -86,7 +87,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 168 "..\..\..\..\Views\IndexPage.xaml" + #line 220 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox MaterialName; @@ -94,15 +95,15 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 173 "..\..\..\..\Views\IndexPage.xaml" + #line 227 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBox PlanAmount; + internal System.Windows.Controls.Slider PlanAmount; #line default #line hidden - #line 179 "..\..\..\..\Views\IndexPage.xaml" + #line 232 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton 内胆; @@ -110,7 +111,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 180 "..\..\..\..\Views\IndexPage.xaml" + #line 233 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton U壳; @@ -166,7 +167,7 @@ namespace Admin.Core.Wpf.Views { this.MaterialName = ((System.Windows.Controls.TextBox)(target)); return; case 7: - this.PlanAmount = ((System.Windows.Controls.TextBox)(target)); + this.PlanAmount = ((System.Windows.Controls.Slider)(target)); return; case 8: this.内胆 = ((System.Windows.Controls.RadioButton)(target)); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.i.cs index 70fcd6fc..805e52bb 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.i.cs @@ -1,4 +1,5 @@ -#pragma checksum "..\..\..\..\Views\IndexPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B160123D6CD58ECF9A8C91185B14E0F5C8F579E8" +// Updated by XamlIntelliSenseFileGenerator 2023-10-27 00:12:11 +#pragma checksum "..\..\..\..\Views\IndexPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AF84DC30902BF2F4CBA83B54D92F84F1C5171E12" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +10,8 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; +using Aucma.Core.PrintTo.Views.Page; using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf.Converters; using MaterialDesignThemes.Wpf.Transitions; @@ -37,146 +39,142 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { - - +namespace Aucma.Core.PrintTo.Views +{ + + /// /// IndexPage /// - public partial class IndexPage : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - - - #line 109 "..\..\..\..\Views\IndexPage.xaml" + public partial class IndexPage : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector + { + + +#line 161 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox queryParam; - - #line default - #line hidden - - - #line 114 "..\..\..\..\Views\IndexPage.xaml" + +#line default +#line hidden + + +#line 166 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Primitives.UniformGrid HeightPanel; - - #line default - #line hidden - - - #line 120 "..\..\..\..\Views\IndexPage.xaml" + +#line default +#line hidden + + +#line 172 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid dgvMH; - - #line default - #line hidden - - - #line 157 "..\..\..\..\Views\IndexPage.xaml" + +#line default +#line hidden + + +#line 209 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox ProductNo; - - #line default - #line hidden - - - #line 163 "..\..\..\..\Views\IndexPage.xaml" + +#line default +#line hidden + + +#line 215 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox ProductName; - - #line default - #line hidden - - - #line 168 "..\..\..\..\Views\IndexPage.xaml" + +#line default +#line hidden + + +#line 220 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox MaterialName; - - #line default - #line hidden - - - #line 173 "..\..\..\..\Views\IndexPage.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBox PlanAmount; - - #line default - #line hidden - - - #line 179 "..\..\..\..\Views\IndexPage.xaml" + +#line default +#line hidden + + +#line 232 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton 内胆; - - #line default - #line hidden - - - #line 180 "..\..\..\..\Views\IndexPage.xaml" + +#line default +#line hidden + + +#line 233 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton U壳; - - #line default - #line hidden - + +#line default +#line hidden + private bool _contentLoaded; - + /// /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] - public void InitializeComponent() { - if (_contentLoaded) { + public void InitializeComponent() + { + if (_contentLoaded) + { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/indexpage.xaml", System.UriKind.Relative); - - #line 1 "..\..\..\..\Views\IndexPage.xaml" + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/indexpage.xaml", System.UriKind.Relative); + +#line 1 "..\..\..\..\Views\IndexPage.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); - - #line default - #line hidden + +#line default +#line hidden } - + [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] - void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { + void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) + { switch (connectionId) { - case 1: - this.queryParam = ((System.Windows.Controls.TextBox)(target)); - return; - case 2: - this.HeightPanel = ((System.Windows.Controls.Primitives.UniformGrid)(target)); - return; - case 3: - this.dgvMH = ((System.Windows.Controls.DataGrid)(target)); - return; - case 4: - this.ProductNo = ((System.Windows.Controls.TextBox)(target)); - return; - case 5: - this.ProductName = ((System.Windows.Controls.TextBox)(target)); - return; - case 6: - this.MaterialName = ((System.Windows.Controls.TextBox)(target)); - return; - case 7: - this.PlanAmount = ((System.Windows.Controls.TextBox)(target)); - return; - case 8: - this.内胆 = ((System.Windows.Controls.RadioButton)(target)); - return; - case 9: - this.U壳 = ((System.Windows.Controls.RadioButton)(target)); - return; + case 1: + this.queryParam = ((System.Windows.Controls.TextBox)(target)); + return; + case 2: + this.HeightPanel = ((System.Windows.Controls.Primitives.UniformGrid)(target)); + return; + case 3: + this.dgvMH = ((System.Windows.Controls.DataGrid)(target)); + return; + case 4: + this.ProductNo = ((System.Windows.Controls.TextBox)(target)); + return; + case 5: + this.ProductName = ((System.Windows.Controls.TextBox)(target)); + return; + case 6: + this.MaterialName = ((System.Windows.Controls.TextBox)(target)); + return; + case 7: + this.内胆 = ((System.Windows.Controls.RadioButton)(target)); + return; + case 8: + this.U壳 = ((System.Windows.Controls.RadioButton)(target)); + return; } this._contentLoaded = true; } + + internal System.Windows.Controls.Slider PlanAmount; } } diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.baml b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.baml index 877fedda..bd31307b 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.baml and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.baml differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.cs index c977e97e..9a5c3415 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D8A256CF883917A8B1B4089CB7A02D2E485F8835" +#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "52266B4CA390C842272A9F849984F8E23E877003" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -36,7 +36,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.i.cs index 25f037f6..5274d9d8 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D8A256CF883917A8B1B4089CB7A02D2E485F8835" +#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "52266B4CA390C842272A9F849984F8E23E877003" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -36,7 +36,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.cs index 77268d4a..32d78216 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\PrintToDevView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4A43B003400FFDD767F1B5BF08E8677B743532B3" +#pragma checksum "..\..\..\..\Views\PrintToDevView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D7CF668107A7F5DD8BEEDF90E48056C5BBCAABAF" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.i.cs index 5734faeb..32d78216 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\PrintToDevView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4A43B003400FFDD767F1B5BF08E8677B743532B3" +#pragma checksum "..\..\..\..\Views\PrintToDevView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D7CF668107A7F5DD8BEEDF90E48056C5BBCAABAF" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// @@ -70,7 +70,7 @@ namespace Admin.Core.Wpf.Views { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/printtodevview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/printtodevview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\PrintToDevView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.cs index ff60db8e..e36d1ce6 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\SupplementPrintPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "528D6F879BF54FB4AB2D83EC1CEEB407168C2D88" +#pragma checksum "..\..\..\..\Views\SupplementPrintPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E1F2D5584C4DC44A1BA3F715CFB9DBFAAED1F381" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf.Converters; using MaterialDesignThemes.Wpf.Transitions; @@ -37,7 +37,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.i.cs index 8b42399e..e36d1ce6 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\SupplementPrintPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "528D6F879BF54FB4AB2D83EC1CEEB407168C2D88" +#pragma checksum "..\..\..\..\Views\SupplementPrintPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E1F2D5584C4DC44A1BA3F715CFB9DBFAAED1F381" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf.Converters; using MaterialDesignThemes.Wpf.Transitions; @@ -37,7 +37,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// @@ -113,7 +113,7 @@ namespace Admin.Core.Wpf.Views { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/supplementprintpageview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/supplementprintpageview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\SupplementPrintPageView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/ref/Aucma.Core.PrintTo.dll b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/ref/Aucma.Core.PrintTo.dll index ec9c936c..69e18cfb 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/ref/Aucma.Core.PrintTo.dll and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/ref/Aucma.Core.PrintTo.dll differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/refint/Aucma.Core.PrintTo.dll b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/refint/Aucma.Core.PrintTo.dll index ec9c936c..69e18cfb 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/refint/Aucma.Core.PrintTo.dll and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/refint/Aucma.Core.PrintTo.dll differ diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/App.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/App.g.cs index 0cbee99d..203b2f31 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/App.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/App.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "57F3955820CFE7EB5354FD1FCC89EAA9C6B292AD" +#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7DDDC43E619425402846E0CEEAA32978A4959126" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf; +using Aucma.Core.PrintTo; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf { +namespace Aucma.Core.PrintTo { /// @@ -70,7 +70,7 @@ namespace Admin.Core.Wpf { [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public static void Main() { - Admin.Core.Wpf.App app = new Admin.Core.Wpf.App(); + Aucma.Core.PrintTo.App app = new Aucma.Core.PrintTo.App(); app.InitializeComponent(); app.Run(); } diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.assets.cache b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.assets.cache index 4ebcba7b..b6d3c7e5 100644 Binary files a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.assets.cache and b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.assets.cache differ diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache index 5704f1aa..30cc0341 100644 Binary files a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache and b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache index 5a9b8b0a..698e7ac6 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache @@ -10,11 +10,11 @@ none false TRACE;RELEASE;NET;NET6_0;NETCOREAPP D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml -7-1193702131 +8-1065211271 21064389523 -20-584291401 -415286307481 -Assets\Styles\DefaultStyles.xaml;Views\ButtomPageView.xaml;Views\HomeWindowView.xaml;Views\IndexPage.xaml;Views\MainWindow.xaml;Views\PrintToDevView.xaml;Views\SupplementPrintPageView.xaml; +211934508404 +418718960946 +Assets\Styles\DefaultStyles.xaml;Views\ButtomPageView.xaml;Views\HomeWindowView.xaml;Views\IndexPage.xaml;Views\MainWindow.xaml;Views\Page\NumUpDown.xaml;Views\PrintToDevView.xaml;Views\SupplementPrintPageView.xaml; True diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref index 540539cb..38af0999 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref @@ -3,6 +3,7 @@ FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\ButtomPageView.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\HomeWindowView.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\IndexPage.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\Page\NumUpDown.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\PrintToDevView.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\SupplementPrintPageView.xaml;; diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/ButtomPageView.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/ButtomPageView.g.cs index e26e0dbb..3e382ed9 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/ButtomPageView.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/ButtomPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\ButtomPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "22DBA06FC3DDBBD792B974D7A574E28A7BB6FD1B" +#pragma checksum "..\..\..\..\Views\ButtomPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6E774F39BB19E00A3125C563EFA6632946FBD45D" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/HomeWindowView.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/HomeWindowView.g.cs index 7bb8501b..872854c0 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/HomeWindowView.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/HomeWindowView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\HomeWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CA7E88C30A0F19FE2CCB63E734A6F5CC81DF5406" +#pragma checksum "..\..\..\..\Views\HomeWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "904E4C53BB8DAAF4E060169467016EC7A39C0F58" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf.Converters; using MaterialDesignThemes.Wpf.Transitions; @@ -37,7 +37,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/IndexPage.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/IndexPage.g.cs index 0d3ea251..01db6a69 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/IndexPage.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/IndexPage.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\IndexPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B160123D6CD58ECF9A8C91185B14E0F5C8F579E8" +#pragma checksum "..\..\..\..\Views\IndexPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3749AD74C5EE15C020F09690F0AF67B24ED46CDC" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,8 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; +using Aucma.Core.PrintTo.Views.Page; using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf.Converters; using MaterialDesignThemes.Wpf.Transitions; @@ -37,7 +38,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// @@ -46,7 +47,7 @@ namespace Admin.Core.Wpf.Views { public partial class IndexPage : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 109 "..\..\..\..\Views\IndexPage.xaml" + #line 161 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox queryParam; @@ -54,7 +55,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 114 "..\..\..\..\Views\IndexPage.xaml" + #line 166 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Primitives.UniformGrid HeightPanel; @@ -62,7 +63,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 120 "..\..\..\..\Views\IndexPage.xaml" + #line 172 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid dgvMH; @@ -70,7 +71,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 157 "..\..\..\..\Views\IndexPage.xaml" + #line 209 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox ProductNo; @@ -78,7 +79,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 163 "..\..\..\..\Views\IndexPage.xaml" + #line 215 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox ProductName; @@ -86,7 +87,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 168 "..\..\..\..\Views\IndexPage.xaml" + #line 220 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox MaterialName; @@ -94,15 +95,15 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 173 "..\..\..\..\Views\IndexPage.xaml" + #line 227 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBox PlanAmount; + internal System.Windows.Controls.Slider PlanAmount; #line default #line hidden - #line 179 "..\..\..\..\Views\IndexPage.xaml" + #line 232 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton 内胆; @@ -110,7 +111,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 180 "..\..\..\..\Views\IndexPage.xaml" + #line 233 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton U壳; @@ -166,7 +167,7 @@ namespace Admin.Core.Wpf.Views { this.MaterialName = ((System.Windows.Controls.TextBox)(target)); return; case 7: - this.PlanAmount = ((System.Windows.Controls.TextBox)(target)); + this.PlanAmount = ((System.Windows.Controls.Slider)(target)); return; case 8: this.内胆 = ((System.Windows.Controls.RadioButton)(target)); diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.baml b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.baml index 1fdad497..307990eb 100644 Binary files a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.baml and b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.baml differ diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.g.cs index c977e97e..9a5c3415 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D8A256CF883917A8B1B4089CB7A02D2E485F8835" +#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "52266B4CA390C842272A9F849984F8E23E877003" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -36,7 +36,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/PrintToDevView.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/PrintToDevView.g.cs index 77268d4a..32d78216 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/PrintToDevView.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/PrintToDevView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\PrintToDevView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4A43B003400FFDD767F1B5BF08E8677B743532B3" +#pragma checksum "..\..\..\..\Views\PrintToDevView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D7CF668107A7F5DD8BEEDF90E48056C5BBCAABAF" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/SupplementPrintPageView.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/SupplementPrintPageView.g.cs index ff60db8e..e36d1ce6 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/SupplementPrintPageView.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/SupplementPrintPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\SupplementPrintPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "528D6F879BF54FB4AB2D83EC1CEEB407168C2D88" +#pragma checksum "..\..\..\..\Views\SupplementPrintPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E1F2D5584C4DC44A1BA3F715CFB9DBFAAED1F381" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf.Views; +using Aucma.Core.PrintTo.Views; using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf.Converters; using MaterialDesignThemes.Wpf.Transitions; @@ -37,7 +37,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf.Views { +namespace Aucma.Core.PrintTo.Views { /// diff --git a/Aucma.Core.Scanner/obj/Debug/net6.0/Aucma.Core.Scanner.csproj.AssemblyReference.cache b/Aucma.Core.Scanner/obj/Debug/net6.0/Aucma.Core.Scanner.csproj.AssemblyReference.cache index 89ff92bd..6ce52696 100644 Binary files a/Aucma.Core.Scanner/obj/Debug/net6.0/Aucma.Core.Scanner.csproj.AssemblyReference.cache and b/Aucma.Core.Scanner/obj/Debug/net6.0/Aucma.Core.Scanner.csproj.AssemblyReference.cache differ 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 60357035..746ad3ff 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_MarkupCompile.cache b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache index 42613dcc..fbb4c669 100644 --- a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache +++ b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache @@ -16,5 +16,5 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\App.xaml 417-1046291176 Assets\Styles\DefaultStyles.xaml;Views\IndexPage.xaml;Views\LogPageView.xaml;Views\MainWindow.xaml;Views\SplitPlanView.xaml;Views\StatisticsPageView.xaml; -False +True diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs index c65238fb..36288f46 100644 --- a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -1,2 +1,62 @@ - +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.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/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.assets.cache b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.assets.cache index d8a0a569..2f0eb1e3 100644 Binary files a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.assets.cache and b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.assets.cache differ diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache index ecdbb02c..3d152920 100644 Binary files a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache and b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache index eb685d8f..21c3d626 100644 --- a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache +++ b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache @@ -13,7 +13,7 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\App.xaml 61326282298 21064389523 23-37594985 -4171467014503 +417-135498792 Assets\Styles\DefaultStyles.xaml;Views\IndexPage.xaml;Views\LogPageView.xaml;Views\MainWindow.xaml;Views\SplitPlanView.xaml;Views\StatisticsPageView.xaml; True diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.lref b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.lref index b95f6374..3ba42a5a 100644 --- a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.lref +++ b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.lref @@ -1,4 +1,4 @@ - +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\obj\Release\net6.0-windows\GeneratedInternalTypeHelper.g.cs FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\App.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\Views\IndexPage.xaml;; FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\Views\LogPageView.xaml;; diff --git a/dll/Designer.exe b/dll/Designer.exe new file mode 100644 index 00000000..3588de22 Binary files /dev/null and b/dll/Designer.exe differ diff --git a/dll/FastReport.Bars.dll b/dll/FastReport.Bars.dll new file mode 100644 index 00000000..3e9eb6ce Binary files /dev/null and b/dll/FastReport.Bars.dll differ diff --git a/dll/FastReport.Editor.dll b/dll/FastReport.Editor.dll new file mode 100644 index 00000000..9c727e56 Binary files /dev/null and b/dll/FastReport.Editor.dll differ diff --git a/dll/FastReport.dll b/dll/FastReport.dll new file mode 100644 index 00000000..6665f27c Binary files /dev/null and b/dll/FastReport.dll differ