From e1684756244f55c24be66acef9ee6c1dfbbcacf6 Mon Sep 17 00:00:00 2001 From: "liulb@mesnac.com" Date: Wed, 13 Dec 2023 11:47:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=92=A3=E9=87=91=E4=B8=8A?= =?UTF-8?q?=E4=BD=8D=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.Core.Api.csproj.nuget.dgspec.json | 3 + Admin.Core.Api/obj/project.assets.json | 1 + Admin.Core.Api/obj/project.nuget.cache | 2 +- Admin.Core.Common/Helper/DESProvider.cs | 12 +- Admin.Core.Model/Model_New/SmTaskExecution.cs | 13 +- Admin.Core.RealTimeService/Startup.cs | 3 +- .../QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs | 1 - .../ViewModels/AfterFoamingPageModelView.cs | 1 + .../ViewModels/BeforeFoamingPageModelView.cs | 2 + .../ViewModels/FoamMachinesPageViewModel.cs | 1 + .../ViewModels/FoamMonitorPageViewModel.cs | 1 + .../ViewModels/FoamPlanPageViewModel.cs | 1 + .../ViewModels/IndexPageViewModel.cs | 6 +- Aucma.Core.PLc/Model/PlcModel.cs | 5 +- Aucma.Core.Palletiz/App.xaml | 14 +- Aucma.Core.Palletiz/Views/MainWindow.xaml | 12 +- .../ViewModels/IndexPageViewModel.cs | 8 +- Aucma.Core.Tasks/AucamTaskService.cs | 223 +++++++++++++++--- .../CommTask/Job_SheetMetalTask.cs | 66 +----- Aucma.Core.Tasks/IAucamTaskService.cs | 2 +- 20 files changed, 250 insertions(+), 127 deletions(-) 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 44251bf1..b40e9df5 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 @@ -852,6 +852,9 @@ }, "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" + }, + "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" } } } diff --git a/Admin.Core.Api/obj/project.assets.json b/Admin.Core.Api/obj/project.assets.json index 094ac07c..eec9a1f0 100644 --- a/Admin.Core.Api/obj/project.assets.json +++ b/Admin.Core.Api/obj/project.assets.json @@ -4158,6 +4158,7 @@ "Admin.Core.Model": "1.0.0", "Admin.Core.Service": "1.0.0", "Aucma.Core.PLc": "1.0.0", + "Aucma.Core.Scanner": "1.0.0", "Quartz": "3.3.3" }, "compile": { diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache index 11944813..f120394d 100644 --- a/Admin.Core.Api/obj/project.nuget.cache +++ b/Admin.Core.Api/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "lpAdUZlNwICgoI0zWeab6lGK6byqEln8T/RCXWsmZhSAVbwyy2BWnrJmPSJkkkJ4x1Ma6659From8jGreg2RJA==", + "dgSpecHash": "uEPuLSS/sVT2PWbiKIvEEH0CSwxk2oZpc/IrO17Q6Rf9Pipii14coKMF91zQ8TRFgG3IsJy413J+wCgHBjUbmQ==", "success": true, "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "expectedPackageFiles": [ diff --git a/Admin.Core.Common/Helper/DESProvider.cs b/Admin.Core.Common/Helper/DESProvider.cs index dee5a5de..c6e8feef 100644 --- a/Admin.Core.Common/Helper/DESProvider.cs +++ b/Admin.Core.Common/Helper/DESProvider.cs @@ -14,9 +14,11 @@ namespace Admin.Core.Common private DESProvider() { } + //默认的初始化密钥 private static string key = "Microsoft"; + #region 对称加密解密的密钥 /// /// 对称加密解密的密钥 /// @@ -31,6 +33,9 @@ namespace Admin.Core.Common key = value; } } + + #endregion + #region 加密 /// /// 采用DES算法对字符串加密 @@ -105,6 +110,7 @@ namespace Admin.Core.Common } } #endregion + #region 解密 public static string DecryptString(string decryptString, string key) { @@ -168,6 +174,8 @@ namespace Admin.Core.Common } } #endregion + + #region 检查密钥或初始化向量的长度，如果不是8的倍数或长度大于64则截取前8个元素 /// /// 检查密钥或初始化向量的长度，如果不是8的倍数或长度大于64则截取前8个元素 /// @@ -192,6 +200,8 @@ namespace Admin.Core.Common return byteArray; } } - } + #endregion + + } } diff --git a/Admin.Core.Model/Model_New/SmTaskExecution.cs b/Admin.Core.Model/Model_New/SmTaskExecution.cs index ad656805..d6ced3a2 100644 --- a/Admin.Core.Model/Model_New/SmTaskExecution.cs +++ b/Admin.Core.Model/Model_New/SmTaskExecution.cs @@ -52,7 +52,16 @@ namespace Admin.Core.Model.Model_New /// [SugarColumn(ColumnName = "COMPLETE_AMOUNT")] public int CompleteAmount { get; set; } - + /// + /// 前板数量 + /// + [SugarColumn(ColumnName = "FRONTPLATE_AMOUNT")] + public int FrontPlateAmount { get; set; } + /// + /// 后板数量 + /// + [SugarColumn(ColumnName = "REARPANEL_AMOUNT")] + public int RearPanelAmount { get; set; } /// /// 开始时间 /// @@ -71,7 +80,7 @@ namespace Admin.Core.Model.Model_New [SugarColumn(ColumnName = "CREATE_TIME")] public DateTime CreateTime { get; set; } /// - /// 是否执行中 + /// 是否执行中:1-执行，2-完成 /// [SugarColumn(ColumnName = "IS_EXEC")] public int IsExec { get; set; } diff --git a/Admin.Core.RealTimeService/Startup.cs b/Admin.Core.RealTimeService/Startup.cs index a92acbd9..56f2da63 100644 --- a/Admin.Core.RealTimeService/Startup.cs +++ b/Admin.Core.RealTimeService/Startup.cs @@ -81,8 +81,7 @@ namespace Admin.Core.RealTimeService { // ʹþ̬ļ app.UseStaticFiles(); - - app.AucmaTaskMildds(aucamTaskService); + app.AucmaTaskMildds(aucamTaskService); } #region ע diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs index 05309383..6de7c0b6 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs @@ -228,6 +228,5 @@ namespace Admin.Core.Tasks return await Task.FromResult(item); } #endregion - } } diff --git a/Aucma.Core.BoxFoam/ViewModels/AfterFoamingPageModelView.cs b/Aucma.Core.BoxFoam/ViewModels/AfterFoamingPageModelView.cs index a1a769e6..265a0541 100644 --- a/Aucma.Core.BoxFoam/ViewModels/AfterFoamingPageModelView.cs +++ b/Aucma.Core.BoxFoam/ViewModels/AfterFoamingPageModelView.cs @@ -33,6 +33,7 @@ namespace Aucma.Core.BoxFoam.ViewModels string storeCode = Appsettings.app("StoreInfo", "AfterStoreCode");//泡前库code var baseSpaceInfolist = await _baseSpaceInfoServices.QueryAsync(d => d.StoreCode.Equals(storeCode));//仓库 + if (baseSpaceInfolist == null) return; foreach (var item in baseSpaceInfolist) { diff --git a/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs b/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs index 05941689..a2bfcaaa 100644 --- a/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs +++ b/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs @@ -42,6 +42,8 @@ namespace Aucma.Core.BoxFoam.ViewModels string storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");//泡前库code var baseSpaceInfolist = await _baseSpaceInfoServices.QueryAsync(d => d.StoreCode.Equals(storeCode));//仓库 + if (baseSpaceInfolist == null) return; + Shapes.Clear(); foreach (var item in baseSpaceInfolist) { diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs index b082c419..399758d0 100644 --- a/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs @@ -32,6 +32,7 @@ namespace Aucma.Core.BoxFoam.ViewModels int i = 1; var list = await _boxLastShotRecordServices.QueryAsync(); + if (list == null) return; list.OrderByDescending(d => d.LastTime); foreach (var item in list.Take(50)) { diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs index 2a4117b0..effedf03 100644 --- a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs @@ -267,6 +267,7 @@ namespace Aucma.Core.BoxFoam.ViewModels { int total = 0; var list = await _boxFoamDataServices.QueryAsync(); + if (list == null) return; foreach (var item in list) { if (item.BoxFixturestatus == 1) StatusColor.Add("Green"); diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamPlanPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamPlanPageViewModel.cs index 6945073e..5498f639 100644 --- a/Aucma.Core.BoxFoam/ViewModels/FoamPlanPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/FoamPlanPageViewModel.cs @@ -32,6 +32,7 @@ namespace Aucma.Core.BoxFoam.ViewModels public async void InitData() { var task =await _boxFoamPlanServices.QueryAsync(); + if (task == null) return; task.OrderBy(d=>d.ObjId); foreach (var item in task) { diff --git a/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs index 06533179..f63dabbd 100644 --- a/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs @@ -28,9 +28,9 @@ namespace Aucma.Core.DoorFoam.ViewModels _doorFoamRecordServices = App.ServiceProvider.GetService(); //var state = _doorFoamRecordServices.GetConnectionState(); StationName = "门体发泡"; - MaterialName = "SC-AUCMA-农夫山泉，SC 门体"; - OrderNo = "8512365486"; - BeginTime = DateTime.Now.ToString("yyyy-mm-dd HH:mm:ss"); + //MaterialName = ""; + //OrderNo = ""; + //BeginTime = DateTime.Now.ToString("yyyy-mm-dd HH:mm:ss"); _=InitEveryDayMethodAsync(); } diff --git a/Aucma.Core.PLc/Model/PlcModel.cs b/Aucma.Core.PLc/Model/PlcModel.cs index ff241e56..1c76ebf0 100644 --- a/Aucma.Core.PLc/Model/PlcModel.cs +++ b/Aucma.Core.PLc/Model/PlcModel.cs @@ -1,6 +1,9 @@  namespace Aucma.Core.PLc { + /// + /// PLC + /// public class PlcModel { /// @@ -10,7 +13,7 @@ namespace Aucma.Core.PLc /// /// 设备名称 /// - public string? EquipName { get; set; } + public string EquipName { get; set; } /// /// 设备IP /// diff --git a/Aucma.Core.Palletiz/App.xaml b/Aucma.Core.Palletiz/App.xaml index 0b01cab3..3d880bf4 100644 --- a/Aucma.Core.Palletiz/App.xaml +++ b/Aucma.Core.Palletiz/App.xaml @@ -26,14 +26,14 @@ - + + + + diff --git a/Aucma.Core.Palletiz/Views/MainWindow.xaml b/Aucma.Core.Palletiz/Views/MainWindow.xaml index 11330809..0be308b1 100644 --- a/Aucma.Core.Palletiz/Views/MainWindow.xaml +++ b/Aucma.Core.Palletiz/Views/MainWindow.xaml @@ -60,12 +60,12 @@ - namespace Aucma.Core.Tasks { - public class Job_SheetMetalTask + public class JobSheetMetalTask { - #region 钣金任务 - /// - /// 实时任务信息-每日产量 - /// - public delegate Task SmEverDayDelegate(); - public static event SmEverDayDelegate SmEverDayDelegateEvent; - - /// - /// 实时任务信息-展示 - /// - public delegate Task SmShowDelegate(ExecutePlanInfo info); - public static event SmShowDelegate SmShowDelegateEvent; - #endregion - - private readonly ISmTaskExecutionServices _smTaskExecutionServices; - private readonly IExecutePlanInfoServices _taskExecutionServices; - public Job_SheetMetalTask(ISmTaskExecutionServices smTaskExecutionServices, IExecutePlanInfoServices taskExecutionServices) - { - _smTaskExecutionServices = smTaskExecutionServices; - _taskExecutionServices = taskExecutionServices; - } - public async Task Execute() - { - await ShowRun(); - await CompleteRun(); - } - - #region 实施当日产量和型号统计 - public Task Run() - { - SmEverDayDelegateEvent?.Invoke(); - return Task.CompletedTask; - } - #endregion - - #region 实时计划显示 - public async Task ShowRun() - { - var model = await _taskExecutionServices.FirstAsync(d => d.ExecuteStatus == 2); - SmShowDelegateEvent?.Invoke(model); - } - #endregion - - #region 任务完成 - public Task CompleteRun() - { - var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("后板Plc")); - var val = obj.plc.ReadInt32("M100");//任务结束信号存盘 - if (val == 1) - { - //1、存储当日完成记录表、计算节拍信息 - - //2、更新界面计划执行、当日产量、型号统计、计划列表 - - //3、更新日志记录 - - //4、更新数据统计列表 - } - return Task.CompletedTask; - } - #endregion + + + } } diff --git a/Aucma.Core.Tasks/IAucamTaskService.cs b/Aucma.Core.Tasks/IAucamTaskService.cs index ac103f19..dc6644ab 100644 --- a/Aucma.Core.Tasks/IAucamTaskService.cs +++ b/Aucma.Core.Tasks/IAucamTaskService.cs @@ -3,6 +3,6 @@ namespace Aucma.Core.Tasks { public interface IAucamTaskService { - Task AucamTaskAsync(); + void AucamTaskAsync(); } }