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 f43e60d7..3cfa2f5f 100644 Binary files a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache and b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache differ diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs index 6824cd73..2aa8fa0f 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")] [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.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 51e71961..2dc5ad68 100644 Binary files a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache and b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache differ diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json index a108c74c..bd88c141 100644 --- a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json +++ b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json @@ -1,26 +1,23 @@ { "format": 1, "restore": { - "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": {} + "E:\\c#\\AUCMA\\new\\HwControlLib\\HwControlLib.csproj": {} }, "projects": { - "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": { + "E:\\c#\\AUCMA\\new\\HwControlLib\\HwControlLib.csproj": { "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" ], @@ -28,9 +25,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": { @@ -42,11 +38,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -71,7 +62,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/HwControlLib.csproj.nuget.g.props b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props index 29d9b574..410044ed 100644 --- a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props +++ b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props @@ -5,14 +5,12 @@ 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