From 441bddc506b767fe7f945671f65b79a4e3d252de Mon Sep 17 00:00:00 2001 From: liuwf Date: Wed, 27 Mar 2024 11:20:50 +0800 Subject: [PATCH] =?UTF-8?q?change-=E5=88=86=E5=9E=9B=E6=94=B9=E8=B4=A7?= =?UTF-8?q?=E9=81=93=E5=9E=8B=E5=8F=B7=E8=AE=BE=E7=BD=AE=EF=BC=8C=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=E5=BC=80=E6=94=BE69=E7=A0=81=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.Core.Api/Admin.Core.Model.xml | 5 ++ .../net6.0/Admin.Core.Api.AssemblyInfo.cs | 2 +- .../Admin.Core.Api.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 6 +- .../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 144998 -> 143016 bytes .../net6.0/Admin.Core.Common.AssemblyInfo.cs | 4 -- ...Admin.Core.Common.AssemblyInfoInputs.cache | 4 -- .../Admin.Core.EventBus.AssemblyInfo.cs | 4 -- ...min.Core.EventBus.AssemblyInfoInputs.cache | 4 -- .../Admin.Core.Extensions.AssemblyInfo.cs | 4 -- ...n.Core.Extensions.AssemblyInfoInputs.cache | 4 -- .../Admin.Core.FrameWork.AssemblyInfo.cs | 4 -- ...in.Core.FrameWork.AssemblyInfoInputs.cache | 4 -- .../IService_New/IBaseOrderInfoServices.cs | 3 + .../ICodeBindingRecordServices.cs | 8 +++ .../IService_New/IProductOffLineServices.cs | 5 ++ .../ViewModels/ProductAllModel.cs | 25 ++++++++ ...Admin.Core.RealTimeService.AssemblyInfo.cs | 4 -- ...e.RealTimeService.AssemblyInfoInputs.cache | 4 -- .../Admin.Core.Serilog.Es.AssemblyInfo.cs | 4 -- ...n.Core.Serilog.Es.AssemblyInfoInputs.cache | 4 -- .../Service_New/BaseOrderInfoServices.cs | 1 + .../Service_New/CodeBindingRecordServices.cs | 17 +++++- .../net6.0/Admin.Core.Tasks.AssemblyInfo.cs | 4 -- .../Admin.Core.Tasks.AssemblyInfoInputs.cache | 4 -- .../ViewModels/IndexPageViewModel.cs | 2 +- .../Factory/PalletizFactory.cs | 2 +- .../Aucma.Core.Palletiz.csproj.user | 8 +++ .../Business/InstoreBusiness.cs | 4 ++ .../ViewModels/IndexPageViewModel.cs | 41 +++++++------ .../ViewModels/MainWindowViewModel.cs | 2 +- .../ViewModels/SelectTypeViewModel.cs | 55 +++++++++++++----- Aucma.Core.Palletiz/Views/IndexPageView.xaml | 6 +- Aucma.Core.Palletiz/Views/SelectType.xaml | 12 ++-- Aucma.Core.Palletiz/Views/SetRangeWindow.xaml | 17 ++++++ .../Views/SetRangeWindow.xaml.cs | 27 +++++++++ Aucma.Core.Palletiz/appsettings.json | 2 +- .../Business/offLineBusiness.cs | 6 +- .../HwControlLib.AssemblyInfo.cs | 4 -- .../HwControlLib.AssemblyInfoInputs.cache | 4 -- .../net6.0-windows/HwControlLib.assets.cache | Bin 324 -> 198 bytes .../obj/HwControlLib.csproj.nuget.dgspec.json | 31 ++++------ .../obj/HwControlLib.csproj.nuget.g.props | 10 ++-- HwControlLib/obj/project.assets.json | 33 ++++------- HwControlLib/obj/project.nuget.cache | 4 +- 45 files changed, 229 insertions(+), 171 deletions(-) create mode 100644 Admin.Core.Model/ViewModels/ProductAllModel.cs create mode 100644 Aucma.Core.Palletiz/Views/SetRangeWindow.xaml create mode 100644 Aucma.Core.Palletiz/Views/SetRangeWindow.xaml.cs diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index c306f333..3cd79122 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -6061,6 +6061,11 @@ 创建时间 + + + 分舵获取成品下线所有类型 + + 工位信息 diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs index afc9914f..54855832 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache index 1fe19e64..f397a84b 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -7ce13daf26e56bd8d3c3406081a61aabff4db9fa4cbea6946a0de6ad91f7687f +657de05911c5c4d0cacaf803801b5cfb9cac90ef diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig index 60b6cf63..6c5e02be 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig @@ -9,11 +9,9 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Api build_property.RootNamespace = Admin.Core.Api -build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Api\ build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api +build_property.MSBuildProjectDirectory = E:\c#\AUCMA\new\Admin.Core.Api build_property._RazorSourceGeneratorDebug = diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache index f43e60d74734ea0f581f7adaa9524bc31dbaac05..3cfa2f5f8df812ab46d54659a5b6acd7b4253bf5 100644 GIT binary patch delta 18407 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 Uf)_fOO-t&TDX+6H*sRk32Yp@Q0RR91 delta 20976 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 95797c6d9a18bfc6da212ef8f1ab31fca740c669 [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache index 8952ef54..b3b30e6b 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD 3c08b2a6f95957043123cba0d01dcd1675663fc7 -======= -62ae8b13d646c1bee38f596428b0c65aebc8cacc7f8546b0fc7f279f33ddbb5f ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs index 5dcb464f..a952d577 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache index 03e9a4ae..257bfd4c 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD 2af60005099f8dd0481f84ac0dfadb89cc4b6f1d -======= -9f6d3940f2a70f8fd050d6fe20a1178b54354adc92bcb268eeb7e95d388fdd79 ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs index 54bdafdc..93109f44 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache index 15ebc5fe..22c8e621 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD 790ffd47e6e46a3c8a83558ad3550154a5c81377 -======= -6fb9d9c8187ad98357a41595af7692e35588e2f7d760b068489ada94d6798f74 ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs index 5c985549..7a3f49c3 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache index cadffeb5..4390da2f 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD 7d60a94dd38c10522cbfe4a021ccb6e9c5da0354 -======= -7a1813a9a5d1d19b18e25488399390e5b0d29d88f5978494e031c73a36870caf ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 diff --git a/Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs b/Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs index 33a1e28f..b67c92ae 100644 --- a/Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs +++ b/Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs @@ -19,5 +19,8 @@ namespace Admin.Core.IService /// /// Task UpdatePrintName(BaseOrderInfo printName); + + + } } \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/ICodeBindingRecordServices.cs b/Admin.Core.IService/IService_New/ICodeBindingRecordServices.cs index 9918bcf0..c73cf740 100644 --- a/Admin.Core.IService/IService_New/ICodeBindingRecordServices.cs +++ b/Admin.Core.IService/IService_New/ICodeBindingRecordServices.cs @@ -34,5 +34,13 @@ namespace Admin.Core.IService /// /// Task> QueryByTime(); + + /// + /// 查询所有成品型号 + /// + /// + /// + public List GetAllProductModel(); + } } \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/IProductOffLineServices.cs b/Admin.Core.IService/IService_New/IProductOffLineServices.cs index 1eca7ed7..ef87e675 100644 --- a/Admin.Core.IService/IService_New/IProductOffLineServices.cs +++ b/Admin.Core.IService/IService_New/IProductOffLineServices.cs @@ -1,6 +1,7 @@ using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Model.Model_New; +using Admin.Core.Model.ViewModels; using System; using System.Collections.Generic; using System.Linq.Expressions; @@ -14,6 +15,10 @@ namespace Admin.Core.IService public interface IProductOffLineServices : IBaseServices { + + + + /// /// 条码系统获取校验字符串 /// diff --git a/Admin.Core.Model/ViewModels/ProductAllModel.cs b/Admin.Core.Model/ViewModels/ProductAllModel.cs new file mode 100644 index 00000000..efcf1648 --- /dev/null +++ b/Admin.Core.Model/ViewModels/ProductAllModel.cs @@ -0,0 +1,25 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model.ViewModels +{ + /// + /// 分舵获取成品下线所有类型 + /// + [SugarTable("GET_OFFLINE_ALL_MODEL", "AUCMA_SCADA")] + public class ProductAllModel + { + [SugarColumn(ColumnName = "PRODUCT_CODE")] + public string ProductCode { get; set; } + [SugarColumn(ColumnName = "PRODUCT_NAME")] + public string ProductName { get; set; } + [SugarColumn(ColumnName = "PRODUCT_MODEL")] + public string ProductModel { get; set; } + [SugarColumn(ColumnName = "PRODUCT_MASTER_MODEL")] + public string ProductMasterModel { get; set; } + } +} diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs index c14c1668..d49abd81 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache index 4649b980..d77b8cba 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD 0868e6bde5b49a65a126b91d794e990427a11761 -======= -b90aaf21ce2e9da9e13b0fb64d65797eba9a93af543963c310c73e113c750708 ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs index 0fbb01b2..80f512b2 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache index 116ce2b4..17b49c29 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD dbec6c73777a8ebf7006f00f1928199755951ac1 -======= -7e4c0482a63e6bdc9d58ba83f484a41ef7633ab886d66aa8de108234c74c3e9b ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 diff --git a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs index a2425b0f..946e7f94 100644 --- a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs @@ -162,6 +162,7 @@ namespace Admin.Core.Service return _baseOrderInfoRepository.UpdatePrintName(printName); } + } } diff --git a/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs b/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs index 9d3496ae..9da2c907 100644 --- a/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs +++ b/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs @@ -109,6 +109,21 @@ namespace Admin.Core.Service return await _codeBindingRecordRepository.QueryAsync(x => x.ProductCode == null, "RECORD_TIME1 DESC"); } - + + /// + /// 查询所有成品型号 + /// + /// + /// + public List GetAllProductModel() + { + var _db = this.BaseDal.Db; + + List list = _db.Ado.SqlQuery("select * from C##AUCMA_SCADA.GET_OFFLINE_ALL_MODEL"); + + return list; + } + + } } diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs index 9df70d9b..83f017e2 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache index 87f033b4..a5578479 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD da4240456d30e56fa6c5e71babf5565adb3e1436 -======= -ed2444c9be6f03c06e36309150ba72a30e6eef0501c11fcb012bc3a49ae67b45 ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 diff --git a/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs index b9785db7..77a6bbac 100644 --- a/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs @@ -51,7 +51,7 @@ namespace Aucma.Core.CodeBinding.ViewModels private readonly ICodeBindingRecordServices? _codeBindingRecordServices; private readonly IBaseMaterialInfoServices? _baseMaterialInfoServices; private readonly IBaseBomInfoServices? _baseBomInfoServices; - + private readonly IPrintBarCodeServices? _printBarCodeServices; // 过点数据表，物料完成记录MaterialCompletion private readonly IMaterialCompletionServices? _iMaterialCompletionServices; diff --git a/Aucma.Core.DataCollector/Factory/PalletizFactory.cs b/Aucma.Core.DataCollector/Factory/PalletizFactory.cs index 3039d939..8c516f9b 100644 --- a/Aucma.Core.DataCollector/Factory/PalletizFactory.cs +++ b/Aucma.Core.DataCollector/Factory/PalletizFactory.cs @@ -106,7 +106,7 @@ namespace Aucma.Core.DataCollector.Factory Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集设备用电数据"); var plc = _plc.plc; - var info = plc.Read("D7500", 40); + var info = plc.Read("D7602", 40); if (info != null) { diff --git a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user index 47af9b68..7e4433aa 100644 --- a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user +++ b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user @@ -6,6 +6,11 @@ Designer + + + Code + + Designer @@ -25,6 +30,9 @@ Designer + + Designer + Designer diff --git a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs index 017a2ff7..e29105e3 100644 --- a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs +++ b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs @@ -316,6 +316,10 @@ namespace Aucma.Core.Palletiz.Business spinFlag = 1; //4 } } + if(prodWeight == 100) + { + + } msg = $"成品码:{asciiStr},仓库区域:{spaceinfo.SpaceArea},匹配货道:{spaceinfo.SpaceCode}；旋转：{(spinFlag == 3 ? "0°" : "180°")};下发plc放行信号"; RefreshMsgEvent?.Invoke(msg); diff --git a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs index 72da57ea..4cc3b284 100644 --- a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs @@ -138,6 +138,8 @@ namespace Aucma.Core.Palletiz.ViewModels private ObservableCollection spaceItems = new ObservableCollection(); + private ObservableCollection spaceItemsB = new ObservableCollection(); + /// /// 刷新界面提示信息 @@ -163,42 +165,43 @@ namespace Aucma.Core.Palletiz.ViewModels private void Init() { - - App.Current.Dispatcher.BeginInvoke((Action)(() => + var info = inStoreBusiness.GetBaseSpaceinfos("A"); + info = info.OrderByDescending(x => x.ObjId).ToList(); + if (info != null) { - var info = inStoreBusiness.GetBaseSpaceinfos("A"); - if (info != null) + App.Current.Dispatcher.BeginInvoke((Action)(() => { if (spaceItems.Count > 0) { spaceItems.Clear(); } - - info = info.OrderBy(x => x.ObjId).ToList(); foreach (var item in info) { spaceItems.Add(item); } AreaA_SpaceInfo = spaceItems; - } - })); - App.Current.Dispatcher.BeginInvoke((Action)(() => + })); + } + + + var info2 = inStoreBusiness.GetBaseSpaceinfos("A"); + info2 = info2.OrderBy(x => x.ObjId).ToList(); + if (info2 != null) { - var info = inStoreBusiness.GetBaseSpaceinfos("A"); - if (info != null) + App.Current.Dispatcher.BeginInvoke((Action)(() => { - if (spaceItems.Count > 0) + if (spaceItemsB.Count > 0) { - spaceItems.Clear(); + spaceItemsB.Clear(); } - info = info.OrderBy(x => x.ObjId).ToList(); - foreach (var item in info) + foreach (var item in info2) { - spaceItems.Add(item); + spaceItemsB.Add(item); } - AreaB_SpaceInfo = spaceItems; - } - })); + AreaB_SpaceInfo = spaceItemsB; + })); + } + } } } diff --git a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs index 479c6f71..bd88bbea 100644 --- a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs @@ -88,7 +88,7 @@ namespace Aucma.Core.Palletiz.ViewModels /// public void RefreshPlc() { - var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("分垛库Plc")); + var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("InStoreAPlc")); if (obj != null) { if (obj.plc.IsConnected) diff --git a/Aucma.Core.Palletiz/ViewModels/SelectTypeViewModel.cs b/Aucma.Core.Palletiz/ViewModels/SelectTypeViewModel.cs index 1a8240eb..86ba5760 100644 --- a/Aucma.Core.Palletiz/ViewModels/SelectTypeViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/SelectTypeViewModel.cs @@ -2,6 +2,7 @@ using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Model.Model_New; +using Admin.Core.Model.ViewModels; using Admin.Core.Service; using Aucma.Core.Palletiz.Common; using Aucma.Core.Palletiz.Views; @@ -10,7 +11,9 @@ using CommunityToolkit.Mvvm.Input; using log4net; using Microsoft.Extensions.DependencyInjection; using System; +using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Linq; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; @@ -37,6 +40,8 @@ namespace Aucma.Core.Palletiz.ViewModels private readonly IBaseMaterialInfoServices? _baseMaterialInfoServices; private readonly IBaseOrderInfoServices? _baseOrderInfoServices; private readonly IBaseSpaceInfoServices _baseSpaceInfoServices; + private readonly ICodeBindingRecordServices? _codeBindingRecordServices; + private readonly IProductOffLineServices _offlineService; private string spaceCodes = string.Empty; private AppConfigHelper appConfig = new AppConfigHelper(); @@ -45,6 +50,8 @@ namespace Aucma.Core.Palletiz.ViewModels { _baseSpaceInfoServices = App.ServiceProvider.GetService(); _baseOrderInfoServices = App.ServiceProvider.GetService(); + _codeBindingRecordServices = App.ServiceProvider.GetService(); + _offlineService = App.ServiceProvider.GetService(); //_baseMaterialInfoServices = App.ServiceProvider.GetService(); SpaceInfo = space; @@ -71,11 +78,17 @@ namespace Aucma.Core.Palletiz.ViewModels string station = Appsettings.app("StationInfo", "StationCode"); if (!string.IsNullOrEmpty(selectedOption)) { - var infos = await _baseOrderInfoServices.QueryAsync(x => x.MaterialName.Contains(selectedOption)); + List list = _codeBindingRecordServices.GetAllProductModel(); + if (list != null) + { + list = list.Where(x=>x.ProductName.Contains(selectedOption)).ToList(); + if (list == null || list.Count==0) return; + } + // var infos = await _baseOrderInfoServices.QueryAsync(x => x.MaterialName.Contains(selectedOption)); MaterialDataGrid.Clear(); Application.Current.Dispatcher.Invoke(() => { - foreach (BaseOrderInfo info in infos) + foreach (ProductAllModel info in list) { MaterialDataGrid.Add(info); } @@ -110,11 +123,14 @@ namespace Aucma.Core.Palletiz.ViewModels //初始化加载数据 public async void Load(BaseSpaceInfo space) { - var infos = await _baseOrderInfoServices.QueryAsync(d=>d.CompleteAmount!=d.OrderAmount); + List list = _codeBindingRecordServices.GetAllProductModel(); + if(list==null || list.Count==0) return; + list = list.OrderBy(x=>x.ProductMasterModel).ToList(); + // var infos = await _baseOrderInfoServices.QueryAsync(d=>d.CompleteAmount!=d.OrderAmount); MaterialDataGrid.Clear(); Application.Current.Dispatcher.Invoke(() => { - foreach (BaseOrderInfo info in infos) + foreach (ProductAllModel info in list) { MaterialDataGrid.Add(info); } @@ -131,8 +147,8 @@ namespace Aucma.Core.Palletiz.ViewModels IsSelectedOptionB = true; } - planInfo.MaterialCode = space.MaterialType; - planInfo.MaterialName = space.typeNameA; + planInfo.ProductCode = space.MaterialType; + planInfo.ProductModel = space.typeNameA; if (SelectedRotation == null) { @@ -148,9 +164,9 @@ namespace Aucma.Core.Palletiz.ViewModels /// /// 初始化物料信息 /// - private ObservableCollection materialDataGrid = new ObservableCollection(); + private ObservableCollection materialDataGrid = new ObservableCollection(); - public ObservableCollection MaterialDataGrid + public ObservableCollection MaterialDataGrid { get { return materialDataGrid; } set => SetProperty(ref materialDataGrid, value); @@ -170,8 +186,8 @@ namespace Aucma.Core.Palletiz.ViewModels /// /// 初始化下拉列表 /// - private BaseOrderInfo selectedDataItem; - public BaseOrderInfo SelectedDataItem + private ProductAllModel selectedDataItem; + public ProductAllModel SelectedDataItem { get { return selectedDataItem; } set => SetProperty(ref selectedDataItem, value); @@ -191,8 +207,8 @@ namespace Aucma.Core.Palletiz.ViewModels if (info != null) { PlanInfo = info; - SpaceInfo.MaterialType = info.MaterialCode; - SpaceInfo.typeNameA = info.MaterialName; + SpaceInfo.MaterialType = info.ProductCode; + SpaceInfo.typeNameA = info.ProductModel; } } @@ -217,8 +233,8 @@ namespace Aucma.Core.Palletiz.ViewModels #endregion #region 计划信息 - private BaseOrderInfo planInfo = new BaseOrderInfo(); - public BaseOrderInfo PlanInfo + private ProductAllModel planInfo = new ProductAllModel(); + public ProductAllModel PlanInfo { get { return planInfo; } set => SetProperty(ref planInfo, value); @@ -433,11 +449,18 @@ namespace Aucma.Core.Palletiz.ViewModels { if (!string.IsNullOrEmpty(searchText)) { - var infos = await _baseOrderInfoServices.QueryAsync(x => (x.MaterialName.Contains(searchText) || x.MaterialCode.Contains(searchText))); + List list = _codeBindingRecordServices.GetAllProductModel(); + if (list != null) + { + list = list.Where(x => x.ProductName.Contains(searchText)).ToList(); + if (list == null || list.Count == 0) return; + } + + // var infos = await _baseOrderInfoServices.QueryAsync(x => (x.MaterialName.Contains(searchText) || x.MaterialCode.Contains(searchText))); MaterialDataGrid.Clear(); Application.Current.Dispatcher.Invoke(() => { - foreach (BaseOrderInfo info in infos) + foreach (ProductAllModel info in list) { MaterialDataGrid.Add(info); } diff --git a/Aucma.Core.Palletiz/Views/IndexPageView.xaml b/Aucma.Core.Palletiz/Views/IndexPageView.xaml index 4d15b0dd..4a4c67ee 100644 --- a/Aucma.Core.Palletiz/Views/IndexPageView.xaml +++ b/Aucma.Core.Palletiz/Views/IndexPageView.xaml @@ -160,7 +160,7 @@ @@ -213,7 +213,7 @@ --> diff --git a/Aucma.Core.Palletiz/Views/SelectType.xaml b/Aucma.Core.Palletiz/Views/SelectType.xaml index 6ff85de0..b11a2605 100644 --- a/Aucma.Core.Palletiz/Views/SelectType.xaml +++ b/Aucma.Core.Palletiz/Views/SelectType.xaml @@ -135,11 +135,13 @@ + SelectedItem="{Binding SelectedDataItem}" SelectionChanged="DataGrid_SelectionChanged" > - - + + + + @@ -170,11 +172,11 @@ - + - + diff --git a/Aucma.Core.Palletiz/Views/SetRangeWindow.xaml b/Aucma.Core.Palletiz/Views/SetRangeWindow.xaml new file mode 100644 index 00000000..197cee78 --- /dev/null +++ b/Aucma.Core.Palletiz/Views/SetRangeWindow.xaml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/Aucma.Core.Palletiz/Views/SetRangeWindow.xaml.cs b/Aucma.Core.Palletiz/Views/SetRangeWindow.xaml.cs new file mode 100644 index 00000000..3e690eaf --- /dev/null +++ b/Aucma.Core.Palletiz/Views/SetRangeWindow.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +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.Shapes; + +namespace Aucma.Core.Palletiz.Views +{ + /// + /// SetRangeWindow.xaml 的交互逻辑 + /// + public partial class SetRangeWindow : Window + { + public SetRangeWindow() + { + InitializeComponent(); + } + } +} diff --git a/Aucma.Core.Palletiz/appsettings.json b/Aucma.Core.Palletiz/appsettings.json index 95a7b24f..b11c9809 100644 --- a/Aucma.Core.Palletiz/appsettings.json +++ b/Aucma.Core.Palletiz/appsettings.json @@ -175,7 +175,7 @@ }, "TouchSocket": { "Enabled": true, - "Address": "10.10.92.231:5000" + "Address": "10.10.92.232:5000" } }, "ScannerServer": [ diff --git a/Aucma.Core.ProductOffLine/Business/offLineBusiness.cs b/Aucma.Core.ProductOffLine/Business/offLineBusiness.cs index 82e02fa1..0036cfb9 100644 --- a/Aucma.Core.ProductOffLine/Business/offLineBusiness.cs +++ b/Aucma.Core.ProductOffLine/Business/offLineBusiness.cs @@ -506,12 +506,12 @@ namespace Aucma.Core.ProductOffLine.Business BaseMaterialInfo materialInfo = _baseMaterialInfoServices.FirstAsync(x => x.ProductCode == code69).Result; if(materialInfo == null) { - TempOffLineInfo.MsgInfo = "69码校验失败:" + code69+"未在mes数据库找到信息!"; + TempOffLineInfo.MsgInfo = "69码校验失败:" + code69+"未维护69码信息!"; TempOffLineInfo.MsgAlarmFlag = true; RefreshScanMateriaCodeEvent?.Invoke(TempOffLineInfo); - log.Info("69码校验失败:" + code69 + "未在mes数据库找到信息!"); - // return false; 因为没有录69码校验失败暂不处理，允许下线，等69码录全就禁止下线 + log.Info("69码校验失败:" + code69 + "未维护69码信息!"); + return false; // 因为没有录69码校验失败暂不处理，允许下线，等69码录全就禁止下线 } if(materialInfo!=null) { diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs index 260108c0..83802a68 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 [assembly: System.Reflection.AssemblyProductAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache index 8de68b7c..36364a8e 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD 42cf648ef8280b16e9d1d1de3415777f5d872126 -======= -49ea3a11ac512c6a9f0475e17a7baf5c555a64a4dbb032b671d1b48f6eb1e163 ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache index 51e71961ca4bb7875ddebacffd8186c27e2916c4..2dc5ad687129f0c7389800c9ff71513b09a49a2d 100644 GIT binary patch literal 198 zcmWIWc6a1qU|=|Y*e#`IL6V%*V8XXFRwH`wIrq>F*!RiJ+(LnWR|9jRZMPbab99_aDG}zOtNxJ ZS+S9Ukx@)>N_LE2se5Wk08}|4n*n@tDNz6b literal 324 zcmWIWc6a1qU|`sGdAgrO8>i-UpIHtQ)-KHuOGwyVKb`lHg01>-=I~o>4vauWL;@C| zIt6E|n9$$p8Pq#09+PXa^EVH;Y zF-IY|q%NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Lenovo\.nuget\packages\;D:\开发环境\DevExpress\Components\Offline Packages;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder + C:\Users\ADMIN\.nuget\packages\;D:\mesnacSoft\c#\vs2022\sdk\NuGetPackages PackageReference - 6.9.1 + 6.6.0 - - - - + + \ No newline at end of file diff --git a/HwControlLib/obj/project.assets.json b/HwControlLib/obj/project.assets.json index a3f1b835..3fc6acff 100644 --- a/HwControlLib/obj/project.assets.json +++ b/HwControlLib/obj/project.assets.json @@ -8,28 +8,23 @@ "net6.0-windows7.0": [] }, "packageFolders": { - "C:\\Users\\Lenovo\\.nuget\\packages\\": {}, - "D:\\开发环境\\DevExpress\\Components\\Offline Packages": {}, - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Users\\ADMIN\\.nuget\\packages\\": {}, + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\HwControlLib\\HwControlLib.csproj", "projectName": "HwControlLib", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\", + "projectPath": "E:\\c#\\AUCMA\\new\\HwControlLib\\HwControlLib.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\HwControlLib\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -37,9 +32,8 @@ "net6.0-windows" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0-windows7.0": { @@ -51,11 +45,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -80,7 +69,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } } diff --git a/HwControlLib/obj/project.nuget.cache b/HwControlLib/obj/project.nuget.cache index 6939b358..a248d686 100644 --- a/HwControlLib/obj/project.nuget.cache +++ b/HwControlLib/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "8VHCZjfxPgjrzPcG94ZcZRTYMLoR3BoZWYVsc5F8CcWA2w5qr9WzBXilpzCvLkq4aV7eWTwXrr0qnESvVVeeyQ==", + "dgSpecHash": "o/CJUnM2bXJ203H1fZyY0hmxjifnu4IrxmXTTw01t8RbPVUTNGgU/9KCdt8cN6ejTY2ysaA++55IbCdsledzFg==", "success": true, - "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", + "projectFilePath": "E:\\c#\\AUCMA\\new\\HwControlLib\\HwControlLib.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file