From 2c727f8cd4898f4e031407cb9953a004f079bc65 Mon Sep 17 00:00:00 2001 From: "liulb@mesnac.com" Date: Thu, 11 Jan 2024 20:32:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service_New/CodeBindingRecordServices.cs | 2 +- .../Service_New/RecordInstoreServices.cs | 2 +- .../Service_New/SmTaskExecutionServices.cs | 3 +++ .../QuartzNet/Jobs/Job_BoxFoamInStoreTask_Quartz.cs | 2 ++ .../QuartzNet/Jobs/Job_BoxFoamLastData_Quartz.cs | 6 +++--- .../QuartzNet/Jobs/Job_BoxFoamOutStore_Quartz.cs | 2 ++ Aucma.Core.RunPlc/RunPlcService.cs | 1 + .../ViewModels/IndexPageViewModel.cs | 11 +++++------ .../ViewModels/MaterialStatisticsViewModel.cs | 6 +++--- .../ViewModels/QuantityIssuedViewModel.cs | 2 +- .../ViewModels/SplitPlanViewModel.cs | 6 ++---- .../ViewModels/StatisticsPageViewModel.cs | 7 ++++++- .../CommTask/Job_BoxFoamInStoreTaskTask.cs | 3 ++- Aucma.Core.Tasks/CommTask/Job_BoxFoamOutStoreTask.cs | 1 + 14 files changed, 33 insertions(+), 21 deletions(-) diff --git a/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs b/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs index b61aa1b0..32397e0d 100644 --- a/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs +++ b/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs @@ -97,7 +97,7 @@ namespace Admin.Core.Service public async Task FirstAsync() { - return _codeBindingRecordRepository.FirstAsync().Result; + return await _codeBindingRecordRepository.FirstAsync(); } /// diff --git a/Admin.Core.Service/Service_New/RecordInstoreServices.cs b/Admin.Core.Service/Service_New/RecordInstoreServices.cs index 0664a787..e9bef75d 100644 --- a/Admin.Core.Service/Service_New/RecordInstoreServices.cs +++ b/Admin.Core.Service/Service_New/RecordInstoreServices.cs @@ -48,7 +48,7 @@ namespace Admin.Core.Service try { - List preCordList = _recordInstoreRepository.QueryAsync(d =>d.StoreCode.Equals(storeCode) && d.InStoreTime >= startTime && d.InStoreTime <= endTime).Result;// + List preCordList =await _recordInstoreRepository.QueryAsync(d =>d.StoreCode.Equals(storeCode) && d.InStoreTime >= startTime && d.InStoreTime <= endTime);// if(preCordList == null && preCordList.Count == 0) return null; return preCordList; //List list = new List(); diff --git a/Admin.Core.Service/Service_New/SmTaskExecutionServices.cs b/Admin.Core.Service/Service_New/SmTaskExecutionServices.cs index de385960..c521f9ae 100644 --- a/Admin.Core.Service/Service_New/SmTaskExecutionServices.cs +++ b/Admin.Core.Service/Service_New/SmTaskExecutionServices.cs @@ -123,7 +123,10 @@ namespace Admin.Core.Service if (sm!=null) { //下传计划到PLC,同时更改计划状态 + } + await Task.CompletedTask; + return null; } catch (Exception ex) { diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamInStoreTask_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamInStoreTask_Quartz.cs index 14b6c114..b2062253 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamInStoreTask_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamInStoreTask_Quartz.cs @@ -125,6 +125,7 @@ namespace Admin.Core.Tasks // await ExecuteJob(context, async () => await PassDown(context)); // 监测入库，出库完成信号 // await ExecuteJob(context, async () => await RealInstoreFinish(context)); + await Task.CompletedTask; } public async Task RealInstoreFinish(IJobExecutionContext context) { @@ -147,6 +148,7 @@ namespace Admin.Core.Tasks } } } + await Task.CompletedTask; } diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamLastData_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamLastData_Quartz.cs index 66d9fbf7..a98386ff 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamLastData_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamLastData_Quartz.cs @@ -57,7 +57,7 @@ namespace Admin.Core.Tasks /// public async Task Collect(IJobExecutionContext context) { - CollectLast(); + await CollectLast(); // CollectMachine(); } @@ -113,7 +113,7 @@ namespace Admin.Core.Tasks // 刷新页面 RefreshLastShotDataDelegateEvent?.Invoke(lastShotRecord); //保存 - _lastShotRecordServices.AddAsync(lastShotRecord); + await _lastShotRecordServices.AddAsync(lastShotRecord); tempLastRecord = lastShotRecord; } } @@ -131,7 +131,7 @@ namespace Admin.Core.Tasks { byte[] info = obj.plc.ReadBytes("DB50.896", (ushort)88); } - + await Task.CompletedTask; } } diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamOutStore_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamOutStore_Quartz.cs index 50e559fd..25057be7 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamOutStore_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamOutStore_Quartz.cs @@ -63,6 +63,7 @@ namespace Admin.Core.Tasks // await PlanHandle(planInfo); // } //} + await Task.CompletedTask; } @@ -92,6 +93,7 @@ namespace Admin.Core.Tasks //{ // //报警停线 //} + await Task.CompletedTask; } catch (Exception ex) { diff --git a/Aucma.Core.RunPlc/RunPlcService.cs b/Aucma.Core.RunPlc/RunPlcService.cs index 61af7e2b..2739a1b5 100644 --- a/Aucma.Core.RunPlc/RunPlcService.cs +++ b/Aucma.Core.RunPlc/RunPlcService.cs @@ -116,6 +116,7 @@ namespace Aucma.Core.RunPlc } } } + await Task.CompletedTask; } private async void ExecSiemensHeartTask(object? sender, ElapsedEventArgs e) { diff --git a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs index a105ff14..f47b63e6 100644 --- a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs @@ -96,7 +96,7 @@ namespace Aucma.Core.SheetMetal.ViewModels private async Task InitExecMethod() { - string station = Appsettings.app("StoreInfo", "StationCode"); + string station = Appsettings.app("StationInfo", "StationCode"); ExecutePlanInfo info = await _taskExecutionPlanInfoServices.FirstAsync(d => d.ProductLineCode.Equals(station) && d.ExecuteStatus == 2); if (info == null) return; @@ -302,11 +302,10 @@ namespace Aucma.Core.SheetMetal.ViewModels [RelayCommand] private async Task MoveUp(string Id) { - string stationCode = Appsettings.app("StoreInfo", "StationCode"); + string stationCode = Appsettings.app("StationInfo", "StationCode"); bool result = await _taskExecutionPlanInfoServices.PlanMoveUp(Id, stationCode); if (result) { - PlanInfoDataGrid.Clear(); await LoadData(); } } @@ -319,12 +318,12 @@ namespace Aucma.Core.SheetMetal.ViewModels [RelayCommand] private async Task MoveDown(string Id) { - string stationCode = Appsettings.app("StoreInfo", "StationCode"); + string stationCode = Appsettings.app("StationInfo", "StationCode"); bool result = await _taskExecutionPlanInfoServices.PlanMoveDown(Id, stationCode); if (result) { PlanInfoDataGrid.Clear(); - LoadData(); + await LoadData(); } } #endregion @@ -671,7 +670,7 @@ namespace Aucma.Core.SheetMetal.ViewModels /// public async Task UpdatePlanSHow() { - string stationCode = Appsettings.app("StoreInfo", "StationCode"); + string stationCode = Appsettings.app("StationInfo", "StationCode"); var info = await _taskExecutionPlanInfoServices.FirstAsync(d => d.ExecuteStatus == 3 && d.ProductLineCode == stationCode); if (info == null) return; diff --git a/Aucma.Core.SheetMetal/ViewModels/MaterialStatisticsViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/MaterialStatisticsViewModel.cs index 27d9753a..64ac7697 100644 --- a/Aucma.Core.SheetMetal/ViewModels/MaterialStatisticsViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/MaterialStatisticsViewModel.cs @@ -26,9 +26,9 @@ namespace Aucma.Core.SheetMetal.ViewModels [RelayCommand] private async void Refresh() { - string shellStoreCode = Appsettings.app("StoreInfo", "shellStoreCode"); - string linerStoreCode = Appsettings.app("StoreInfo", "linerStoreCode"); - string foamBeforeStoreCode = Appsettings.app("StoreInfo", "foamBeforeStoreCode"); + string shellStoreCode = Appsettings.app("StationInfo", "shellStoreCode"); + string linerStoreCode = Appsettings.app("StationInfo", "linerStoreCode"); + string foamBeforeStoreCode = Appsettings.app("StationInfo", "foamBeforeStoreCode"); //箱壳物料库存 ShellMaterialStockDataGrid = new ObservableCollection(); List shellList =await _baseSpaceInfoServices.GetSpaceInfosByStoreCode(shellStoreCode); diff --git a/Aucma.Core.SheetMetal/ViewModels/QuantityIssuedViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/QuantityIssuedViewModel.cs index d645d955..32408c4b 100644 --- a/Aucma.Core.SheetMetal/ViewModels/QuantityIssuedViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/QuantityIssuedViewModel.cs @@ -94,7 +94,7 @@ namespace Aucma.Core.SheetMetal.ViewModels task.ProductPlanCode = PlanInfo.PlanCode; task.OrderCode = PlanInfo.OrderCode; task.ProductLineCode = stationCode;//计划工位 - task.TaskCode = DateTime.Now.ToString("yyMMddHHmmss"); + task.TaskCode = productPlanInfo.PlanCode;// DateTime.Now.ToString("yyMMddHHmmss"); task.MaterialCode = PlanInfo.MaterialCode; task.MaterialName = PlanInfo.MaterialName; if (list.Count == 0) diff --git a/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs index f0100a4d..e12b0c52 100644 --- a/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs @@ -269,13 +269,11 @@ namespace Aucma.Core.SheetMetal.ViewModels /// 重置 /// [RelayCommand] - public void Reset() + public async Task Reset() { - LoadData(); - Search = string.Empty; MaterialTypeCombox = string.Empty; - this.LoadData(); + await this.LoadData(); } #endregion diff --git a/Aucma.Core.SheetMetal/ViewModels/StatisticsPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/StatisticsPageViewModel.cs index 95acdf75..76d7bf8e 100644 --- a/Aucma.Core.SheetMetal/ViewModels/StatisticsPageViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/StatisticsPageViewModel.cs @@ -32,7 +32,11 @@ namespace Aucma.Core.SheetMetal.ViewModels _backPanelComplateServices = App.ServiceProvider.GetService(); _executePlanInfoServices = App.ServiceProvider.GetService(); - Task.WaitAll(LoadData()); + //Task.WaitAll(LoadData()); + + Task.Run(async ()=>{ + await LoadData(); + }); } #region 加载DataGrid数据 @@ -59,6 +63,7 @@ namespace Aucma.Core.SheetMetal.ViewModels }); i++; } + await Task.CompletedTask; } private Task LoadDateData(string result) diff --git a/Aucma.Core.Tasks/CommTask/Job_BoxFoamInStoreTaskTask.cs b/Aucma.Core.Tasks/CommTask/Job_BoxFoamInStoreTaskTask.cs index 64a1b6a8..a86cc1c7 100644 --- a/Aucma.Core.Tasks/CommTask/Job_BoxFoamInStoreTaskTask.cs +++ b/Aucma.Core.Tasks/CommTask/Job_BoxFoamInStoreTaskTask.cs @@ -76,7 +76,8 @@ namespace Aucma.Core.Tasks public async Task InStoreRun() { string storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");//泡前库code - // await InStore(storeCode, "B20231082080029650001"); + // await InStore(storeCode, "B20231082080029650001"); + await Task.CompletedTask; } public async Task OuteRun() { diff --git a/Aucma.Core.Tasks/CommTask/Job_BoxFoamOutStoreTask.cs b/Aucma.Core.Tasks/CommTask/Job_BoxFoamOutStoreTask.cs index ede3a1d7..0158b57c 100644 --- a/Aucma.Core.Tasks/CommTask/Job_BoxFoamOutStoreTask.cs +++ b/Aucma.Core.Tasks/CommTask/Job_BoxFoamOutStoreTask.cs @@ -84,6 +84,7 @@ namespace Aucma.Core.Tasks //{ // //报警停线 //} + await Task.CompletedTask; } catch (Exception ex) {