change-打印上位机登录班组过滤

Aucma.Core.PrintTo/Config/AppConfig.cs

@@ -26,6 +26,15 @@ namespace Aucma.Core.ProductOffLine.Config
         {
           
         }
+
+        /// <summary>
+        /// 工位编号
+        /// </summary>
+        public string StationCode
+        {
+            get { return iniHelper.IniReadValue("system", "StationCode"); }
+            set { iniHelper.IniWriteValue("system", "StationCode", value); }
+        }
         /// <summary>
         /// 班组代码
         /// </summary>

Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs

@@ -2,12 +2,14 @@
 using Admin.Core.IService;
 using Admin.Core.Model;
 using Admin.Core.Model.ViewModels;
+using Admin.Core.Socket;
 using Aucma.Core.PrintTo.Models;
 using Aucma.Core.PrintTo.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using FastReport;
+using FastReport.Cloud.OAuth;
 using log4net;
 using Microsoft.Extensions.DependencyInjection;
 using System;
@@ -44,8 +46,18 @@ namespace Aucma.Core.PrintTo.ViewModels
             AppendPrintEnabled = Appsettings.app("StoreInfo", "AppendPrintEnabled"); 
             WeakReferenceMessenger.Default.Register<string>(this, Recive);
             PrintAmount = 0;
+            InitializeAsync();
 
-            Task.WaitAll(LoadData());
+
+        }
+
+        private async void InitializeAsync()
+        {
+            await Task.Run(() =>
+            {
+                Task.WaitAll(LoadData());
+
+            });
         }
 
         #region 加载DataGrid数据

Aucma.Core.PrintTo/ViewModels/LoginPageViewModel.cs

@@ -123,7 +123,7 @@ namespace Aucma.Core.PrintTo.ViewModels
         #region 班组添加到集合中
         public void AddTeamData()
         {
-            var baseTeamMembersList = _baseTeamMembersServices.QueryAsync(d => d.ProductLineCode.Contains("CX_02")).Result;
+            var baseTeamMembersList = _baseTeamMembersServices.QueryAsync(d => d.ProductLineCode==appConfig.StationCode).Result;
             if (baseTeamMembersList == null) return;
             foreach (var item in baseTeamMembersList)
             {

Aucma.Core.ProductOffLineCX1/Config/AppConfig.cs

@@ -48,7 +48,15 @@ namespace Aucma.Core.ProductOffLineCX1.Config
             set { iniHelper.IniWriteValue("system", "ProductlineCode", value); }
         }
 
-  
+        /// <summary>
+        /// 工位编号
+        /// </summary>
+        public string StationCode
+        {
+            get { return iniHelper.IniReadValue("system", "StationCode"); }
+            set { iniHelper.IniWriteValue("system", "StationCode", value); }
+        }
+
         /// <summary>
         /// 扫码枪放行方向，0外侧，1内侧，-1都未选中
         /// </summary>

Aucma.Core.ProductOffLineCX1/ViewModels/LoginPageViewModel.cs

@@ -126,7 +126,7 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
         #region 班组添加到集合中
         public void AddTeamData()
         {
-            var baseTeamMembersList = _baseTeamMembersServices.QueryAsync(d => d.ProductLineCode.Contains("CX_02")).Result;
+            var baseTeamMembersList = _baseTeamMembersServices.QueryAsync(d => d.ProductLineCode==appConfig.StationCode).Result;
             if (baseTeamMembersList == null) return;
             foreach (var item in baseTeamMembersList)
             {