From 73a50dec3e974a1ecd2685f6774905d653effbe1 Mon Sep 17 00:00:00 2001 From: "liulb@mesnac.com" Date: Fri, 24 Nov 2023 22:41:51 +0800 Subject: [PATCH] . --- Admin.Core.Api/Admin.Core.Model.xml | 176 +++- .../Admin.Core.Api.csproj.nuget.dgspec.json | 389 ++++---- .../obj/Admin.Core.Api.csproj.nuget.g.props | 9 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 137657 -> 137611 bytes Admin.Core.Api/obj/project.assets.json | 32 +- Admin.Core.Api/obj/project.nuget.cache | 438 ++++----- .../IExecutePlanInfoRepository.cs | 4 + .../IProductPlanInfoRepository.cs | 3 + .../IRecordProductFinishRepository.cs | 11 + ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../IService_New/IBaseBomInfoServices.cs | 7 + .../IService_New/IBaseSpaceDetailServices.cs | 46 + .../IService_New/IBaseSpaceInfoServices.cs | 24 +- .../IService_New/IExecutePlanInfoServices.cs | 96 ++ .../IService_New/IProductPlanInfoServices.cs | 32 +- .../IService_New/IRealTaskInfoServices.cs | 75 +- .../IService_New/IRecordInstoreServices.cs | 7 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- Admin.Core.Model/Model_New/BaseSpaceInfo.cs | 5 + Admin.Core.Model/Model_New/RealTaskInfo.cs | 6 +- Admin.Core.Model/Model_New/RecordOutstore.cs | 97 ++ .../Model_New/RecordProductFinish.cs | 52 + Admin.Core.Model/Model_New/SysUserInfo.cs | 6 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../ExecutePlanInfoRepository.cs | 20 +- .../ProductPlanInfoRepository.cs | 7 + ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Service_New/BaseBomInfoServices.cs | 14 + .../Service_New/BaseSpaceDetailServices.cs | 141 ++- .../Service_New/BaseSpaceInfoServices.cs | 25 +- .../Service_New/ExecutePlanInfoServices.cs | 249 ++++- .../Service_New/ProductPlanInfoServices.cs | 103 +- .../Service_New/RealTaskInfoServices.cs | 230 +++++ .../Service_New/RecordInstoreServices.cs | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Jobs/Job_BoxFoamInStoreTask_Quartz.cs | 4 +- .../Jobs/Job_BoxFoamOutStore_Quartz.cs | 22 +- Admin.Core.sln | 7 + Aucma.Core.BoxFoam/App.xaml | 12 +- Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj | 18 +- .../EnterWarehouseStatisticsPageViewModel.cs | 4 +- .../ViewModels/IndexPageViewModel.cs | 4 +- .../RealTimeInventoryPageViewModel.cs | 2 +- .../EnterWarehouseStatisticsPageView.xaml | 107 +- Aucma.Core.BoxFoam/Views/IndexPageView.xaml | 178 +++- Aucma.Core.BoxFoam/Views/MainWindow.xaml | 80 +- Aucma.Core.BoxFoam/Views/MonitorPageView.xaml | 135 ++- .../Views/UserPage/AfterFoamingPageView.xaml | 2 +- .../Views/UserPage/BeforeFoamingPageView.xaml | 2 +- .../Views/UserPage/SpaceDetailPageView.xaml | 146 ++- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- Aucma.Core.DoorFoam/App.xaml | 15 +- .../Aucma.Core.DoorFoam.csproj | 14 + .../ViewModels/IndexPageViewModel.cs | 3 + Aucma.Core.DoorFoam/Views/IndexPageView.xaml | 61 +- Aucma.Core.DoorFoam/Views/MainWindow.xaml | 85 +- .../Views/StatisticsPageView.xaml | 187 ++-- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Aucma.Core.Palletiz.csproj | 18 +- .../ViewModels/IndexPageViewModel.cs | 5 +- Aucma.Core.Palletiz/Views/IndexPageView.xaml | 208 +++- Aucma.Core.Palletiz/Views/MainWindow.xaml | 81 +- .../Views/StatisticsPageView.xaml | 160 ++- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- Aucma.Core.PrintTo/Views/IndexPage.xaml | 29 +- Aucma.Core.PrintTo/Views/MainWindow.xaml | 14 +- .../Models/SelectQualityModel.cs | 33 + .../ViewModels/IndexPageViewModel.cs | 8 +- .../ViewModels/QualityPageViewModel.cs | 23 +- .../ViewModels/SelectQualityViewModel.cs | 69 +- .../Views/MainWindow.xaml | 3 +- .../Views/QualityPageView.xaml | 13 +- .../Views/QualityPageView.xaml.cs | 33 +- .../Views/SelectQualityView.xaml | 53 +- .../Views/SelectQualityView.xaml.cs | 17 +- Aucma.Core.SheetMetal/App.xaml | 12 +- .../Aucma.Core.SheetMetal.csproj | 12 +- .../Aucma.Core.SheetMetal.csproj.user | 3 + .../ViewModels/IndexPageViewModel.cs | 46 +- Aucma.Core.SheetMetal/Views/IndexPage.xaml | 353 ++++--- Aucma.Core.SheetMetal/Views/LogPageView.xaml | 8 +- Aucma.Core.SheetMetal/Views/MainWindow.xaml | 83 +- .../Views/SplitPlanView.xaml | 122 ++- .../Views/StatisticsPageView.xaml | 154 ++- Aucma.Core.SheetMetal/appsettings.json | 3 + ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../PlanBusiness/AssemblyPlanBusiness.cs | 350 +++++++ .../PlanBusiness/InStoreBusiness.cs | 577 +++++++++++ .../PlanBusiness/OutStoreBusiness.cs | 920 ++++++++++++++++++ .../AssemblyPlan/AssemblyPlanViewModel.cs | 100 +- .../AssemblyPlan/QuantityIssuedViewModel.cs | 61 +- .../AssemblyPlan/SearchCriteriaViewModel.cs | 33 +- .../InStoreInfo/InStoreInfoViewModel.cs | 105 +- .../GeneratedInternalTypeHelper.g.i.cs | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0-windows/HwControlLib.assets.cache | Bin 198 -> 152 bytes .../HwControlLib_MarkupCompile.i.cache | 6 +- .../obj/HwControlLib.csproj.nuget.dgspec.json | 20 +- .../obj/HwControlLib.csproj.nuget.g.props | 7 +- HwControlLib/obj/project.assets.json | 19 +- HwControlLib/obj/project.nuget.cache | 4 +- 102 files changed, 5533 insertions(+), 1652 deletions(-) create mode 100644 Admin.Core.IRepository/IRepository_New/IRecordProductFinishRepository.cs create mode 100644 Admin.Core.Model/Model_New/RecordOutstore.cs create mode 100644 Admin.Core.Model/Model_New/RecordProductFinish.cs create mode 100644 Aucma.Core.ProductOffLine/Models/SelectQualityModel.cs create mode 100644 Aucma.Scada.UI/PlanBusiness/AssemblyPlanBusiness.cs create mode 100644 Aucma.Scada.UI/PlanBusiness/InStoreBusiness.cs create mode 100644 Aucma.Scada.UI/PlanBusiness/OutStoreBusiness.cs diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index e2b2de9c..cdb3647d 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -736,41 +736,6 @@ 是否执行中 - - - 质检项信息 - - - - - 主键标识 - - - - - 质检项/质量缺陷编号 - - - - - 质检项/质量缺陷名字 - - - - - 父级编号 - - - - - 启用标识 - - - - - 成品下线是否校验（0-不校验；1-校验） - - 货道明细 @@ -916,6 +881,11 @@ 在途数量 + + + 出库数量 + + 入库标识:1-允许入库；2-禁止入库 @@ -1481,6 +1451,11 @@ 任务编号 + + + 任务形式：0-自动；1-手动 + + 任务类型：1-入库；2-出库 @@ -1636,22 +1611,147 @@ 更新时间 + + + 出库记录 + + + + + 主键标识 + + + + + 仓库编号 + + + + + 仓库区域 + + + + + 货道编号 + + + + + 物料编号 + + + + + 物料名称 + + + + + 出库数量 + + + + + 出库时间 + + + + + 物料条码编号 + + + + + 物料类型 + + + + + 出库方式（0-正常，1-异常） + + + + + 是否标识 + + + + + 创建人 + + + + + 创建时间 + + + + + 更新人 + + + + + 更新时间 + + + + + 完成记录 + + + + + 主键标识 + + + + + 计划编号 + + + + + 物料编号 + + + + + 计划工位 + + + + + 完成数量 + + + + + 记录时间 + + + + + 是否标识 + + 用户信息 - + 用户Id，自增主键 - + 用户名称 - + 用户密码 diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json index 232dea16..4c4f1400 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json @@ -1,24 +1,20 @@ { "format": 1, "restore": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Api\\Admin.Core.Api.csproj": {} + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} }, "projects": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Api\\Admin.Core.Api.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectName": "Admin.Core.Api", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Api\\Admin.Core.Api.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Api\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -26,21 +22,20 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "C:\\Program Files\\dotnet\\sdk\\7.0.306\\Sdks\\Microsoft.NET.Sdk.Web\\library-packs": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Service\\Admin.Core.Service.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -83,25 +78,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", "projectName": "Admin.Core.Common", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -115,8 +106,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" } } } @@ -272,25 +263,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", "projectName": "Admin.Core.EventBus", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.EventBus\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -304,8 +291,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -345,25 +332,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", "projectName": "Admin.Core.Extensions", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Extensions\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -377,29 +360,29 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Repository\\Admin.Core.Repository.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Service\\Admin.Core.Service.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" } } } @@ -435,25 +418,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", "projectName": "Admin.Core.IRepository", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IRepository\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -467,11 +446,11 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Model\\Admin.Core.Model.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -501,25 +480,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IService\\Admin.Core.IService.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", "projectName": "Admin.Core.IService", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IService\\Admin.Core.IService.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IService\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -533,11 +508,11 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Model\\Admin.Core.Model.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -567,25 +542,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Model\\Admin.Core.Model.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", "projectName": "Admin.Core.Model", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Model\\Admin.Core.Model.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Model\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -599,8 +570,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -630,25 +601,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", "projectName": "Admin.Core.Repository", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Repository\\Admin.Core.Repository.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Repository\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -662,8 +629,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" } } } @@ -693,25 +660,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", "projectName": "Admin.Core.Serilog.Es", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Serilog.Es\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -782,25 +745,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Service\\Admin.Core.Service.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", "projectName": "Admin.Core.Service", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Service\\Admin.Core.Service.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Service\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -814,14 +773,14 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.IService\\Admin.Core.IService.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -851,25 +810,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", "projectName": "Admin.Core.Tasks", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Tasks\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -883,17 +838,17 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Model\\Admin.Core.Model.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Service\\Admin.Core.Service.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -929,25 +884,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", "projectName": "Aucma.Core.PLc", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.PLc\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -994,25 +945,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", "projectName": "Aucma.Core.RunPlc", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.RunPlc\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -1026,11 +973,11 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -1060,25 +1007,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", "projectName": "Aucma.Core.ScannerGun", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.ScannerGun\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -1119,25 +1062,21 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", "projectName": "Aucma.Core.Scanner", - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Aucma.Core.Scanner\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" - ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -1151,8 +1090,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "C:\\Users\\ADMIN\\Desktop\\tuisong\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1188,7 +1127,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } } diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props index a61685bc..a5a55588 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props @@ -5,19 +5,18 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\ADMIN\.nuget\packages\;D:\mesnacSoft\c#\vs2022\sdk\NuGetPackages + C:\Users\admin\.nuget\packages\ PackageReference - 6.6.0 + 6.7.0 - - + - C:\Users\ADMIN\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 + C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 \ No newline at end of file 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 86d46bd7..601c80d9 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,9 +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 = C:\Users\ADMIN\Desktop\tuisong\Admin.Core.Api\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\ build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = C:\Users\ADMIN\Desktop\tuisong\Admin.Core.Api +build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\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 715649e27a775624d66c6a4af96404fcc8cbae20..46e760dcd7fef7ab52e18eaf3c4a2899ab4c84c9 100644 GIT binary patch delta 11149 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 c@8H`@S public interface IExecutePlanInfoRepository : IBaseRepository { + Task> GetStationMaterialStats(string stationCode); + Task> GetStationHourAmount(string stationCode); } } \ No newline at end of file diff --git a/Admin.Core.IRepository/IRepository_New/IProductPlanInfoRepository.cs b/Admin.Core.IRepository/IRepository_New/IProductPlanInfoRepository.cs index b7d23b97..08e0fa60 100644 --- a/Admin.Core.IRepository/IRepository_New/IProductPlanInfoRepository.cs +++ b/Admin.Core.IRepository/IRepository_New/IProductPlanInfoRepository.cs @@ -1,4 +1,6 @@ using Admin.Core.Model; +using System.Collections.Generic; +using System.Threading.Tasks; namespace Admin.Core.IRepository { @@ -7,5 +9,6 @@ namespace Admin.Core.IRepository /// public interface IProductPlanInfoRepository : IBaseRepository { + } } \ No newline at end of file diff --git a/Admin.Core.IRepository/IRepository_New/IRecordProductFinishRepository.cs b/Admin.Core.IRepository/IRepository_New/IRecordProductFinishRepository.cs new file mode 100644 index 00000000..31c58175 --- /dev/null +++ b/Admin.Core.IRepository/IRepository_New/IRecordProductFinishRepository.cs @@ -0,0 +1,11 @@ +using Admin.Core.Model; + +namespace Admin.Core.IRepository +{ + /// + /// IRecordProductFinishRepository + /// + public interface IRecordProductFinishRepository : IBaseRepository + { + } +} \ No newline at end of file diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig index cb149e00..2b7e2280 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IRepository -build_property.ProjectDir = C:\Users\ADMIN\Desktop\tuisong\Admin.Core.IRepository\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IRepository\ diff --git a/Admin.Core.IService/IService_New/IBaseBomInfoServices.cs b/Admin.Core.IService/IService_New/IBaseBomInfoServices.cs index 49f0f58e..20750a23 100644 --- a/Admin.Core.IService/IService_New/IBaseBomInfoServices.cs +++ b/Admin.Core.IService/IService_New/IBaseBomInfoServices.cs @@ -18,5 +18,12 @@ namespace Admin.Core.IService /// /// Task GetChildenBomInfoByMaterialCode(string materialCode, string materialType); + + /// + /// 根据物料编号获取BOM信息 + /// + /// + /// + Task GetBomInfoByMaterialCode(string materialCode); } } \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/IBaseSpaceDetailServices.cs b/Admin.Core.IService/IService_New/IBaseSpaceDetailServices.cs index 4b32d481..5249dd71 100644 --- a/Admin.Core.IService/IService_New/IBaseSpaceDetailServices.cs +++ b/Admin.Core.IService/IService_New/IBaseSpaceDetailServices.cs @@ -1,5 +1,7 @@ using Admin.Core.IService; using Admin.Core.Model; +using System.Collections.Generic; +using System.Threading.Tasks; namespace Admin.Core.IService { @@ -8,5 +10,49 @@ namespace Admin.Core.IService /// public interface IBaseSpaceDetailServices : IBaseServices { + /// + /// 通过货道号获取货道明细 + /// + /// + /// + /// + Task> GetSpaceDetailsBySpaceCode(string storeCode, string spaceCode); + + /// + /// 通过物料编号获取货道明细 + /// + /// + /// + Task GetSpaceDetailByMaterialCode(string materialCode); + + /// + /// 根据物料类型获取可用的货道明细 + /// + /// + /// + /// + Task> GetSpaceDetailsByMaterialTypeAsync(string storeCode, string materialType); + + /// + /// 添加货道明细 + /// + /// + /// + Task InsertSpaceDetail(BaseSpaceDetail spaceDetail); + + /// + /// 修改货道明细 + /// + /// + /// + Task UpdateSpaceDetail(BaseSpaceDetail spaceDetail); + + /// + /// 根据物料编号删除货道明细 + /// + /// + /// + Task DeleteSpaceDetailByMaterialCode(string materialCode); + } } \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/IBaseSpaceInfoServices.cs b/Admin.Core.IService/IService_New/IBaseSpaceInfoServices.cs index b1d45314..34888591 100644 --- a/Admin.Core.IService/IService_New/IBaseSpaceInfoServices.cs +++ b/Admin.Core.IService/IService_New/IBaseSpaceInfoServices.cs @@ -24,7 +24,7 @@ namespace Admin.Core.IService /// /// /// - Task OutStoreGetSpaceInfoByMaterialCode(string store, string materialCode); + Task> OutStoreGetSpaceInfoByMaterialCode(string store, string materialCode); /// /// 通过货道编号获取货道信息 @@ -41,6 +41,26 @@ namespace Admin.Core.IService /// Task UpdateSpaceInfo(BaseSpaceInfo spaceInfo); - + /// + /// + /// + /// + /// + /// + List GetMaterialStock(string shellStoreCode, string linerStoreCode); + + /// + /// 通过物料类型获取货道信息,如果没有返回空白货道 + /// + /// + /// + /// + List GetBaseSpaceInfosByMaterialType(string storeCode, string materialType); + + /// + /// 获取空货道：未分配物料型号的空白货道 + /// + /// + List GetEmptySpaceInfo(string store); } } \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs b/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs index 25b15d4d..46f6967e 100644 --- a/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs +++ b/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs @@ -1,4 +1,5 @@ using Admin.Core.Model; +using System.Collections.Generic; using System.Threading.Tasks; namespace Admin.Core.IService @@ -8,9 +9,104 @@ namespace Admin.Core.IService /// public interface IExecutePlanInfoServices : IBaseServices { + /// + /// 计划上移 + /// + /// + /// + /// Task PlanMoveUp(string id,string station); + /// + /// 计划下移 + /// + /// + /// + /// Task PlanMoveDown(string id, string station); + /// + /// 删除计划 + /// + /// + /// Task ExecPlanDelete(string id); + /// + /// 下发计划 + /// + /// + /// Task PlanNextPass(ExecutePlanInfo sm); + + + #region 出入库操作 + /// + /// 通过产线工位获取执行计划 + /// + /// + /// + Task> GetExecutePlanInfosByProductLineCode(string productLineCode); + + /// + /// 通过生产计划编号获取执行计划 + /// + /// + /// + Task> GetExecutePlanInfosByProductPlanCode(string productPlanCode); + + /// + /// 通过执行计划编号获取执行计划 + /// + /// + /// + Task GetExecutePlanInfoByPlanCode(string executePlanCode); + + /// + /// 通过产线工位获取执行顺序（默认+1） + /// + /// + /// + Task GetExecuteOrderByProductLineCode(string productLineCode); + + /// + /// 新增执行计划 + /// + /// + /// + Task InsertExecutePlanInfo(ExecutePlanInfo executePlanInfo); + + /// + /// 修改执行计划 + /// + /// + /// + Task UpdateExecutePlanInfo(ExecutePlanInfo executePlanInfo); + + /// + /// 批量修改执行计划 + /// + /// + /// + Task UpdateRangeExecutePlanInfo(List executePlanInfos); + + /// + /// 根据执行计划编号删除执行计划 + /// + /// + /// + Task DeleteExecutePlanInfoByPlanCode(string executePlanCode); + + /// + /// 获取工位小时产量 + /// + /// + /// + Task> GetStationHourAmount(string stationCode); + + /// + /// 获取物料型号统计 + /// + /// + /// + Task> GetStationMaterialStats(string stationCode); + #endregion } } \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/IProductPlanInfoServices.cs b/Admin.Core.IService/IService_New/IProductPlanInfoServices.cs index 30e2ef86..03c96810 100644 --- a/Admin.Core.IService/IService_New/IProductPlanInfoServices.cs +++ b/Admin.Core.IService/IService_New/IProductPlanInfoServices.cs @@ -16,6 +16,36 @@ namespace Admin.Core.IService /// /// Task> QueryPlanInfo(string station); - + + #region 货道出入库 + + /// + /// 通过产线工位获取生产计划 + /// + /// + /// + Task> GetProductPlanInfosByProductLineCode(string productLineCode); + + /// + /// 通过计划编号获取计划信息 + /// + /// + /// + Task GetProductPlanByPlanCode(string planCode); + + /// + /// 添加生产计划 + /// + /// + /// + Task InsertProductPlanInfo(ProductPlanInfo productPlanInfo); + + /// + /// 修改生产计划 + /// + /// + /// + Task UpdateProductPlanInfo(ProductPlanInfo productPlanInfo); + #endregion } } \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/IRealTaskInfoServices.cs b/Admin.Core.IService/IService_New/IRealTaskInfoServices.cs index 3aa4eb69..a974e66d 100644 --- a/Admin.Core.IService/IService_New/IRealTaskInfoServices.cs +++ b/Admin.Core.IService/IService_New/IRealTaskInfoServices.cs @@ -1,5 +1,5 @@ -using Admin.Core.IService; -using Admin.Core.Model; +using Admin.Core.Model; +using System.Collections.Generic; using System.Threading.Tasks; namespace Admin.Core.IService @@ -9,6 +9,75 @@ namespace Admin.Core.IService /// public interface IRealTaskInfoServices : IBaseServices { - Task FirstAsync(); + /// + /// 添加任务信息 + /// + /// + /// + Task AddTaskInfo(RealTaskInfo taskInfo); + + /// + /// 更新任务信息 + /// + /// + /// + Task UpdateTaskInfo(RealTaskInfo taskInfo); + + /// + /// 批量修改任务信息 + /// + /// + /// + Task UpdateRangeTaskInfo(List taskInfos); + + /// + /// 删除任务信息 + /// + /// + Task DeleteTaskInfo(string taskCode, string storeCode = null); + + /// + /// 通过任务编号更新任务状态 + /// + /// + /// + /// + Task UpdateTaskStatusByTaskCode(string taskCode, int taskStatus); + + /// + /// 通过仓库编号获取待执行的任务信息，根据时间依次获取 + /// + /// + /// + Task GetTaskInfoByStoreCode(string storeCode, int taskType); + + /// + /// 通过任务号获取任务信息 + /// + /// + /// + Task GetTaskInfoByTaskCode(string taskCode, string storeCode); + + /// + /// 通过仓库编号获取任务 + /// + /// + /// + /// + Task> GetTaskInfosByStoreCode(string[] storeCode, int taskType); + + Task> GetTaskInfosByTaskCode(string taskCode); + + Task DeleteTaskInfoById(int id); + + /// + /// 获取指定状态的任务列表 + /// + /// + /// + /// 0返回所有状态；1-待执行；2-执行中；3-已完成 + /// + Task> GetTaskInfosByTaskStatus(string[] storeCode, int taskType, int taskStatus); + } } \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/IRecordInstoreServices.cs b/Admin.Core.IService/IService_New/IRecordInstoreServices.cs index ddab3faa..0b070323 100644 --- a/Admin.Core.IService/IService_New/IRecordInstoreServices.cs +++ b/Admin.Core.IService/IService_New/IRecordInstoreServices.cs @@ -1,5 +1,4 @@ -using Admin.Core.IService; -using Admin.Core.Model; +using Admin.Core.Model; using Admin.Core.Model.ViewModels; using System; using System.Collections.Generic; @@ -8,9 +7,9 @@ using System.Threading.Tasks; namespace Admin.Core.IService { /// - /// IRecordInstoreServices + /// IRecordInStoreServices /// - public interface IRecordInstoreServices : IBaseServices + public interface IRecordInStoreServices : IBaseServices { /// /// 开启事务记录信息 diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig index a40d728f..ba998751 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IService -build_property.ProjectDir = C:\Users\ADMIN\Desktop\tuisong\Admin.Core.IService\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IService\ diff --git a/Admin.Core.Model/Model_New/BaseSpaceInfo.cs b/Admin.Core.Model/Model_New/BaseSpaceInfo.cs index c19bbe65..d232bfc4 100644 --- a/Admin.Core.Model/Model_New/BaseSpaceInfo.cs +++ b/Admin.Core.Model/Model_New/BaseSpaceInfo.cs @@ -92,6 +92,11 @@ namespace Admin.Core.Model /// [SugarColumn(ColumnName = "ONROUTE_AMOUNT")] public int OnRouteAmount { get; set; } + /// + /// 出库数量 + /// + [SugarColumn(ColumnName = "OUTROUTE_AMOUNT")] + public int OutRouteAmount { get; set; } /// /// 入库标识:1-允许入库；2-禁止入库 diff --git a/Admin.Core.Model/Model_New/RealTaskInfo.cs b/Admin.Core.Model/Model_New/RealTaskInfo.cs index 2fa2fe1b..59656ee0 100644 --- a/Admin.Core.Model/Model_New/RealTaskInfo.cs +++ b/Admin.Core.Model/Model_New/RealTaskInfo.cs @@ -24,7 +24,11 @@ namespace Admin.Core.Model /// [SugarColumn(ColumnName = "TASK_CODE")] public string TaskCode { get; set; } - + /// + /// 任务形式：0-自动；1-手动 + /// + [SugarColumn(ColumnName = "TASK_MODEL")] + public int TaskModel { get; set; } /// /// 任务类型：1-入库；2-出库 /// diff --git a/Admin.Core.Model/Model_New/RecordOutstore.cs b/Admin.Core.Model/Model_New/RecordOutstore.cs new file mode 100644 index 00000000..8498c706 --- /dev/null +++ b/Admin.Core.Model/Model_New/RecordOutstore.cs @@ -0,0 +1,97 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model +{ + /// + /// 出库记录 + /// + [SugarTable("RECORD_OUTSTORE", "AUCMA_MES")] + public class RecordOutstore + { + /// + /// 主键标识 + /// + [SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_RECORD_OUTSTORE")] + public decimal ObjId { get; set; } + /// + /// 仓库编号 + /// + [SugarColumn(ColumnName = "STORE_CODE")] + public string StoreCode { get; set; } + /// + /// 仓库区域 + /// + [SugarColumn(ColumnName = "STORE_AREA")] + public string StoreArea { get; set; } + /// + /// 货道编号 + /// + [SugarColumn(ColumnName = "SPACE_CODE")] + public string SpaceCode { get; set; } + /// + /// 物料编号 + /// + [SugarColumn(ColumnName = "MATERIAL_CODE")] + public string MaterialCode { get; set; } + /// + /// 物料名称 + /// + [SugarColumn(ColumnName = "MATERIAL_NAME")] + public string MaterialName { get; set; } + /// + /// 出库数量 + /// + [SugarColumn(ColumnName = "OUT_STORE_AMOUNT")] + public decimal? OutStoreAmount { get; set; } + /// + /// 出库时间 + /// + [SugarColumn(ColumnName = "OUT_STORE_TIME")] + public DateTime? OutStoreTime { get; set; } + /// + /// 物料条码编号 + /// + [SugarColumn(ColumnName = "BARCODE_CODE")] + public string BarCodeCode { get; set; } + /// + /// 物料类型 + /// + [SugarColumn(ColumnName = "MATERIAL_TYPE")] + public string MaterialType { get; set; } + /// + /// 出库方式（0-正常，1-异常） + /// + [SugarColumn(ColumnName = "EXIT_PATTERN")] + public short? ExitPattern { get; set; } + /// + /// 是否标识 + /// + [SugarColumn(ColumnName = "IS_FLAG")] + public decimal? IsFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "CREATED_BY")] + public string CreatedBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CREATED_TIME")] + public DateTime? CreatedTime { get; set; } + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "UPDATED_BY")] + public string UpdatedBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "UPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/Admin.Core.Model/Model_New/RecordProductFinish.cs b/Admin.Core.Model/Model_New/RecordProductFinish.cs new file mode 100644 index 00000000..3b7b2d2e --- /dev/null +++ b/Admin.Core.Model/Model_New/RecordProductFinish.cs @@ -0,0 +1,52 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model +{ + /// + /// 完成记录 + /// + [SugarTable("RECORD_PRODUCTFINISH", "AUCMA_MES")] + public class RecordProductFinish + { + /// + /// 主键标识 + /// + [SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_RECORD_PRODUCTFINISH")] + public decimal ObjId { get; set; } + /// + /// 计划编号 + /// + [SugarColumn(ColumnName = "PLAN_CODE")] + public string PlanCode { get; set; } + /// + /// 物料编号 + /// + [SugarColumn(ColumnName = "MATERIAL_CODE")] + public string MaterialCode { get; set; } + /// + /// 计划工位 + /// + [SugarColumn(ColumnName = "PRODUCTLINE_CODE")] + public string ProductlineCode { get; set; } + /// + /// 完成数量 + /// + [SugarColumn(ColumnName = "COMPLETE_AMOUNT")] + public decimal? CompleteAmount { get; set; } + /// + /// 记录时间 + /// + [SugarColumn(ColumnName = "RECORD_TIME")] + public DateTime? RecordTime { get; set; } + /// + /// 是否标识 + /// + [SugarColumn(ColumnName = "IS_FLAG")] + public decimal? IsFlag { get; set; } + } +} diff --git a/Admin.Core.Model/Model_New/SysUserInfo.cs b/Admin.Core.Model/Model_New/SysUserInfo.cs index 7444765e..360e4e7f 100644 --- a/Admin.Core.Model/Model_New/SysUserInfo.cs +++ b/Admin.Core.Model/Model_New/SysUserInfo.cs @@ -18,19 +18,19 @@ namespace Admin.Core.Model /// 用户Id，自增主键 /// [SugarColumn(ColumnName = "USER_ID", IsPrimaryKey = true, IsIdentity = true)] - public int userId { get; set; } + public int UserId { get; set; } /// /// 用户名称 /// [SugarColumn(ColumnName = "USER_NAME")] - public string userName { get; set; } + public string UserName { get; set; } /// /// 用户密码 /// [SugarColumn(ColumnName = "PASSWORD")] - public string password { get; set; } + public string Password { get; set; } } } diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig index 6a79fb22..f17e3fdc 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Model -build_property.ProjectDir = C:\Users\ADMIN\Desktop\tuisong\Admin.Core.Model\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Model\ diff --git a/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs b/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs index 4b12ce9f..c8eb6bf6 100644 --- a/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs @@ -1,8 +1,10 @@ -using Admin.Core.Model; -using Admin.Core.Model.Model_New; -using Admin.Core.Repository; +using Admin.Core.IRepository; +using Admin.Core.Model; +using SqlSugar; +using System.Collections.Generic; +using System.Threading.Tasks; -namespace Admin.Core.IRepository +namespace Admin.Core.Repository { /// /// ExecutePlanInfoRepository @@ -12,5 +14,15 @@ namespace Admin.Core.IRepository public ExecutePlanInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork) { } + + public async Task> GetStationMaterialStats(string stationCode) + { + return await Db.Queryable().AS("GET_STATION_MATERIALSTATS").Where("PRODUCTLINE_CODE = @stationCode", new { stationCode = stationCode }).ToListAsync(); + } + + public async Task> GetStationHourAmount(string stationCode) + { + return await Db.Queryable().AS("GET_STATION_HOURAMOUNT").Where("PRODUCTLINE_CODE = @stationCode", new { stationCode = stationCode }).ToListAsync(); + } } } \ No newline at end of file diff --git a/Admin.Core.Repository/Repository_New/ProductPlanInfoRepository.cs b/Admin.Core.Repository/Repository_New/ProductPlanInfoRepository.cs index c60914c2..ed42b1f3 100644 --- a/Admin.Core.Repository/Repository_New/ProductPlanInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/ProductPlanInfoRepository.cs @@ -1,5 +1,10 @@ using Admin.Core.Model; using Admin.Core.Repository; +using Microsoft.IdentityModel.Logging; +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; namespace Admin.Core.IRepository { @@ -12,5 +17,7 @@ namespace Admin.Core.IRepository { } + + } } \ No newline at end of file diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig index d2bffe1e..41538400 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Repository -build_property.ProjectDir = C:\Users\ADMIN\Desktop\tuisong\Admin.Core.Repository\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\ diff --git a/Admin.Core.Service/Service_New/BaseBomInfoServices.cs b/Admin.Core.Service/Service_New/BaseBomInfoServices.cs index 2198c687..2cf44d2c 100644 --- a/Admin.Core.Service/Service_New/BaseBomInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseBomInfoServices.cs @@ -22,6 +22,20 @@ namespace Admin.Core.Service base.BaseDal = dal; } + public async Task GetBomInfoByMaterialCode(string materialCode) + { + BaseBomInfo bomInfo = null; + try + { + bomInfo = await _dal.FirstAsync(x => x.MaterialCode == materialCode); + } + catch (Exception ex) + { + logHelper.Error("根据物料编号获取BOM信息异常", ex); + } + return bomInfo; + } + public async Task GetChildenBomInfoByMaterialCode(string materialCode, string materialType) { BaseBomInfo bomInfo = null; diff --git a/Admin.Core.Service/Service_New/BaseSpaceDetailServices.cs b/Admin.Core.Service/Service_New/BaseSpaceDetailServices.cs index 6defb5f4..e38c7ded 100644 --- a/Admin.Core.Service/Service_New/BaseSpaceDetailServices.cs +++ b/Admin.Core.Service/Service_New/BaseSpaceDetailServices.cs @@ -1,17 +1,156 @@ using Admin.Core.IRepository; using Admin.Core.IService; using Admin.Core.Model; -using Admin.Core.Model.Model_New; +using System.Collections.Generic; +using System.Linq.Expressions; +using System; +using log4net; +using StackExchange.Profiling.Internal; +using Admin.Core.Common; +using System.Threading.Tasks; namespace Admin.Core.Service { public class BaseSpaceDetailServices : BaseServices, IBaseSpaceDetailServices { + private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(BaseSpaceDetailServices)); private readonly IBaseRepository _dal; public BaseSpaceDetailServices(IBaseRepository dal) { this._dal = dal; base.BaseDal = dal; } + + /// + /// 根据物料编号删除货道明细 + /// + /// + /// + public async Task DeleteSpaceDetailByMaterialCode(string materialCode) + { + bool result = false; + try + { + BaseSpaceDetail spaceDetail =await this.GetSpaceDetailByMaterialCode(materialCode); + result = _dal.Delete(spaceDetail); + + } + catch (Exception ex) + { + logHelper.Error("根据物料编号删除货道明细异常", ex); + } + return result; + } + + /// + /// 通过物料编号获取货道明细 + /// + /// + /// + public async Task GetSpaceDetailByMaterialCode(string materialCode) + { + BaseSpaceDetail spaceDetail = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.MaterialCode == materialCode); + + spaceDetail =await _dal.FirstAsync(exp); + + logHelper.Info($"根据物料编号{materialCode}；获取到的货道明细信息：{spaceDetail.ToJson()}"); + } + catch (Exception ex) + { + logHelper.Error("通过物料编号获取货道明细", ex); + } + return spaceDetail; + } + + /// + /// 根据物料类型获取可用的货道明细 + /// + /// + /// + /// + public async Task> GetSpaceDetailsByMaterialTypeAsync(string storeCode, string materialType) + { + List spaceDetails = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.StoreCode == storeCode && x.MaterialType == materialType && x.IsFlag != 1); + spaceDetails = await _dal.QueryAsync(exp); + + logHelper.Info($"根据仓库编号：{storeCode}；物料类型：{materialType}；获取到的货道明细：{spaceDetails}"); + } + catch (Exception ex) + { + logHelper.Error("通过物料类型获取货道明细异常", ex); + } + return spaceDetails; + } + + /// + /// 通过货道号获取货道明细 + /// + /// + /// + /// + public async Task> GetSpaceDetailsBySpaceCode(string storeCode, string spaceCode) + { + List spaceDetails = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.StoreCode == storeCode && x.SpaceCode == spaceCode); + spaceDetails =await _dal.QueryAsync(exp); + + logHelper.Info($"根据仓库编号：{storeCode}；货道编号：{spaceCode}；获取到的执货道明细：{spaceDetails.ToJson()}"); + } + catch (Exception ex) + { + logHelper.Error("通过货道号获取货道明细异常", ex); + } + return spaceDetails; + } + + /// + /// 添加货道明细 + /// + /// + /// + public async Task InsertSpaceDetail(BaseSpaceDetail spaceDetail) + { + bool result = false; + try + { + int r=await _dal.AddAsync(spaceDetail); + if (r > 0) { result = true; } + } + catch (Exception ex) + { + logHelper.Error("添加货道明细异常", ex); + } + return result; + } + + /// + /// 更新货道明细 + /// + /// + /// + public async Task UpdateSpaceDetail(BaseSpaceDetail spaceDetail) + { + bool result = false; + try + { + result =await _dal.UpdateAsync(spaceDetail); + } + catch (Exception ex) + { + logHelper.Error("更新货道明细异常", ex); + } + return result; + } } } \ No newline at end of file diff --git a/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs b/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs index ef277adf..3fe4d3ac 100644 --- a/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs @@ -119,10 +119,9 @@ namespace Admin.Core.Service /// /// /// - public async Task OutStoreGetSpaceInfoByMaterialCode(string store, string materialType) + public async Task> OutStoreGetSpaceInfoByMaterialCode(string store, string materialType) { - BaseSpaceInfo spaceInfo = null; - List spaceInfos; + List spaceInfos = null; try { //Expression> exp = s1 => true; @@ -135,7 +134,7 @@ namespace Admin.Core.Service { logHelper.Error("出库通过物料类型获取货道信息异常", ex); } - return spaceInfo; + return spaceInfos; } #endregion @@ -202,8 +201,24 @@ namespace Admin.Core.Service } return result; } + + #endregion - + + public List GetMaterialStock(string shellStoreCode, string linerStoreCode) + { + throw new NotImplementedException(); + } + + public List GetBaseSpaceInfosByMaterialType(string storeCode, string materialType) + { + throw new NotImplementedException(); + } + + List IBaseSpaceInfoServices.GetEmptySpaceInfo(string store) + { + throw new NotImplementedException(); + } } } \ No newline at end of file diff --git a/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs b/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs index 27908f31..13942e25 100644 --- a/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs +++ b/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs @@ -1,24 +1,34 @@ using Admin.Core.IRepository; using Admin.Core.IService; using Admin.Core.Model; -using Admin.Core.Model.Model_New; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using System; using Aucma.Core.PLc; +using Admin.Core.Common; +using log4net; +using SqlSugar; +using System.Linq.Expressions; +using StackExchange.Profiling.Internal; namespace Admin.Core.Service { public class ExecutePlanInfoServices : BaseServices, IExecutePlanInfoServices { + private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(ExecutePlanInfoServices)); private readonly IBaseRepository _dal; + private readonly IExecutePlanInfoRepository _executePlanInfoRepository; private readonly IProductOrderInfoServices _productOrderInfoServices; - public ExecutePlanInfoServices(IBaseRepository dal, IProductOrderInfoServices productOrderInfoServices) + private readonly IProductPlanInfoServices _productPlanInfoServices; + + public ExecutePlanInfoServices(IBaseRepository dal, IProductOrderInfoServices productOrderInfoServices, + IProductPlanInfoServices productPlanInfoServices) { this._dal = dal; base.BaseDal = dal; _productOrderInfoServices = productOrderInfoServices; + _productPlanInfoServices = productPlanInfoServices; } #region 计划删除 @@ -45,7 +55,7 @@ namespace Admin.Core.Service List execPlans = new List(); var list = await _dal.QueryAsync(d=>d.ProductLineCode.Equals(station)); List planInfos = (list.OrderBy(d => d.ExecuteOrder)).ToList(); - if (planInfos == null) return false; + if (planInfos.Count()==0) return false; ExecutePlanInfo planInfo = planInfos.FirstOrDefault(x => x.ObjId == int.Parse(id)); int executeOrder = planInfo.ExecuteOrder; @@ -83,7 +93,7 @@ namespace Admin.Core.Service var list = await _dal.QueryAsync(d => d.ProductLineCode.Equals(station)); List planInfos = (list.OrderBy(d => d.ExecuteOrder)).ToList(); - if (planInfos == null) return false; + if (planInfos.Count()==0) return false; ExecutePlanInfo planInfo = planInfos.FirstOrDefault(x => x.ObjId == int.Parse(id)); int executeOrder = planInfo.ExecuteOrder; @@ -141,10 +151,239 @@ namespace Admin.Core.Service } catch (Exception ex) { - + logHelper.Error(ex); } return planInfo; } #endregion + + /// + /// 通过产线工位获取执行顺序（默认+1） + /// + /// + /// + public async Task GetExecuteOrderByProductLineCode(string productLineCode) + { + int result = 0; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.ProductLineCode == productLineCode); + + List planInfos =await _dal.QueryAsync(exp); + + int order = planInfos.OrderByDescending(x => x.ExecuteOrder).First().ExecuteOrder; + + result = order + 1; + } + catch (Exception ex) + { + logHelper.Error("通过产线工位获取执行顺异常", ex); + } + return result; + } + + /// + /// 通过执行计划编号获取执行计划 + /// + /// + /// + public async Task GetExecutePlanInfoByPlanCodeAsync(string executePlanCode) + { + ExecutePlanInfo planInfo = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.ExecutePlanCode == executePlanCode); + + planInfo = await _dal.FirstAsync(exp); + + logHelper.Info($"根据执行计划编号{executePlanCode}；获取到的执行计划信息：{planInfo.ToJson()}"); + } + catch (Exception ex) + { + logHelper.Error("通过执行计划编号获取执行计划异常", ex); + } + return planInfo; + } + + /// + /// 通过产线工位获取执行计划 + /// + /// + /// + public async Task> GetExecutePlanInfosByProductLineCode(string productLineCode) + { + List planInfos = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.ProductLineCode == productLineCode); + + planInfos =await _dal.QueryAsync(exp); + + logHelper.Info($"根据产线工位编号：{productLineCode}；获取到的执行计划信息：{planInfos.ToJson}"); + } + catch (Exception ex) + { + logHelper.Error("通过产线工位获取执行计划异常", ex); + } + return planInfos; + } + + /// + /// 通过生产计划编号获取执行计划 + /// + /// + /// + public async Task> GetExecutePlanInfosByProductPlanCode(string productPlanCode) + { + List planInfos = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.ProductPlanCode == productPlanCode); + + planInfos =await _dal.QueryAsync(exp); + + logHelper.Info($"根据生产计划编号：{productPlanCode}；获取到的执行计划信息：{planInfos.ToJson()}"); + } + catch (Exception ex) + { + logHelper.Error("通过生产计划编号获取执行计划异常", ex); + } + return planInfos; + } + + /// + /// 新增执行计划 + /// + /// + /// + public async Task InsertExecutePlanInfo(ExecutePlanInfo executePlanInfo) + { + bool result = false; + try + { + int r =await _dal.AddAsync(executePlanInfo); + if (r > 0) result = true; + } + catch (Exception ex) + { + logHelper.Error("新增执行计划异常", ex); + } + return result; + } + + /// + /// 修改执行计划 + /// + /// + /// + public async Task UpdateExecutePlanInfo(ExecutePlanInfo executePlanInfo) + { + bool result = false; + try + { + result =await _dal.UpdateAsync(executePlanInfo); + } + catch (Exception ex) + { + logHelper.Error("修改执行计划异常", ex); + } + return result; + } + + /// + /// 批量修改执行计划 + /// + /// + /// + public async Task UpdateRangeExecutePlanInfo(List executePlanInfos) + { + bool result = false; + try + { + result =await _dal.UpdateAsync(executePlanInfos); + + } + catch (Exception ex) + { + logHelper.Error("修改执行计划异常", ex); + } + return result; + } + + /// + /// 根据执行计划编号删除执行计划 + /// + /// + /// + public async Task DeleteExecutePlanInfoByPlanCode(string executePlanCode) + { + bool result = false; + try + { + ExecutePlanInfo planInfo =await this.GetExecutePlanInfoByPlanCodeAsync(executePlanCode); + + result =await _dal.DeleteAsync(planInfo); + } + catch (Exception ex) + { + logHelper.Error("根据执行计划编号删除执行计划异常", ex); + } + return result; + } + + public async Task> GetStationHourAmount(string stationCode) + { + List result = null; + try + { + result =await _executePlanInfoRepository.GetStationHourAmount(stationCode); + } + catch (Exception ex) + { + logHelper.Error("获取小时产量数据异常", ex); + } + return result; + } + + public async Task> GetStationMaterialStats(string stationCode) + { + List result = null; + try + { + result = await _executePlanInfoRepository.GetStationMaterialStats(stationCode); + } + catch (Exception ex) + { + logHelper.Error("获取型号统计数据异常", ex); + } + return result; + } + /// + /// 通过执行计划编号获取执行计划 + /// + /// + /// + public async Task GetExecutePlanInfoByPlanCode(string executePlanCode) + { + ExecutePlanInfo planInfos = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.ProductPlanCode == executePlanCode); + + planInfos = await _executePlanInfoRepository.FirstAsync(exp); + + logHelper.Info($"根据生产计划编号：{executePlanCode}；获取到的执行计划信息：{planInfos.ToJson()}"); + } + catch (Exception ex) + { + logHelper.Error("通过生产计划编号获取执行计划异常", ex); + } + return planInfos; + } } } \ No newline at end of file diff --git a/Admin.Core.Service/Service_New/ProductPlanInfoServices.cs b/Admin.Core.Service/Service_New/ProductPlanInfoServices.cs index 6b4e0301..f2a5b019 100644 --- a/Admin.Core.Service/Service_New/ProductPlanInfoServices.cs +++ b/Admin.Core.Service/Service_New/ProductPlanInfoServices.cs @@ -1,10 +1,15 @@ -using Admin.Core.IRepository; +using Admin.Core.Common; +using Admin.Core.IRepository; using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Model.Model_New; +using log4net; +using Microsoft.IdentityModel.Logging; +using StackExchange.Profiling.Internal; using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; @@ -12,6 +17,7 @@ namespace Admin.Core.Service { public class ProductPlanInfoServices : BaseServices, IProductPlanInfoServices { + private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(ProductPlanInfoServices)); private readonly IBaseRepository _dal; private readonly IBaseOrderInfoRepository _baseOrderInfoRepository; @@ -46,5 +52,100 @@ namespace Admin.Core.Service } #endregion + + #region 通过计划编号获取计划信息 + /// + /// 通过计划编号获取计划信息 + /// + /// + /// + public async Task GetProductPlanByPlanCode(string planCode) + { + ProductPlanInfo planInfo = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.PlanCode == planCode); + + planInfo = await _dal.FirstAsync(exp); + + logHelper.Info($"根据计划编号{planCode}；获取到的计划信息：{planInfo.ToJson()}"); + } + catch (Exception ex) + { + logHelper.Error("通过计划编号获取计划信息异常", ex); + } + return planInfo; + } + #endregion + + #region 通过产线工位获取生产计划 + /// + /// 通过产线工位获取生产计划 + /// + /// + /// + public async Task> GetProductPlanInfosByProductLineCode(string productLineCode) + { + List planInfos = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.ProductLineCode == productLineCode); + + planInfos = await _dal.QueryAsync(exp); + + logHelper.Info($"根据产线工位编号：{productLineCode}；获取到的计划信息：{planInfos.ToJson()}"); + } + catch (Exception ex) + { + logHelper.Error("通过产线工位获取生产计划异常", ex); + } + return planInfos; + } + #endregion + + #region 添加生产计划 + /// + /// 添加生产计划 + /// + /// + /// + public async Task InsertProductPlanInfo(ProductPlanInfo productPlanInfo) + { + bool result = false; + try + { + int r = await _dal.AddAsync(productPlanInfo); + if (r > 0) result = true; + } + catch (Exception ex) + { + logHelper.Error("添加生产计划异常", ex); + } + return result; + } + #endregion + + #region 修改生产计划 + /// + /// 修改生产计划 + /// + /// + /// + public async Task UpdateProductPlanInfo(ProductPlanInfo productPlanInfo) + { + bool result = false; + try + { + result = await _dal.UpdateAsync(productPlanInfo); + } + catch (Exception ex) + { + logHelper.Error("修改生产计划异常", ex); + } + return result; + } + #endregion } } diff --git a/Admin.Core.Service/Service_New/RealTaskInfoServices.cs b/Admin.Core.Service/Service_New/RealTaskInfoServices.cs index 9f99b65c..bbcc40bd 100644 --- a/Admin.Core.Service/Service_New/RealTaskInfoServices.cs +++ b/Admin.Core.Service/Service_New/RealTaskInfoServices.cs @@ -1,12 +1,21 @@ using Admin.Core.IRepository; using Admin.Core.IService; using Admin.Core.Model; +using Microsoft.IdentityModel.Logging; +using System.Collections.Generic; +using System.Linq.Expressions; +using System; using System.Threading.Tasks; +using log4net; +using Org.BouncyCastle.Asn1.Tsp; +using System.Linq; +using Admin.Core.Common; namespace Admin.Core.Service { public class RealTaskInfoServices : BaseServices, IRealTaskInfoServices { + private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(RealTaskInfoServices)); private readonly IBaseRepository _dal; private readonly IRealTaskInfoRepository _realTaskInfoRepository; public RealTaskInfoServices(IBaseRepository dal, IRealTaskInfoRepository realTaskInfoRepository) @@ -20,5 +29,226 @@ namespace Admin.Core.Service { return _realTaskInfoRepository.FirstAsync(); } + + /// + /// 添加任务信息 + /// + /// + /// + public async Task AddTaskInfo(RealTaskInfo taskInfo) + { + bool result = false; + try + { + int r =await _dal.AddAsync(taskInfo); + if (r > 0) { result=true; } + } + catch (Exception ex) + { + logHelper.Error("添加任务信息异常", ex); + } + return result; + } + + /// + /// 删除任务信息 + /// + /// + public async Task DeleteTaskInfo(string taskCode, string storeCode = null) + { + bool result = false; + try + { + RealTaskInfo taskInfo =await GetTaskInfoByTaskCode(taskCode, storeCode); + if (taskInfo != null) + { + result = await _dal.DeleteAsync(taskInfo); + } + } + catch (Exception ex) + { + logHelper.Error("删除任务信息异常", ex); + } + return result; + } + + /// + /// 更新任务信息 + /// + /// + /// + public async Task UpdateTaskInfo(RealTaskInfo taskInfo) + { + bool result = false; + try + { + result =await _dal.UpdateAsync(taskInfo); + } + catch (Exception ex) + { + logHelper.Error("更新任务信息异常", ex); + } + return result; + } + + /// + /// 批量更新任务信息 + /// + /// + /// + public async Task UpdateRangeTaskInfoAsync(List taskInfos) + { + bool result = false; + try + { + result = await _dal.UpdateAsync(taskInfos); + } + catch (Exception ex) + { + logHelper.Error("更新任务信息异常", ex); + } + return result; + } + + /// + /// 通过任务编号更新任务状态 + /// + /// + /// + /// + public async Task UpdateTaskStatusByTaskCode(string taskCode, int taskStatus) + { + bool result = false; + RealTaskInfo taskInfo = null; + try + { + taskInfo =await _dal.FirstAsync(x => x.TaskCode == taskCode); + + if (taskInfo != null) + { + taskInfo.TaskStatus = taskStatus; + result =await _dal.UpdateAsync(taskInfo); + } + } + catch (Exception ex) + { + logHelper.Error("通过任务编号更新任务状态异常", ex); + } + return result; + } + + /// + /// 通过仓库编号获取待执行的任务信息，根据时间依次获取 + /// + /// + /// + public async Task GetTaskInfoByStoreCode(string storeCode, int taskType) + { + RealTaskInfo taskInfo = null; + try + { + taskInfo = (await _dal.QueryAsync(x => x.StoreCode == storeCode && x.TaskStatus == 1 && x.TaskType == taskType)).OrderBy(x => x.CreateTime).FirstOrDefault(); + } + catch (Exception ex) + { + logHelper.Error("通过仓库编号获取待执行的任务信息异常", ex); + } + return taskInfo; + } + + /// + /// 根据任务号获取任务信息 + /// + /// + /// + public async Task GetTaskInfoByTaskCode(string taskCode, string storeCode) + { + RealTaskInfo taskInfo = null; + try + { + taskInfo =await _dal.FirstAsync(x => x.StoreCode == storeCode && x.TaskCode == taskCode); + } + catch (Exception ex) + { + logHelper.Error("根据任务号获取任务信息异常", ex); + } + return taskInfo; + } + + /// + /// 通过仓库编号获取任务 + /// + /// + /// + /// + public async Task> GetTaskInfosByStoreCode(string[] storeCode, int taskType) + { + List taskInfos = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.TaskType == taskType && x.TaskStatus != 3 && storeCode.Contains(x.StoreCode)); + + taskInfos = await _dal.QueryAsync(exp); + } + catch (Exception ex) + { + logHelper.Error("根据任务号获取任务信息异常", ex); + } + return taskInfos; + } + + /// + /// 获取指定状态的任务列表,如果为0返回所有状态 + /// + /// + /// + /// + /// + public async Task> GetTaskInfosByTaskStatus(string[] storeCode, int taskType, int taskStatus) + { + List taskInfos = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.TaskType == taskType && storeCode.Contains(x.StoreCode)); + if (taskStatus != 0) + { + exp = exp.And(x => x.TaskStatus == taskStatus); + } + taskInfos =await _dal.QueryAsync(exp); + } + catch (Exception ex) + { + logHelper.Error("获取指定状态的任务信息异常", ex); + } + return taskInfos; + } + + public async Task> GetTaskInfosByTaskCode(string taskCode) + { + List taskInfos = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.TaskCode == taskCode); + taskInfos =await _dal.QueryAsync(exp); + } + catch (Exception ex) + { + logHelper.Error("获取指定状态的任务信息异常", ex); + } + return taskInfos; + } + + public async Task DeleteTaskInfoById(int id) + { + return await _dal.DeleteByIdAsync(id); + } + + public Task UpdateRangeTaskInfo(List taskInfos) + { + throw new NotImplementedException(); + } } } \ No newline at end of file diff --git a/Admin.Core.Service/Service_New/RecordInstoreServices.cs b/Admin.Core.Service/Service_New/RecordInstoreServices.cs index 09b00c22..3d588bb2 100644 --- a/Admin.Core.Service/Service_New/RecordInstoreServices.cs +++ b/Admin.Core.Service/Service_New/RecordInstoreServices.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace Admin.Core.Service { - public class RecordInstoreServices : BaseServices, IRecordInstoreServices + public class RecordInstoreServices : BaseServices, IRecordInStoreServices { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(RecordInstoreServices)); private readonly IBaseRepository _dal; diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig index 40b04e4b..19486c3e 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Service -build_property.ProjectDir = C:\Users\ADMIN\Desktop\tuisong\Admin.Core.Service\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Service\ diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamInStoreTask_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamInStoreTask_Quartz.cs index c06e5be0..f8443f2f 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamInStoreTask_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamInStoreTask_Quartz.cs @@ -62,13 +62,13 @@ namespace Admin.Core.Tasks private readonly IBaseSpaceInfoServices _baseSpaceInfoServices; private readonly IRealTaskInfoServices _realTaskInfoService; private readonly IProductPlanInfoServices _productPlanInfoServices; - private readonly IRecordInstoreServices _recordInstoreServices; + private readonly IRecordInStoreServices _recordInstoreServices; private readonly IBaseStoreInfoServices _baseStoreInfoServices; private readonly IBaseSpaceDetailServices _baseSpaceDetailServices; public Job_BoxFoamInStoreTask_Quartz(ISysTasksQzService SysTasksQzService, ISysJobLogService sysJobLogService, IBaseSpaceInfoServices baseSpaceInfoServices, IRealTaskInfoServices realTaskInfoService, - IProductPlanInfoServices productPlanInfoServices, IRecordInstoreServices recordInstoreServices, + IProductPlanInfoServices productPlanInfoServices, IRecordInStoreServices recordInstoreServices, IBaseStoreInfoServices baseStoreInfoServices, IBaseSpaceDetailServices IBaseSpaceDetailServices) { _SysTasksQzService = SysTasksQzService; diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamOutStore_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamOutStore_Quartz.cs index e56bc3ea..d5dfc0fb 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamOutStore_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamOutStore_Quartz.cs @@ -81,17 +81,17 @@ namespace Admin.Core.Tasks try { log.Info($"收到出库计划，物料码：{bomInfo.MaterialCode}"); - BaseSpaceInfo spaceInfo = await _baseSpaceInfoServices.OutStoreGetSpaceInfoByMaterialCode(storeCode, bomInfo.MaterialCode); - if (spaceInfo != null) - { - log.Info($"匹配货道：{spaceInfo.SpaceName}"); - //RefreshScanMateriaCodeEvent?.Invoke(materiaclCode, materialType, spaceInfo.spaceName, storeCode); //刷新界面扫码信息 - CreateOutStoreTask(spaceInfo, bomInfo, planCode); //创建出库任务 - } - else - { - //报警停线 - } + //BaseSpaceInfo spaceInfo = await _baseSpaceInfoServices.OutStoreGetSpaceInfoByMaterialCode(storeCode, bomInfo.MaterialCode); + //if (spaceInfo != null) + //{ + // log.Info($"匹配货道：{spaceInfo.SpaceName}"); + // //RefreshScanMateriaCodeEvent?.Invoke(materiaclCode, materialType, spaceInfo.spaceName, storeCode); //刷新界面扫码信息 + // CreateOutStoreTask(spaceInfo, bomInfo, planCode); //创建出库任务 + //} + //else + //{ + // //报警停线 + //} } catch (Exception ex) { diff --git a/Admin.Core.sln b/Admin.Core.sln index e016720a..4218a113 100644 --- a/Admin.Core.sln +++ b/Admin.Core.sln @@ -79,6 +79,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.ProductOffLine", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucam.Core.PerfusionService", "Aucam.Core.PerfusionService\Aucam.Core.PerfusionService.csproj", "{BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Scada.UI", "Aucma.Scada.UI\Aucma.Scada.UI.csproj", "{434F9CE2-2225-4893-9BA2-2681C29E9056}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -193,6 +195,10 @@ Global {BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}.Debug|Any CPU.Build.0 = Debug|Any CPU {BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}.Release|Any CPU.ActiveCfg = Release|Any CPU {BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}.Release|Any CPU.Build.0 = Release|Any CPU + {434F9CE2-2225-4893-9BA2-2681C29E9056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {434F9CE2-2225-4893-9BA2-2681C29E9056}.Debug|Any CPU.Build.0 = Debug|Any CPU + {434F9CE2-2225-4893-9BA2-2681C29E9056}.Release|Any CPU.ActiveCfg = Release|Any CPU + {434F9CE2-2225-4893-9BA2-2681C29E9056}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -228,6 +234,7 @@ Global {5515C937-1E2E-4111-8775-EE6898E5933A} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3} {C70810CE-041A-4880-99B3-FFCC8B672B42} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3} {BFABE9E5-C71D-42FE-94AE-934B9F74B3D0} = {FA2FF2A3-135E-4CA2-9042-76BB71623D5A} + {434F9CE2-2225-4893-9BA2-2681C29E9056} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8047AB56-042B-4AE4-B06A-34137067A86A} diff --git a/Aucma.Core.BoxFoam/App.xaml b/Aucma.Core.BoxFoam/App.xaml index 78602cbd..ec39e63a 100644 --- a/Aucma.Core.BoxFoam/App.xaml +++ b/Aucma.Core.BoxFoam/App.xaml @@ -17,13 +17,13 @@ - - - + + + - - - + + + diff --git a/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj b/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj index 3f0b4dff..a90aa8ea 100644 --- a/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj +++ b/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj @@ -21,7 +21,11 @@ + + + + @@ -42,6 +46,10 @@ + + + + @@ -55,10 +63,6 @@ - - - - @@ -72,4 +76,10 @@ + + + Designer + + + diff --git a/Aucma.Core.BoxFoam/ViewModels/EnterWarehouseStatisticsPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/EnterWarehouseStatisticsPageViewModel.cs index 0bd514f3..c304ca97 100644 --- a/Aucma.Core.BoxFoam/ViewModels/EnterWarehouseStatisticsPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/EnterWarehouseStatisticsPageViewModel.cs @@ -22,11 +22,11 @@ namespace Aucma.Core.BoxFoam.ViewModels { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(EnterWarehouseStatisticsPageViewModel)); List materialComplateInfos = new List(); - public readonly IRecordInstoreServices? _recordInstoreServices; + public readonly IRecordInStoreServices? _recordInstoreServices; public EnterWarehouseStatisticsPageViewModel() { - _recordInstoreServices = App.ServiceProvider.GetService(); + _recordInstoreServices = App.ServiceProvider.GetService(); LoadDataAsync(); } diff --git a/Aucma.Core.BoxFoam/ViewModels/IndexPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/IndexPageViewModel.cs index 2a455754..4fd253b2 100644 --- a/Aucma.Core.BoxFoam/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/IndexPageViewModel.cs @@ -20,11 +20,11 @@ namespace Aucma.Core.BoxFoam.ViewModels { private ObservableCollection listItems = new ObservableCollection(); private static readonly log4net.ILog log = LogManager.GetLogger(typeof(IndexPageViewModel)); - public readonly IRecordInstoreServices? _recordInstoreServices; + public readonly IRecordInStoreServices? _recordInstoreServices; public IndexPageViewModel() { - _recordInstoreServices = App.ServiceProvider.GetService(); + _recordInstoreServices = App.ServiceProvider.GetService(); Job_BoxFoamInStoreTask_Quartz.RefreshDataGridDelegateEvent += LoadData;//刷新底部列表 // Job_TestTask_Quartz.DataGridDelegateEvent += ExecMethod;//刷新日志 Job_BoxFoamInStoreTask_Quartz.RefreshScanMateriaCodeEvent += RefreshScanInfo;//扫码信息刷新 diff --git a/Aucma.Core.BoxFoam/ViewModels/RealTimeInventoryPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/RealTimeInventoryPageViewModel.cs index 61528d42..898aa8a9 100644 --- a/Aucma.Core.BoxFoam/ViewModels/RealTimeInventoryPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/RealTimeInventoryPageViewModel.cs @@ -9,7 +9,7 @@ namespace Aucma.Core.BoxFoam.ViewModels public partial class RealTimeInventoryPageViewModel : ObservableObject { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(RealTimeInventoryPageViewModel)); - public readonly IRecordInstoreServices? _recordInstoreServices; + public readonly IRecordInStoreServices? _recordInstoreServices; private BeforeFoamingPageView beforeFoaming = new BeforeFoamingPageView(); private AfterFoamingPageView afterFoaming = new AfterFoamingPageView(); public RealTimeInventoryPageViewModel() diff --git a/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml b/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml index dccc4e47..96ba8051 100644 --- a/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml @@ -10,26 +10,93 @@ d:DesignHeight="450" d:DesignWidth="800"> - - - - + + + + + + + + + + + + + + + - + - - + + @@ -38,13 +105,12 @@ - + - + Width="200" Margin="10 0" Text="2023-10-09" BorderBrush="White" + materialDesign:CalendarAssist.IsHeaderVisible="False" > + @@ -54,12 +120,11 @@ - + + materialDesign:CalendarAssist.IsHeaderVisible="False" BorderBrush="White"> + Foreground="White" > diff --git a/Aucma.Core.BoxFoam/Views/IndexPageView.xaml b/Aucma.Core.BoxFoam/Views/IndexPageView.xaml index 0d4daa8b..a7a649b6 100644 --- a/Aucma.Core.BoxFoam/Views/IndexPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/IndexPageView.xaml @@ -12,9 +12,137 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -34,12 +162,10 @@ - - - - - + + + @@ -63,28 +189,28 @@ - - - + + + - - + + - - + + - - + + - - + - + - + + Height="{Binding Path=ActualHeight, ElementName=HeightHelperPanel}" x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" Foreground="White" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/> - + - + @@ -142,7 +268,7 @@ RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True" - Foreground="Gray" > + Foreground="White" > diff --git a/Aucma.Core.BoxFoam/Views/MainWindow.xaml b/Aucma.Core.BoxFoam/Views/MainWindow.xaml index 1f5d4686..10d416af 100644 --- a/Aucma.Core.BoxFoam/Views/MainWindow.xaml +++ b/Aucma.Core.BoxFoam/Views/MainWindow.xaml @@ -5,13 +5,16 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" - Background="#ffffff" - Title="澳柯玛生产控制系统" - MinHeight="700" MinWidth="1300" WindowState="Maximized" + Title="澳柯玛箱体发泡控制系统" + d:DesignHeight="800" + d:DesignWidth="1000" + MinHeight="1080" MinWidth="1920" WindowState="Maximized" WindowStartupLocation="CenterScreen" > - - + + + + @@ -21,45 +24,44 @@ + + + + + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + - - + + - + Foreground="White" > diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.GeneratedMSBuildEditorConfig.editorconfig index 0ca648dc..e3835487 100644 --- a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.GeneratedMSBuildEditorConfig.editorconfig +++ b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.GeneratedMSBuildEditorConfig.editorconfig @@ -14,4 +14,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Aucma.Core.DoorFoam -build_property.ProjectDir = C:\Users\ADMIN\Desktop\tuisong\Aucma.Core.DoorFoam\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\ diff --git a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj index b28cabd9..eacc5a50 100644 --- a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj +++ b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj @@ -21,7 +21,11 @@ + + + + @@ -42,6 +46,10 @@ + + + + @@ -55,10 +63,6 @@ - - - - @@ -79,4 +83,10 @@ + + + Designer + + + diff --git a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs index 451f55da..d3806825 100644 --- a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs @@ -4,6 +4,7 @@ using log4net; using LiveCharts.Wpf; using LiveCharts; using System.Collections.Generic; +using System.Windows.Media; /* * 成品分舵入库首页信息 @@ -93,7 +94,7 @@ namespace Aucma.Core.Palletiz.ViewModels column.DataLabels = true; column.Title = "型号"; column.Values = achievement; - + column.Foreground = Brushes.White; ModelStatistics.Add(column); @@ -116,7 +117,7 @@ namespace Aucma.Core.Palletiz.ViewModels column2.DataLabels = true; column2.Title = "产量"; column2.Values = achievement2; - + column2.Foreground = Brushes.White; Achievement.Add(column2); } diff --git a/Aucma.Core.Palletiz/Views/IndexPageView.xaml b/Aucma.Core.Palletiz/Views/IndexPageView.xaml index 4e69cbea..f7e6e2dd 100644 --- a/Aucma.Core.Palletiz/Views/IndexPageView.xaml +++ b/Aucma.Core.Palletiz/Views/IndexPageView.xaml @@ -12,13 +12,118 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -128,21 +233,31 @@ - + - - + + - - + + - + + + + + + - + + + + + + @@ -154,16 +269,26 @@ - - + + - + - + + + + + + - + + + + + + @@ -172,15 +297,14 @@ - + Foreground="White" > - diff --git a/Aucma.Core.Palletiz/Views/MainWindow.xaml b/Aucma.Core.Palletiz/Views/MainWindow.xaml index da1a64a1..6ad7bde8 100644 --- a/Aucma.Core.Palletiz/Views/MainWindow.xaml +++ b/Aucma.Core.Palletiz/Views/MainWindow.xaml @@ -5,13 +5,15 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" - Background="#ffffff" - Title="澳柯玛生产控制系统" - MinHeight="700" MinWidth="1300" WindowState="Maximized" - WindowStartupLocation="CenterScreen" + d:DesignHeight="800" + d:DesignWidth="1000" + MinHeight="1080" MinWidth="1920" WindowState="Maximized" + WindowStartupLocation="CenterScreen" WindowStyle="None" > - - + + + + @@ -21,45 +23,44 @@ + + + + + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - + - - - - - + + + - - + + + public partial class SelectQualityView : Window { - public SelectQualityView() { - InitializeComponent(); - SelectQualityViewModel viewModel = new SelectQualityViewModel(); - this.DataContext = viewModel; - + InitializeComponent(); + this.DataContext = new SelectQualityViewModel(); } - - } } diff --git a/Aucma.Core.SheetMetal/App.xaml b/Aucma.Core.SheetMetal/App.xaml index febc0baf..2b9c4bb5 100644 --- a/Aucma.Core.SheetMetal/App.xaml +++ b/Aucma.Core.SheetMetal/App.xaml @@ -17,13 +17,13 @@ - - - + + + - - - + + + diff --git a/Aucma.Core.SheetMetal/Aucma.Core.SheetMetal.csproj b/Aucma.Core.SheetMetal/Aucma.Core.SheetMetal.csproj index 1fa2658a..1297ac32 100644 --- a/Aucma.Core.SheetMetal/Aucma.Core.SheetMetal.csproj +++ b/Aucma.Core.SheetMetal/Aucma.Core.SheetMetal.csproj @@ -21,10 +21,10 @@ - - - - + + + + @@ -42,6 +42,10 @@ + + + + diff --git a/Aucma.Core.SheetMetal/Aucma.Core.SheetMetal.csproj.user b/Aucma.Core.SheetMetal/Aucma.Core.SheetMetal.csproj.user index de5cb477..162e6793 100644 --- a/Aucma.Core.SheetMetal/Aucma.Core.SheetMetal.csproj.user +++ b/Aucma.Core.SheetMetal/Aucma.Core.SheetMetal.csproj.user @@ -18,6 +18,9 @@ + + Designer + Designer diff --git a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs index 91096e3e..50c8ffb9 100644 --- a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs @@ -16,9 +16,10 @@ using Admin.Core.Tasks; using CommunityToolkit.Mvvm.Messaging; using LiveCharts; using LiveCharts.Wpf; -using Admin.Core.Service; using Admin.Core.Model; -using System.Reflection.Metadata.Ecma335; +using System.Windows.Media; +using log4net; +using Admin.Core.Common; /* * 首页信息 * @@ -28,6 +29,7 @@ namespace Aucma.Core.SheetMetal.ViewModels public partial class IndexPageViewModel : ObservableObject { protected readonly IExecutePlanInfoServices? _taskExecutionServices; + int k = 100; public IndexPageViewModel() @@ -36,15 +38,17 @@ namespace Aucma.Core.SheetMetal.ViewModels StationName = "U壳/侧板钣金生产"; - Job_SheetMetalTask_Quartz.SmEverDayDelegateEvent += InitEveryDayMethod; + //Job_SheetMetalTask_Quartz.SmEverDayDelegateEvent += InitEveryDayMethod; Job_SheetMetalTask_Quartz.SmShowDelegateEvent += UpdatePlanSHow;//计划内容展示 WeakReferenceMessenger.Default.Register(this, Recive); + Task.Run(async () => { await LoadData(); await InitExecMethod(); - await InitEveryDayMethod(); + }); + InitEveryDayMethod(); } #region 订单统计 @@ -69,7 +73,7 @@ namespace Aucma.Core.SheetMetal.ViewModels /// 每日生产 /// /// - private async Task InitEveryDayMethod() + private void InitEveryDayMethod() { ChartValues achievement = new ChartValues(); Random random = new Random(); @@ -82,7 +86,7 @@ namespace Aucma.Core.SheetMetal.ViewModels column.DataLabels = true; column.Title = "型号"; column.Values = achievement; - + column.Foreground = Brushes.White; ModelStatistics.Add(column); @@ -105,11 +109,11 @@ namespace Aucma.Core.SheetMetal.ViewModels column2.DataLabels = true; column2.Title = "产量"; column2.Values = achievement2; - + column2.Foreground = Brushes.White; Achievement.Add(column2); - await InitExecMethod(); + //await InitExecMethod(); } @@ -120,7 +124,7 @@ namespace Aucma.Core.SheetMetal.ViewModels #region 加载DataGrid数据 private async Task LoadData() { - var list= await _taskExecutionServices.QueryAsync(d=>d.ProductLineCode.Equals("1001")); + var list= await _taskExecutionServices.QueryAsync(d=>d.ProductLineCode.Contains("1001")); var execList= list.OrderBy(d=>d.ExecuteOrder); foreach (var item in execList) { @@ -144,10 +148,10 @@ namespace Aucma.Core.SheetMetal.ViewModels /// 向上 /// [RelayCommand] - private async Task MoveUp(string info) + private async Task MoveUp(string Id) { - string station = "1001"; - bool result = await _taskExecutionServices.PlanMoveUp(info, station); + string stationCode = Appsettings.app("StoreInfo", "StationCode"); + bool result = await _taskExecutionServices.PlanMoveUp(Id, stationCode); if (result) { PlanInfoDataGrid.Clear(); @@ -161,10 +165,10 @@ namespace Aucma.Core.SheetMetal.ViewModels /// 向下 /// [RelayCommand] - private async Task MoveDown(string info) + private async Task MoveDown(string Id) { - string station = "1001"; - bool result = await _taskExecutionServices.PlanMoveDown(info, station); + string stationCode = Appsettings.app("StoreInfo", "StationCode"); + bool result = await _taskExecutionServices.PlanMoveDown(Id, stationCode); if (result) { PlanInfoDataGrid.Clear(); @@ -178,12 +182,12 @@ namespace Aucma.Core.SheetMetal.ViewModels /// 删除 /// [RelayCommand] - private async Task DeletePlan(string info) + private async Task DeletePlan(string Id) { MessageBoxResult msg = MessageBox.Show("确定要删除吗?", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No); if (MessageBoxResult.Yes == msg) { - bool result = await _taskExecutionServices.ExecPlanDelete(info); + bool result = await _taskExecutionServices.ExecPlanDelete(Id); if (result) { PlanInfoDataGrid.Clear(); @@ -204,12 +208,12 @@ namespace Aucma.Core.SheetMetal.ViewModels /// 下传计划 /// [RelayCommand] - private async Task NextPass(string info) + private async Task NextPass(string Id) { MessageBoxResult msg = MessageBox.Show("确定要下发计划吗?", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No); if (MessageBoxResult.Yes != msg) return; - var model = await _taskExecutionServices.FirstAsync(d => d.ObjId == int.Parse(info)); + var model = await _taskExecutionServices.FirstAsync(d => d.ObjId == int.Parse(Id)); if (model.ExecuteStatus == 2) { MessageBox.Show("该计划正在执行中，请勿重复下传", "系统信息"); @@ -414,10 +418,10 @@ namespace Aucma.Core.SheetMetal.ViewModels /// /// /// - private void Recive(object recipient, object message) + private async void Recive(object recipient, object message) { PlanInfoDataGrid.Clear(); - LoadData(); + await LoadData(); } #endregion diff --git a/Aucma.Core.SheetMetal/Views/IndexPage.xaml b/Aucma.Core.SheetMetal/Views/IndexPage.xaml index 0e3080b1..40f0f5ce 100644 --- a/Aucma.Core.SheetMetal/Views/IndexPage.xaml +++ b/Aucma.Core.SheetMetal/Views/IndexPage.xaml @@ -12,13 +12,153 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + @@ -27,15 +167,15 @@ - + - - + + @@ -57,28 +197,28 @@ - - + + - - + + - - + + - - + + - - + + @@ -101,12 +241,12 @@ - + + Foreground="White"/> @@ -118,12 +258,12 @@ - + - + Foreground="White"/> @@ -134,11 +274,11 @@ - - + + - - + @@ -151,13 +291,13 @@ - - + + - - + + Foreground="White"/> @@ -176,20 +316,30 @@ - - + + - + - + + + + + + - + + + + + + @@ -205,12 +355,12 @@ - - + + - + @@ -218,116 +368,47 @@ + ColumnHeaderHeight="35" + RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" + GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" + SelectionMode="Single" IsReadOnly="True" + Foreground="White"> - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - +