修改部分显示 警告

Admin.Core.Service/Service_New/CodeBindingRecordServices.cs

@@ -97,7 +97,7 @@ namespace Admin.Core.Service
         public async Task<CodeBindingRecord> FirstAsync()
         {
 
-            return _codeBindingRecordRepository.FirstAsync().Result;
+            return await _codeBindingRecordRepository.FirstAsync();
         }
 
         /// <summary>

Admin.Core.Service/Service_New/RecordInstoreServices.cs

@@ -48,7 +48,7 @@ namespace Admin.Core.Service
             try
             {
               
-                List<RecordInStore> preCordList =  _recordInstoreRepository.QueryAsync(d =>d.StoreCode.Equals(storeCode) && d.InStoreTime >= startTime && d.InStoreTime <= endTime).Result;//
+                List<RecordInStore> 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<EnterLibView> list = new List<EnterLibView>();

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)
             {

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;
         }
 
 

Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamLastData_Quartz.cs

@@ -57,7 +57,7 @@ namespace Admin.Core.Tasks
         /// <returns></returns>
         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;
         }
 
     }

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)
             {

Aucma.Core.RunPlc/RunPlcService.cs

@@ -116,6 +116,7 @@ namespace Aucma.Core.RunPlc
                     }
                 }
             }
+            await Task.CompletedTask;
         }
         private async void ExecSiemensHeartTask(object? sender, ElapsedEventArgs e)
         {

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
         /// <returns></returns>
         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;
 

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<BaseSpaceInfo>();
             List<BaseSpaceInfo> shellList =await _baseSpaceInfoServices.GetSpaceInfosByStoreCode(shellStoreCode);

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)

Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs

@@ -269,13 +269,11 @@ namespace Aucma.Core.SheetMetal.ViewModels
         /// 重置
         /// </summary>
         [RelayCommand]
-        public void Reset()
+        public async Task Reset()
         {
-            LoadData();
-
             Search = string.Empty;
             MaterialTypeCombox = string.Empty;
-            this.LoadData();
+            await this.LoadData();
         }
         #endregion
 

Aucma.Core.SheetMetal/ViewModels/StatisticsPageViewModel.cs

@@ -32,7 +32,11 @@ namespace Aucma.Core.SheetMetal.ViewModels
             _backPanelComplateServices = App.ServiceProvider.GetService<IRecordBackPanelComplateServices>();
             _executePlanInfoServices = App.ServiceProvider.GetService<IExecutePlanInfoServices>();
 
-            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)

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()
         {

Aucma.Core.Tasks/CommTask/Job_BoxFoamOutStoreTask.cs

@@ -84,6 +84,7 @@ namespace Aucma.Core.Tasks
                 //{
                 //    //报警停线
                 //}
+                await Task.CompletedTask;
             }
             catch (Exception ex)
             {