From ac7cbd1a528a4de7e0557105681e24111876a089 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Fri, 8 Dec 2023 13:58:51 +0800
Subject: [PATCH 1/3] change.

---
 Admin.Core.Extensions/ServiceExtensions/SqlsugarSetup.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Admin.Core.Extensions/ServiceExtensions/SqlsugarSetup.cs b/Admin.Core.Extensions/ServiceExtensions/SqlsugarSetup.cs
index 85475618..3a36e163 100644
--- a/Admin.Core.Extensions/ServiceExtensions/SqlsugarSetup.cs
+++ b/Admin.Core.Extensions/ServiceExtensions/SqlsugarSetup.cs
@@ -1,5 +1,7 @@
 锘縰sing Admin.Core.Common;
+using Admin.Core.Model;
 using Microsoft.Extensions.DependencyInjection;
+using NPOI.SS.Formula.Functions;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
@@ -67,7 +69,9 @@ namespace Admin.Core.Extensions
                     }
                    );
                 });
-                return new SqlSugarClient(listConfig);
+                SqlSugarClient client = new SqlSugarClient(listConfig);
+             //   var childA = client.GetConnection("aucma_mes").Ado.SqlQuery<BaseBomInfo>("select * from BASE_BOMINFO where OBJ_ID='1'");
+                return client;
             });
         }
 

From c162566b27b6092c8bcb243a72a0bfa0df8db760 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Fri, 8 Dec 2023 16:37:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?change=20-=20=E6=95=B0=E6=8D=AE=E5=BA=93,pl?=
 =?UTF-8?q?c,=E6=89=AB=E7=A0=81=E5=99=A8=E7=8A=B6=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Aucma.Core.BoxFoam/Startup.cs                 |   8 +-
 .../ViewModels/MainWindowViewModel.cs         | 225 +++++++++++++++--
 Aucma.Core.BoxFoam/Views/MainWindow.xaml      |  22 +-
 Aucma.Core.BoxFoam/appsettings.json           |  17 +-
 .../ViewModels/MainWindowViewModel.cs         |  10 +-
 Aucma.Core.DoorFoam/Startup.cs                |  14 +-
 .../ViewModels/MainWindowViewModel.cs         | 226 ++++++++++++++++--
 Aucma.Core.DoorFoam/Views/MainWindow.xaml     |  22 +-
 Aucma.Core.DoorFoam/appsettings.json          |  26 +-
 Aucma.Core.Palletiz/Startup.cs                |   7 +-
 .../ViewModels/MainWindowViewModel.cs         | 224 +++++++++++++++--
 Aucma.Core.Palletiz/Views/MainWindow.xaml     |  24 +-
 Aucma.Core.Palletiz/appsettings.json          |  17 +-
 .../ViewModels/MainWindowViewModel.cs         |   2 +-
 14 files changed, 724 insertions(+), 120 deletions(-)

diff --git a/Aucma.Core.BoxFoam/Startup.cs b/Aucma.Core.BoxFoam/Startup.cs
index 7b358d95..9346970d 100644
--- a/Aucma.Core.BoxFoam/Startup.cs
+++ b/Aucma.Core.BoxFoam/Startup.cs
@@ -8,6 +8,7 @@ using Admin.Core.Repository;
 using Admin.Core.Service;
 using Admin.Core.Tasks;
 using Aucma.Core.RunPlc;
+using Aucma.Core.Scanner;
 using Autofac;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -61,6 +62,9 @@ namespace Aucma.Core.BoxFoam
             //注册业务服务
             AddServices(services);
 
+            //扫码器
+            services.AddScannerSetup();
+
             //任务调度
             services.AddJobSetup();
             //PLC
@@ -85,7 +89,7 @@ namespace Aucma.Core.BoxFoam
         /// </summary>
         /// <param name="app"></param>
         /// <param name="env"></param>
-        public void Configure(IApplicationBuilder app, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter, IRunPlcService runPlcService)//
+        public void Configure(IApplicationBuilder app, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter, IRunPlcService runPlcService,IScannerService scannerService)//
         {
             // 使用静态文件
             app.UseStaticFiles();
@@ -96,6 +100,8 @@ namespace Aucma.Core.BoxFoam
             app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
             //PLC
             app.UsePlcMildd(runPlcService);
+            //开启扫码服务
+            app.UseScannerMildd(scannerService);
         }
 
         #region 注册服务
diff --git a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
index 11b3f847..c46e4f88 100644
--- a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
@@ -6,6 +6,10 @@ using System;
 using log4net;
 using System.Diagnostics;
 using System.Threading;
+using Admin.Core.Common;
+using Aucma.Core.PLc;
+using Aucma.Core.Scanner;
+using System.Linq;
 
 namespace Aucma.Core.BoxFoam.ViewModels
 {
@@ -19,12 +23,82 @@ namespace Aucma.Core.BoxFoam.ViewModels
         private FoamPlanPageView foamPlanPageView = new FoamPlanPageView();
         FoamMonitorPageView foamMonitorPageView = new FoamMonitorPageView();
         FoamMachinesPageView foamMachinesPageView = new FoamMachinesPageView();
-
+         
         public MainWindowViewModel()
         {
             UserContent = firstPage;
+            init();
+        }
+        public void init()
+        {
+            // 璁惧鐘舵�佸埛鏂板畾鏃跺櫒
+            System.Timers.Timer timer = new System.Timers.Timer(1000 * 5);
+            timer.Elapsed += new System.Timers.ElapsedEventHandler(RefreshStatus);
+            timer.AutoReset = true;
+            timer.Enabled = true;
+            timer.Start();
+        }
+
+        #region 璁惧鐘舵�佸埛鏂�
+        /// <summary>
+        /// 璁惧鐘舵�佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshStatus(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            RefreshMesDb();
+            RefreshPlc();
+            RefreshScanner();
+
+        }
+        /// <summary>
+        /// 鏁版嵁搴撶姸鎬佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshMesDb()
+        {
+            MesDbState(true);
         }
 
+
+        /// <summary>
+        /// plc鐘舵�佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshPlc()
+        {
+            var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("娉″墠搴揚lc"));
+            if (obj != null)
+            {
+                if (obj.plc.IsConnected)
+                {
+                    PlcState(true);
+                }
+                else
+                {
+                    PlcState(false);
+                }
+            }
+            else
+            {
+                PlcState(false);
+            }
+        }
+        /// <summary>
+        /// 鎵爜鍣ㄧ姸鎬佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshScanner()
+        {
+            string ip1 = Appsettings.app("Middleware", "Scanner1", "Ip");
+            bool flag1 = MvCodeHelper.ConnectionStatus(ip1);
+            Scanner1State(flag1);
+        }
+        #endregion
         #region 鏇存崲鐣岄潰
 
         public System.Windows.Controls.UserControl _content;
@@ -142,19 +216,70 @@ namespace Aucma.Core.BoxFoam.ViewModels
                     break;
             }
         }
-        #endregion 
+        #endregion
+
+        #region MES鏁版嵁搴撶姸鎬�
+        /// <summary>
+        /// MES鏁版嵁搴�-鏂囧瓧
+        /// </summary>
+        public string _mesDbUIStatusWb;
+        public string MesDbUIStatusWb
+        {
+            get => _mesDbUIStatusWb;
+            set => SetProperty(ref _mesDbUIStatusWb, value);
+        }
+        /// <summary>
+        /// MES鏁版嵁搴�-棰滆壊
+        /// </summary>
+        public string _mesDbUIColor;
+        public string MesDbUIColor
+        {
+            get => _mesDbUIColor;
+            set => SetProperty(ref _mesDbUIColor, value);
+        }
+        /// <summary>
+        /// MES鏁版嵁搴�-鍥炬爣
+        /// </summary>
+        public string _mesUIIcon;
+        public string MesUIIcon
+        {
+            get => _mesUIIcon;
+            set => SetProperty(ref _mesUIIcon, value);
+        }
+
+        /// <summary>
+        /// MES鏁版嵁搴撹繛鎺ョ姸鎬�
+        /// </summary>
+        /// <param name="type"></param>
+        public void MesDbState(bool type)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                if (type)
+                {
+                    MesDbUIStatusWb = "MES鏁版嵁搴撹繛鎺ユ垚鍔�";
+                    MesDbUIColor = "Green";
+                    MesUIIcon = "Assets/Images/Green.png";
+                }
+                else
+                {
+                    MesDbUIStatusWb = "MES鏁版嵁搴撳紓甯�";
+                    MesDbUIColor = "Red";
+                    MesUIIcon = "Assets/Images/Red.png";
+                }
+            });
+        }
+        #endregion
 
         #region plc 鐘舵��
         /// <summary>
         /// UI plc 灞曠ず鐘舵��-鏂囧瓧
         /// </summary>
-        public string _plcUIStatus;
+        public string _plcUIStatusWb;
         public string PlcUIStatusWb
         {
-            //get { return plcUIStatusWb; }
-            //set { plcUIStatusWb = value; RaisePropertyChanged("PlcUIStatusWb"); }
-            get => _plcUIStatus;
-            set => SetProperty(ref _plcUIStatus, value);
+            get => _plcUIStatusWb;
+            set => SetProperty(ref _plcUIStatusWb, value);
         }
         /// <summary>
         /// UI plc 灞曠ず鐘舵��-棰滆壊
@@ -162,8 +287,6 @@ namespace Aucma.Core.BoxFoam.ViewModels
         public string _plcUIColor;
         public string PlcUIColor
         {
-            //get { return plcUIColor; }
-            //set { plcUIColor = value; RaisePropertyChanged("PlcUIColor"); }
             get => _plcUIColor;
             set => SetProperty(ref _plcUIColor, value);
         }
@@ -173,8 +296,6 @@ namespace Aucma.Core.BoxFoam.ViewModels
         public string _plcUIIcon;
         public string PlcUIIcon
         {
-            //get { return plcUIIcon; }
-            //set { plcUIIcon = value; RaisePropertyChanged("plcUIIcon"); }
             get => _plcUIIcon;
             set => SetProperty(ref _plcUIIcon, value);
         }
@@ -185,18 +306,80 @@ namespace Aucma.Core.BoxFoam.ViewModels
         /// <param name="type"></param>
         public void PlcState(bool type)
         {
-            if (type)
+            Application.Current.Dispatcher.Invoke(() =>
             {
-                PlcUIStatusWb = "PLC杩炴帴鎴愬姛";
-                PlcUIColor = "White";
-                PlcUIIcon = "Assets/Images/姝ｅ父.png";
-            }
-            else
+                if (type)
+                {
+                    PlcUIStatusWb = "PLC杩炴帴鎴愬姛";
+                    PlcUIColor = "Green";
+                    PlcUIIcon = "Assets/Images/Green.png";
+                }
+                else
+                {
+                    PlcUIStatusWb = "PLC鐘舵�佸紓甯�";
+                    PlcUIColor = "Red";
+                    PlcUIIcon = "Assets/Images/Red.png";
+                }
+            });
+        }
+        #endregion
+
+        #region 鎵爜鍣�1鐘舵��
+        /// <summary>
+        /// UI  灞曠ず鐘舵��-鏂囧瓧
+        /// </summary>
+        public string _scanner1UIStatusWb;
+        public string Scanner1UIStatusWb
+        {
+            //get { return plcUIStatusWb; }
+            //set { plcUIStatusWb = value; RaisePropertyChanged("PlcUIStatusWb"); }
+            get => _scanner1UIStatusWb;
+            set => SetProperty(ref _scanner1UIStatusWb, value);
+        }
+        /// <summary>
+        /// UI  灞曠ず鐘舵��-棰滆壊
+        /// </summary>
+        public string _scanner1UIColor;
+        public string Scanner1UIColor
+        {
+            //get { return plcUIColor; }
+            //set { plcUIColor = value; RaisePropertyChanged("PlcUIColor"); }
+            get => _scanner1UIColor;
+            set => SetProperty(ref _scanner1UIColor, value);
+        }
+        /// <summary>
+        /// UI  灞曠ず鐘舵��-鍥炬爣
+        /// </summary>
+        public string _scanner1UIIcon;
+        public string Scanner1UIIcon
+        {
+            //get { return plcUIIcon; }
+            //set { plcUIIcon = value; RaisePropertyChanged("plcUIIcon"); }
+            get => _scanner1UIIcon;
+            set => SetProperty(ref _scanner1UIIcon, value);
+        }
+
+        /// <summary>
+        /// 鎵爜鍣�1杩炴帴鐘舵��-true:杩炴帴鎴愬姛锛沠alse:澶辫触
+        /// </summary>
+        /// <param name="type"></param>
+        public void Scanner1State(bool type)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
             {
-                PlcUIStatusWb = "PLC鐘舵�佸紓甯�";
-                PlcUIColor = "Red";
-                PlcUIIcon = "Assets/Images/澶辫触-01.png";
-            }
+                if (type)
+                {
+                    Scanner1UIStatusWb = "鎵爜鍣�1杩炴帴鎴愬姛";
+                    Scanner1UIColor = "Green";
+                    Scanner1UIIcon = "Assets/Images/Green.png";
+                }
+                else
+                {
+                    Scanner1UIStatusWb = "鎵爜鍣�1鐘舵�佸紓甯�";
+                    Scanner1UIColor = "Red";
+                    Scanner1UIIcon = "Assets/Images/Red.png";
+                }
+            });
         }
         #endregion
     }
diff --git a/Aucma.Core.BoxFoam/Views/MainWindow.xaml b/Aucma.Core.BoxFoam/Views/MainWindow.xaml
index 9fde5a44..f5a5bd01 100644
--- a/Aucma.Core.BoxFoam/Views/MainWindow.xaml
+++ b/Aucma.Core.BoxFoam/Views/MainWindow.xaml
@@ -8,7 +8,7 @@
         Title="婢虫煰鐜涚浣撳彂娉℃帶鍒剁郴缁�"
         d:DesignHeight="1080"
         d:DesignWidth="1920" FontFamily="Microsoft YaHei"
-         WindowStyle="ToolWindow" WindowState="Maximized"
+         WindowStyle="None" WindowState="Maximized"
         WindowStartupLocation="CenterScreen"
        >
     <Window.Background>
@@ -59,10 +59,7 @@
             <DockPanel  Grid.Row="2" Margin="5 0 5 3">
                 <Border  BorderBrush="#0288d1"   BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch"  VerticalAlignment="Bottom">
                     <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
+                       
                         <StackPanel  Grid.Row="1" Height="50" Orientation="Horizontal"  Margin="5 0" HorizontalAlignment="Left">
                             <Button Content="瀹炴椂鐩戞帶" x:Name="FirstPage" FontSize="18"   Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}" />
                             <Button Content="瀹炴椂搴撳瓨" x:Name="RealTimeInventoryPage" FontSize="18"  Margin="5 0" Command="{Binding SwitchPagesCommand}"  CommandParameter="{Binding Name,ElementName=RealTimeInventoryPage}" />
@@ -76,25 +73,26 @@
                             <Button Content="鏈�灏忓寲"   x:Name="Minimized" FontSize="18"  Margin="5 0"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Minimized}"     Background="#FF9900" BorderBrush="#FF9900" />
                             <Button Content="閫�    鍑�" x:Name="Exit" Margin="5 0"  FontSize="18"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Exit}"  Background="#FF0033" BorderBrush="#FF0033"/>
                         </StackPanel>
-                        <StackPanel  Grid.Row="2" Height="50" Orientation="Horizontal"   HorizontalAlignment="Right">
-                            <TextBlock x:Name="PLCState" Text="PLC" VerticalAlignment="Center" Foreground="white" FontSize="15" Margin="10,0"/>
+                        <StackPanel   Height="50" Orientation="Horizontal"   HorizontalAlignment="Right">
                             <Border Width="30" Height="30" CornerRadius="15">
                                 <Border.Background>
-                                    <ImageBrush x:Name="PlcStatus" ImageSource="/Assets/Images/Green.png"/>
+                                    <ImageBrush x:Name="MesDbStatus" ImageSource="{Binding MesUIIcon}"/>
                                 </Border.Background>
                             </Border>
-                            <TextBlock x:Name="DB" Text="鏁版嵁搴�" VerticalAlignment="Center" Foreground="white" FontSize="15" Margin="10,0"/>
+                            <TextBlock x:Name="MesDbStateTxt" Text="{Binding MesDbUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding MesDbUIColor}"  FontSize="15" Margin="10,0"/>
                             <Border Width="30" Height="30" CornerRadius="15">
                                 <Border.Background>
-                                    <ImageBrush x:Name="PlcStatusImage" ImageSource="/Assets/Images/Green.png"/>
+                                    <ImageBrush x:Name="PlcStatus" ImageSource="{Binding PlcUIIcon}"/>
                                 </Border.Background>
                             </Border>
-                            <TextBlock x:Name="BarCodeStatusTxt" Text="鎵弿鍣�" VerticalAlignment="Center" Foreground="white" FontSize="15" Margin="10,0"/>
+                            <TextBlock x:Name="PLCState" Text="{Binding PlcUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding PlcUIColor}"  FontSize="15" Margin="10,0"/>
                             <Border Width="30" Height="30" CornerRadius="15">
                                 <Border.Background>
-                                    <ImageBrush x:Name="BarCodeStatus" ImageSource="/Assets/Images/Green.png"/>
+                                    <ImageBrush x:Name="Scanner1Status" ImageSource="{Binding Scanner1UIIcon}"/>
                                 </Border.Background>
                             </Border>
+                            <TextBlock x:Name="Scanner1" Text="{Binding Scanner1UIStatusWb}" VerticalAlignment="Center" Foreground="{Binding Scanner1UIColor}" FontSize="15" Margin="10,0"/>
+                           
                         </StackPanel>
                     </Grid>
                 </Border>
diff --git a/Aucma.Core.BoxFoam/appsettings.json b/Aucma.Core.BoxFoam/appsettings.json
index 460d52ab..fea0cb0e 100644
--- a/Aucma.Core.BoxFoam/appsettings.json
+++ b/Aucma.Core.BoxFoam/appsettings.json
@@ -210,16 +210,25 @@
     "SubscriptionClientName": "Admin.Core"
   },
   "Middleware": {
+    "Plc": {
+      "Enabled": true
+    },
     "QuartzNetJob": {
       "Enabled": true
     },
     "Scanner": { //鎵爜鍣�
       "Enabled": true
     },
-    "Melsec": {
-      "ConString": "10.10.92.30",
-      "Port": 6000,
-      "Enabled": true
+    "Scanner1": { //鎵爜鍣�1
+      "Ip": "192.168.1.19",
+      "Name": "鎵爜鍣�1"
+    },
+    "Scanner2": { //鎵爜鍣�2
+      "Ip": "192.168.1.20",
+      "Name": "鎵爜鍣�2"
+    },
+    "ScannerGun": { //鎵爜鏋�
+      "Enabled": false
     }
   },
   "PLCServer": [
diff --git a/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs
index d3452efc..64c6c938 100644
--- a/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs
@@ -76,7 +76,7 @@ namespace Aucma.Core.CodeBinding.ViewModels
         /// <param name="e"></param>
         public void RefreshMesDb()
         {
-           
+            MesDbState(true);
         }
 
 
@@ -111,7 +111,7 @@ namespace Aucma.Core.CodeBinding.ViewModels
         /// <param name="e"></param>
         public void RefreshScanner()
         {
-            string ip1 = Appsettings.app("Middleware", "Scanner1", "Ip");
+             string ip1 = Appsettings.app("Middleware", "Scanner1", "Ip");
              string ip2 = Appsettings.app("Middleware", "Scanner2", "Ip");
              bool flag1 = MvCodeHelper.ConnectionStatus(ip1);
              bool flag2 = MvCodeHelper.ConnectionStatus(ip2);
@@ -283,11 +283,11 @@ namespace Aucma.Core.CodeBinding.ViewModels
         /// <summary>
         /// UI plc 灞曠ず鐘舵��-鏂囧瓧
         /// </summary>
-        public string _plcUIStatus;
+        public string _plcUIStatusWb;
         public string PlcUIStatusWb
         {
-            get => _plcUIStatus;
-            set => SetProperty(ref _plcUIStatus, value);
+            get => _plcUIStatusWb;
+            set => SetProperty(ref _plcUIStatusWb, value);
         }
         /// <summary>
         /// UI plc 灞曠ず鐘舵��-棰滆壊
diff --git a/Aucma.Core.DoorFoam/Startup.cs b/Aucma.Core.DoorFoam/Startup.cs
index 74ef69be..2be9db94 100644
--- a/Aucma.Core.DoorFoam/Startup.cs
+++ b/Aucma.Core.DoorFoam/Startup.cs
@@ -7,6 +7,8 @@ using Admin.Core.Model;
 using Admin.Core.Repository;
 using Admin.Core.Service;
 using Admin.Core.Tasks;
+using Aucma.Core.RunPlc;
+using Aucma.Core.Scanner;
 using Autofac;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -60,9 +62,13 @@ namespace Aucma.Core.DoorFoam
             //注册业务服务
             AddServices(services);
 
+            //扫码器
+            services.AddScannerSetup();
+
             //任务调度
             services.AddJobSetup();
-
+            //PLC
+            services.AddPlcSetup();
             //支持编码大全 例如:支持 System.Text.Encoding.GetEncoding("GB2312")  System.Text.Encoding.GetEncoding("GB18030") 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
         }
@@ -83,7 +89,7 @@ namespace Aucma.Core.DoorFoam
         /// </summary>
         /// <param name="app"></param>
         /// <param name="env"></param>
-        public void Configure(IApplicationBuilder app, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter)
+        public void Configure(IApplicationBuilder app, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter, IScannerService scannerService, IRunPlcService runPlcService)
         {
             // 使用静态文件
             app.UseStaticFiles();
@@ -93,6 +99,10 @@ namespace Aucma.Core.DoorFoam
             // 开启QuartzNetJob调度服务
             app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
 
+            //开启扫码服务
+            app.UseScannerMildd(scannerService);
+            //PLC
+            app.UsePlcMildd(runPlcService);
         }
 
         #region 注册服务
diff --git a/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
index 680ce715..13fba3d9 100644
--- a/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
@@ -7,6 +7,10 @@ using log4net;
 using System.Diagnostics;
 using System.Threading;
 using NPOI.HSSF.Record;
+using Admin.Core.Common;
+using Aucma.Core.PLc;
+using Aucma.Core.Scanner;
+using System.Linq;
 
 namespace Aucma.Core.DoorFoam.ViewModels
 {
@@ -15,12 +19,82 @@ namespace Aucma.Core.DoorFoam.ViewModels
         private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel));
         private IndexPageView firstPage = new IndexPageView();//棣栭〉
         private StatisticsPageView recordPage = new StatisticsPageView();
-
+          
         public MainWindowViewModel()
         {
             UserContent = firstPage;
+            init();
+        }
+        public void init()
+        {
+            // 璁惧鐘舵�佸埛鏂板畾鏃跺櫒
+            System.Timers.Timer timer = new System.Timers.Timer(1000 * 5);
+            timer.Elapsed += new System.Timers.ElapsedEventHandler(RefreshStatus);
+            timer.AutoReset = true;
+            timer.Enabled = true;
+            timer.Start();
+        }
+
+        #region 璁惧鐘舵�佸埛鏂�
+        /// <summary>
+        /// 璁惧鐘舵�佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshStatus(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            RefreshMesDb();
+            RefreshPlc();
+            RefreshScanner();
+
+        }
+        /// <summary>
+        /// 鏁版嵁搴撶姸鎬佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshMesDb()
+        {
+            MesDbState(true);
         }
 
+
+        /// <summary>
+        /// plc鐘舵�佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshPlc()
+        {
+            var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("鍙戞场Plc"));
+            if (obj != null)
+            {
+                if (obj.plc.IsConnected)
+                {
+                    PlcState(true);
+                }
+                else
+                {
+                    PlcState(false);
+                }
+            }
+            else
+            {
+                PlcState(false);
+            }
+        }
+        /// <summary>
+        /// 鎵爜鍣ㄧ姸鎬佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshScanner()
+        {
+            string ip1 = Appsettings.app("Middleware", "Scanner1", "Ip");
+            bool flag1 = MvCodeHelper.ConnectionStatus(ip1);
+            Scanner1State(flag1);
+        }
+        #endregion
         #region 鏇存崲鐣岄潰
 
         public System.Windows.Controls.UserControl _content;
@@ -122,19 +196,70 @@ namespace Aucma.Core.DoorFoam.ViewModels
                     break;
             }
         }
-        #endregion 
+        #endregion
+
+        #region MES鏁版嵁搴撶姸鎬�
+        /// <summary>
+        /// MES鏁版嵁搴�-鏂囧瓧
+        /// </summary>
+        public string _mesDbUIStatusWb;
+        public string MesDbUIStatusWb
+        {
+            get => _mesDbUIStatusWb;
+            set => SetProperty(ref _mesDbUIStatusWb, value);
+        }
+        /// <summary>
+        /// MES鏁版嵁搴�-棰滆壊
+        /// </summary>
+        public string _mesDbUIColor;
+        public string MesDbUIColor
+        {
+            get => _mesDbUIColor;
+            set => SetProperty(ref _mesDbUIColor, value);
+        }
+        /// <summary>
+        /// MES鏁版嵁搴�-鍥炬爣
+        /// </summary>
+        public string _mesUIIcon;
+        public string MesUIIcon
+        {
+            get => _mesUIIcon;
+            set => SetProperty(ref _mesUIIcon, value);
+        }
+
+        /// <summary>
+        /// MES鏁版嵁搴撹繛鎺ョ姸鎬�
+        /// </summary>
+        /// <param name="type"></param>
+        public void MesDbState(bool type)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                if (type)
+                {
+                    MesDbUIStatusWb = "MES鏁版嵁搴撹繛鎺ユ垚鍔�";
+                    MesDbUIColor = "Green";
+                    MesUIIcon = "Assets/Images/Green.png";
+                }
+                else
+                {
+                    MesDbUIStatusWb = "MES鏁版嵁搴撳紓甯�";
+                    MesDbUIColor = "Red";
+                    MesUIIcon = "Assets/Images/Red.png";
+                }
+            });
+        }
+        #endregion
 
         #region plc 鐘舵��
         /// <summary>
         /// UI plc 灞曠ず鐘舵��-鏂囧瓧
         /// </summary>
-        public string _plcUIStatus;
+        public string _plcUIStatusWb;
         public string PlcUIStatusWb
         {
-            //get { return plcUIStatusWb; }
-            //set { plcUIStatusWb = value; RaisePropertyChanged("PlcUIStatusWb"); }
-            get => _plcUIStatus;
-            set => SetProperty(ref _plcUIStatus, value);
+            get => _plcUIStatusWb;
+            set => SetProperty(ref _plcUIStatusWb, value);
         }
         /// <summary>
         /// UI plc 灞曠ず鐘舵��-棰滆壊
@@ -142,8 +267,6 @@ namespace Aucma.Core.DoorFoam.ViewModels
         public string _plcUIColor;
         public string PlcUIColor
         {
-            //get { return plcUIColor; }
-            //set { plcUIColor = value; RaisePropertyChanged("PlcUIColor"); }
             get => _plcUIColor;
             set => SetProperty(ref _plcUIColor, value);
         }
@@ -153,8 +276,6 @@ namespace Aucma.Core.DoorFoam.ViewModels
         public string _plcUIIcon;
         public string PlcUIIcon
         {
-            //get { return plcUIIcon; }
-            //set { plcUIIcon = value; RaisePropertyChanged("plcUIIcon"); }
             get => _plcUIIcon;
             set => SetProperty(ref _plcUIIcon, value);
         }
@@ -165,20 +286,81 @@ namespace Aucma.Core.DoorFoam.ViewModels
         /// <param name="type"></param>
         public void PlcState(bool type)
         {
-            if (type)
+            Application.Current.Dispatcher.Invoke(() =>
             {
-                PlcUIStatusWb = "PLC杩炴帴鎴愬姛";
-                PlcUIColor = "White";
-                PlcUIIcon = "Assets/Images/姝ｅ父.png";
-            }
-            else
-            {
-                PlcUIStatusWb = "PLC鐘舵�佸紓甯�";
-                PlcUIColor = "Red";
-                PlcUIIcon = "Assets/Images/澶辫触-01.png";
-            }
+                if (type)
+                {
+                    PlcUIStatusWb = "PLC杩炴帴鎴愬姛";
+                    PlcUIColor = "Green";
+                    PlcUIIcon = "Assets/Images/Green.png";
+                }
+                else
+                {
+                    PlcUIStatusWb = "PLC鐘舵�佸紓甯�";
+                    PlcUIColor = "Red";
+                    PlcUIIcon = "Assets/Images/Red.png";
+                }
+            });
         }
         #endregion
 
+        #region 鎵爜鍣�1鐘舵��
+        /// <summary>
+        /// UI  灞曠ず鐘舵��-鏂囧瓧
+        /// </summary>
+        public string _scanner1UIStatusWb;
+        public string Scanner1UIStatusWb
+        {
+            //get { return plcUIStatusWb; }
+            //set { plcUIStatusWb = value; RaisePropertyChanged("PlcUIStatusWb"); }
+            get => _scanner1UIStatusWb;
+            set => SetProperty(ref _scanner1UIStatusWb, value);
+        }
+        /// <summary>
+        /// UI  灞曠ず鐘舵��-棰滆壊
+        /// </summary>
+        public string _scanner1UIColor;
+        public string Scanner1UIColor
+        {
+            //get { return plcUIColor; }
+            //set { plcUIColor = value; RaisePropertyChanged("PlcUIColor"); }
+            get => _scanner1UIColor;
+            set => SetProperty(ref _scanner1UIColor, value);
+        }
+        /// <summary>
+        /// UI  灞曠ず鐘舵��-鍥炬爣
+        /// </summary>
+        public string _scanner1UIIcon;
+        public string Scanner1UIIcon
+        {
+            //get { return plcUIIcon; }
+            //set { plcUIIcon = value; RaisePropertyChanged("plcUIIcon"); }
+            get => _scanner1UIIcon;
+            set => SetProperty(ref _scanner1UIIcon, value);
+        }
+
+        /// <summary>
+        /// 鎵爜鍣�1杩炴帴鐘舵��-true:杩炴帴鎴愬姛锛沠alse:澶辫触
+        /// </summary>
+        /// <param name="type"></param>
+        public void Scanner1State(bool type)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                if (type)
+                {
+                    Scanner1UIStatusWb = "鎵爜鍣�1杩炴帴鎴愬姛";
+                    Scanner1UIColor = "Green";
+                    Scanner1UIIcon = "Assets/Images/Green.png";
+                }
+                else
+                {
+                    Scanner1UIStatusWb = "鎵爜鍣�1鐘舵�佸紓甯�";
+                    Scanner1UIColor = "Red";
+                    Scanner1UIIcon = "Assets/Images/Red.png";
+                }
+            });
+        }
+        #endregion
     }
 }
diff --git a/Aucma.Core.DoorFoam/Views/MainWindow.xaml b/Aucma.Core.DoorFoam/Views/MainWindow.xaml
index c0f427f5..0581d9c2 100644
--- a/Aucma.Core.DoorFoam/Views/MainWindow.xaml
+++ b/Aucma.Core.DoorFoam/Views/MainWindow.xaml
@@ -62,10 +62,7 @@
             <DockPanel  Grid.Row="2" Margin="5 0 5 3">
                 <Border  BorderBrush="#0288d1"   BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch"  VerticalAlignment="Bottom">
                     <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
+                       
                         <StackPanel  Grid.Row="1" Height="50" Orientation="Horizontal"  Margin="5 0" HorizontalAlignment="Left">
                             <Button Content="瀹炴椂鐩戞帶" x:Name="FirstPage"  Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}"  Margin="5 0" />
                             <Button Content="鍙戞场璁板綍" x:Name="RecordPage" Margin="5 0" Command="{Binding SwitchPagesCommand}"  CommandParameter="{Binding Name,ElementName=RecordPage}" />
@@ -73,26 +70,27 @@
                             <Button Content="鏈�灏忓寲" x:Name="Minimized" Margin="5 0" Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Minimized}"   Width="100"  Background="#FF9900" BorderBrush="#FF9900" />
                             <Button Content="閫�    鍑�" x:Name="Exit" Margin="5 0" Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Exit}"  Width="100"  Background="#FF0033" BorderBrush="#FF0033" />
                         </StackPanel>
-                        <StackPanel  Grid.Row="2" Height="50" Orientation="Horizontal"   HorizontalAlignment="Right"  Margin="0 0 5 0">
-                            <TextBlock x:Name="PLCState" Text="PLC" VerticalAlignment="Center" Foreground="white" FontSize="15" Margin="10,0"/>
+                        <StackPanel   Height="50" Orientation="Horizontal"   HorizontalAlignment="Right">
                             <Border Width="30" Height="30" CornerRadius="15">
                                 <Border.Background>
-                                    <ImageBrush x:Name="PlcStatus" ImageSource="/Assets/Images/Green.png"/>
+                                    <ImageBrush x:Name="MesDbStatus" ImageSource="{Binding MesUIIcon}"/>
                                 </Border.Background>
                             </Border>
-                            <TextBlock x:Name="DB" Text="鏁版嵁搴�" VerticalAlignment="Center" Foreground="white" FontSize="15" Margin="10,0"/>
+                            <TextBlock x:Name="MesDbStateTxt" Text="{Binding MesDbUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding MesDbUIColor}"  FontSize="15" Margin="10,0"/>
                             <Border Width="30" Height="30" CornerRadius="15">
                                 <Border.Background>
-                                    <ImageBrush x:Name="PlcStatusImage" ImageSource="/Assets/Images/Green.png"/>
+                                    <ImageBrush x:Name="PlcStatus" ImageSource="{Binding PlcUIIcon}"/>
                                 </Border.Background>
                             </Border>
-                            <TextBlock x:Name="BarCodeStatusTxt" Text="鎵弿鍣�" VerticalAlignment="Center" Foreground="white" FontSize="15" Margin="10,0"/>
+                            <TextBlock x:Name="PLCState" Text="{Binding PlcUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding PlcUIColor}"  FontSize="15" Margin="10,0"/>
                             <Border Width="30" Height="30" CornerRadius="15">
                                 <Border.Background>
-                                    <ImageBrush x:Name="BarCodeStatus" ImageSource="/Assets/Images/Green.png"/>
+                                    <ImageBrush x:Name="Scanner1Status" ImageSource="{Binding Scanner1UIIcon}"/>
                                 </Border.Background>
                             </Border>
-                       </StackPanel>
+                            <TextBlock x:Name="Scanner1" Text="{Binding Scanner1UIStatusWb}" VerticalAlignment="Center" Foreground="{Binding Scanner1UIColor}" FontSize="15" Margin="10,0"/>
+
+                        </StackPanel>
                     </Grid>
                 </Border>
 
diff --git a/Aucma.Core.DoorFoam/appsettings.json b/Aucma.Core.DoorFoam/appsettings.json
index cbe8c1ec..a7e5997d 100644
--- a/Aucma.Core.DoorFoam/appsettings.json
+++ b/Aucma.Core.DoorFoam/appsettings.json
@@ -175,11 +175,35 @@
     "SubscriptionClientName": "Admin.Core"
   },
   "Middleware": {
+    "Plc": {
+      "Enabled": true
+    },
     "QuartzNetJob": {
       "Enabled": true
-
+    },
+    "Scanner": { //鎵爜鍣�
+      "Enabled": true
+    },
+    "Scanner1": { //鎵爜鍣�1
+      "Ip": "192.168.1.19",
+      "Name": "鎵爜鍣�1"
+    },
+    "Scanner2": { //鎵爜鍣�2
+      "Ip": "192.168.1.20",
+      "Name": "鎵爜鍣�2"
+    },
+    "ScannerGun": { //鎵爜鏋�
+      "Enabled": false
     }
   },
+  "PLCServer": [
+    {
+      "Id": 1,
+      "EquipName": "鍙戞场Plc",
+      "IP": "127.0.0.1",
+      "Port": 6000
+    }
+  ],
   "IpRateLimiting": {
     "EnableEndpointRateLimiting": false, //False: globally executed, true: executed for each
     "StackBlockedRequests": false, //False: Number of rejections should be recorded on another counter
diff --git a/Aucma.Core.Palletiz/Startup.cs b/Aucma.Core.Palletiz/Startup.cs
index 25da0f22..757e6666 100644
--- a/Aucma.Core.Palletiz/Startup.cs
+++ b/Aucma.Core.Palletiz/Startup.cs
@@ -7,6 +7,7 @@ using Admin.Core.Model;
 using Admin.Core.Repository;
 using Admin.Core.Service;
 using Admin.Core.Tasks;
+using Aucma.Core.RunPlc;
 using Aucma.Core.Scanner;
 using Autofac;
 using Microsoft.AspNetCore.Builder;
@@ -65,6 +66,8 @@ namespace Aucma.Core.Palletiz
             services.AddJobSetup();
             //扫码器
             services.AddScannerSetup();
+            //PLC
+            services.AddPlcSetup();
             //支持编码大全 例如:支持 System.Text.Encoding.GetEncoding("GB2312")  System.Text.Encoding.GetEncoding("GB18030") 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
         }
@@ -86,7 +89,7 @@ namespace Aucma.Core.Palletiz
         /// <param name="app"></param>
         /// <param name="env"></param>
         public void Configure(IApplicationBuilder app, ISysTasksQzService tasksQzService,
-            ISchedulerCenter schedulerCenter, IScannerService scannerService)
+            ISchedulerCenter schedulerCenter, IScannerService scannerService, IRunPlcService runPlcService)
         {
             // 使用静态文件
             app.UseStaticFiles();
@@ -97,6 +100,8 @@ namespace Aucma.Core.Palletiz
             app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
             //开启扫码服务
             app.UseScannerMildd(scannerService);
+            //PLC
+            app.UsePlcMildd(runPlcService);
         }
 
         #region 注册服务
diff --git a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs
index 28e5b5d5..1b73fede 100644
--- a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs
@@ -7,6 +7,10 @@ using log4net;
 using System.Diagnostics;
 using System.Threading;
 using NPOI.HSSF.Record;
+using Admin.Core.Common;
+using Aucma.Core.PLc;
+using Aucma.Core.Scanner;
+using System.Linq;
 
 namespace Aucma.Core.Palletiz.ViewModels
 {
@@ -19,8 +23,79 @@ namespace Aucma.Core.Palletiz.ViewModels
         public MainWindowViewModel()
         {
             UserContent = firstPage;
+            init();
         }
 
+        public void init()
+        {
+            // 璁惧鐘舵�佸埛鏂板畾鏃跺櫒
+            System.Timers.Timer timer = new System.Timers.Timer(1000 * 5);
+            timer.Elapsed += new System.Timers.ElapsedEventHandler(RefreshStatus);
+            timer.AutoReset = true;
+            timer.Enabled = true;
+            timer.Start();
+        }
+
+        #region 璁惧鐘舵�佸埛鏂�
+        /// <summary>
+        /// 璁惧鐘舵�佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshStatus(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            RefreshMesDb();
+            RefreshPlc();
+            RefreshScanner();
+
+        }
+        /// <summary>
+        /// 鏁版嵁搴撶姸鎬佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshMesDb()
+        {
+            MesDbState(true);
+        }
+
+
+        /// <summary>
+        /// plc鐘舵�佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshPlc()
+        {
+            var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("鍒嗗灈搴揚lc"));
+            if (obj != null)
+            {
+                if (obj.plc.IsConnected)
+                {
+                    PlcState(true);
+                }
+                else
+                {
+                    PlcState(false);
+                }
+            }
+            else
+            {
+                PlcState(false);
+            }
+        }
+        /// <summary>
+        /// 鎵爜鍣ㄧ姸鎬佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshScanner()
+        {
+            string ip1 = Appsettings.app("Middleware", "Scanner1", "Ip");
+            bool flag1 = MvCodeHelper.ConnectionStatus(ip1);
+            Scanner1State(flag1);
+        }
+        #endregion
         #region 鏇存崲鐣岄潰
 
         public System.Windows.Controls.UserControl _content;
@@ -125,19 +200,70 @@ namespace Aucma.Core.Palletiz.ViewModels
                     break;
             }
         }
-        #endregion 
+        #endregion
+
+        #region MES鏁版嵁搴撶姸鎬�
+        /// <summary>
+        /// MES鏁版嵁搴�-鏂囧瓧
+        /// </summary>
+        public string _mesDbUIStatusWb;
+        public string MesDbUIStatusWb
+        {
+            get => _mesDbUIStatusWb;
+            set => SetProperty(ref _mesDbUIStatusWb, value);
+        }
+        /// <summary>
+        /// MES鏁版嵁搴�-棰滆壊
+        /// </summary>
+        public string _mesDbUIColor;
+        public string MesDbUIColor
+        {
+            get => _mesDbUIColor;
+            set => SetProperty(ref _mesDbUIColor, value);
+        }
+        /// <summary>
+        /// MES鏁版嵁搴�-鍥炬爣
+        /// </summary>
+        public string _mesUIIcon;
+        public string MesUIIcon
+        {
+            get => _mesUIIcon;
+            set => SetProperty(ref _mesUIIcon, value);
+        }
+
+        /// <summary>
+        /// MES鏁版嵁搴撹繛鎺ョ姸鎬�
+        /// </summary>
+        /// <param name="type"></param>
+        public void MesDbState(bool type)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                if (type)
+                {
+                    MesDbUIStatusWb = "MES鏁版嵁搴撹繛鎺ユ垚鍔�";
+                    MesDbUIColor = "Green";
+                    MesUIIcon = "Assets/Images/Green.png";
+                }
+                else
+                {
+                    MesDbUIStatusWb = "MES鏁版嵁搴撳紓甯�";
+                    MesDbUIColor = "Red";
+                    MesUIIcon = "Assets/Images/Red.png";
+                }
+            });
+        }
+        #endregion
 
         #region plc 鐘舵��
         /// <summary>
         /// UI plc 灞曠ず鐘舵��-鏂囧瓧
         /// </summary>
-        public string _plcUIStatus;
+        public string _plcUIStatusWb;
         public string PlcUIStatusWb
         {
-            //get { return plcUIStatusWb; }
-            //set { plcUIStatusWb = value; RaisePropertyChanged("PlcUIStatusWb"); }
-            get => _plcUIStatus;
-            set => SetProperty(ref _plcUIStatus, value);
+            get => _plcUIStatusWb;
+            set => SetProperty(ref _plcUIStatusWb, value);
         }
         /// <summary>
         /// UI plc 灞曠ず鐘舵��-棰滆壊
@@ -145,8 +271,6 @@ namespace Aucma.Core.Palletiz.ViewModels
         public string _plcUIColor;
         public string PlcUIColor
         {
-            //get { return plcUIColor; }
-            //set { plcUIColor = value; RaisePropertyChanged("PlcUIColor"); }
             get => _plcUIColor;
             set => SetProperty(ref _plcUIColor, value);
         }
@@ -156,8 +280,6 @@ namespace Aucma.Core.Palletiz.ViewModels
         public string _plcUIIcon;
         public string PlcUIIcon
         {
-            //get { return plcUIIcon; }
-            //set { plcUIIcon = value; RaisePropertyChanged("plcUIIcon"); }
             get => _plcUIIcon;
             set => SetProperty(ref _plcUIIcon, value);
         }
@@ -168,18 +290,80 @@ namespace Aucma.Core.Palletiz.ViewModels
         /// <param name="type"></param>
         public void PlcState(bool type)
         {
-            if (type)
+            Application.Current.Dispatcher.Invoke(() =>
             {
-                PlcUIStatusWb = "PLC杩炴帴鎴愬姛";
-                PlcUIColor = "White";
-                PlcUIIcon = "Assets/Images/姝ｅ父.png";
-            }
-            else
+                if (type)
+                {
+                    PlcUIStatusWb = "PLC杩炴帴鎴愬姛";
+                    PlcUIColor = "Green";
+                    PlcUIIcon = "Assets/Images/Green.png";
+                }
+                else
+                {
+                    PlcUIStatusWb = "PLC鐘舵�佸紓甯�";
+                    PlcUIColor = "Red";
+                    PlcUIIcon = "Assets/Images/Red.png";
+                }
+            });
+        }
+        #endregion
+
+        #region 鎵爜鍣�1鐘舵��
+        /// <summary>
+        /// UI  灞曠ず鐘舵��-鏂囧瓧
+        /// </summary>
+        public string _scanner1UIStatusWb;
+        public string Scanner1UIStatusWb
+        {
+            //get { return plcUIStatusWb; }
+            //set { plcUIStatusWb = value; RaisePropertyChanged("PlcUIStatusWb"); }
+            get => _scanner1UIStatusWb;
+            set => SetProperty(ref _scanner1UIStatusWb, value);
+        }
+        /// <summary>
+        /// UI  灞曠ず鐘舵��-棰滆壊
+        /// </summary>
+        public string _scanner1UIColor;
+        public string Scanner1UIColor
+        {
+            //get { return plcUIColor; }
+            //set { plcUIColor = value; RaisePropertyChanged("PlcUIColor"); }
+            get => _scanner1UIColor;
+            set => SetProperty(ref _scanner1UIColor, value);
+        }
+        /// <summary>
+        /// UI  灞曠ず鐘舵��-鍥炬爣
+        /// </summary>
+        public string _scanner1UIIcon;
+        public string Scanner1UIIcon
+        {
+            //get { return plcUIIcon; }
+            //set { plcUIIcon = value; RaisePropertyChanged("plcUIIcon"); }
+            get => _scanner1UIIcon;
+            set => SetProperty(ref _scanner1UIIcon, value);
+        }
+
+        /// <summary>
+        /// 鎵爜鍣�1杩炴帴鐘舵��-true:杩炴帴鎴愬姛锛沠alse:澶辫触
+        /// </summary>
+        /// <param name="type"></param>
+        public void Scanner1State(bool type)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
             {
-                PlcUIStatusWb = "PLC鐘舵�佸紓甯�";
-                PlcUIColor = "Red";
-                PlcUIIcon = "Assets/Images/澶辫触-01.png";
-            }
+                if (type)
+                {
+                    Scanner1UIStatusWb = "鎵爜鍣�1杩炴帴鎴愬姛";
+                    Scanner1UIColor = "Green";
+                    Scanner1UIIcon = "Assets/Images/Green.png";
+                }
+                else
+                {
+                    Scanner1UIStatusWb = "鎵爜鍣�1鐘舵�佸紓甯�";
+                    Scanner1UIColor = "Red";
+                    Scanner1UIIcon = "Assets/Images/Red.png";
+                }
+            });
         }
         #endregion
 
diff --git a/Aucma.Core.Palletiz/Views/MainWindow.xaml b/Aucma.Core.Palletiz/Views/MainWindow.xaml
index 7bbdd0ca..11330809 100644
--- a/Aucma.Core.Palletiz/Views/MainWindow.xaml
+++ b/Aucma.Core.Palletiz/Views/MainWindow.xaml
@@ -8,7 +8,7 @@
         d:DesignHeight="800"
         d:DesignWidth="1000"  FontFamily="Microsoft YaHei"
          MinHeight="1080" MinWidth="1920" WindowState="Maximized" 
-        WindowStartupLocation="CenterScreen"  WindowStyle="ToolWindow"
+        WindowStartupLocation="CenterScreen"  WindowStyle="None"
        >
     <Window.Background>
         <ImageBrush ImageSource="/Assets/images/background.jpg" />
@@ -58,10 +58,7 @@
             <DockPanel  Grid.Row="2" Margin="5 0 5 3">
                 <Border  BorderBrush="#0288d1"   BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch"  VerticalAlignment="Bottom">
                     <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
+                       
                         <StackPanel  Grid.Row="1" Height="50" Orientation="Horizontal"  Margin="5 0" HorizontalAlignment="Left">
                             <Button Content="瀹炴椂鐩戞帶" x:Name="FirstPage"  Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}"  Margin="5 0" />
                             <Button Content="鎵弿璁板綍" x:Name="RecordPage" Margin="5 0" Command="{Binding SwitchPagesCommand}"  CommandParameter="{Binding Name,ElementName=RecordPage}" />
@@ -70,27 +67,26 @@
                             <Button Content="鏈�灏忓寲" x:Name="Minimized"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Minimized}"   Width="100"  Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0"/>
                             <Button Content="閫�    鍑�" x:Name="Exit"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Exit}"  Width="100" Background="#FF0033" BorderBrush="#FF0033" Margin="0,0,10,0"/>
                         </StackPanel>
-                        <StackPanel  Grid.Row="2" Height="50" Orientation="Horizontal"   HorizontalAlignment="Right" Margin="0 0 5 0">
-                            <TextBlock x:Name="PLCState" Text="PLC" VerticalAlignment="Center" Foreground="white" FontSize="15" Margin="10,0"/>
-
+                        <StackPanel   Height="50" Orientation="Horizontal"   HorizontalAlignment="Right">
                             <Border Width="30" Height="30" CornerRadius="15">
                                 <Border.Background>
-                                    <ImageBrush x:Name="PlcStatus" ImageSource="/Assets/Images/Green.png"/>
+                                    <ImageBrush x:Name="MesDbStatus" ImageSource="{Binding MesUIIcon}"/>
                                 </Border.Background>
                             </Border>
-                            <TextBlock x:Name="DB" Text="鏁版嵁搴�" VerticalAlignment="Center" Foreground="white" FontSize="15" Margin="10,0"/>
+                            <TextBlock x:Name="MesDbStateTxt" Text="{Binding MesDbUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding MesDbUIColor}"  FontSize="15" Margin="10,0"/>
                             <Border Width="30" Height="30" CornerRadius="15">
                                 <Border.Background>
-                                    <ImageBrush x:Name="PlcStatusImage" ImageSource="/Assets/Images/Green.png"/>
+                                    <ImageBrush x:Name="PlcStatus" ImageSource="{Binding PlcUIIcon}"/>
                                 </Border.Background>
                             </Border>
-                            <TextBlock x:Name="BarCodeStatusTxt" Text="鎵弿鍣�" VerticalAlignment="Center" Foreground="white" FontSize="15" Margin="10,0"/>
-
+                            <TextBlock x:Name="PLCState" Text="{Binding PlcUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding PlcUIColor}"  FontSize="15" Margin="10,0"/>
                             <Border Width="30" Height="30" CornerRadius="15">
                                 <Border.Background>
-                                    <ImageBrush x:Name="BarCodeStatus" ImageSource="/Assets/Images/Green.png"/>
+                                    <ImageBrush x:Name="Scanner1Status" ImageSource="{Binding Scanner1UIIcon}"/>
                                 </Border.Background>
                             </Border>
+                            <TextBlock x:Name="Scanner1" Text="{Binding Scanner1UIStatusWb}" VerticalAlignment="Center" Foreground="{Binding Scanner1UIColor}" FontSize="15" Margin="10,0"/>
+
                         </StackPanel>
                     </Grid>
                 </Border>
diff --git a/Aucma.Core.Palletiz/appsettings.json b/Aucma.Core.Palletiz/appsettings.json
index 3deec128..bbe0ba58 100644
--- a/Aucma.Core.Palletiz/appsettings.json
+++ b/Aucma.Core.Palletiz/appsettings.json
@@ -164,16 +164,25 @@
     "SubscriptionClientName": "Admin.Core"
   },
   "Middleware": {
+    "Plc": {
+      "Enabled": true
+    },
     "QuartzNetJob": {
       "Enabled": true
     },
     "Scanner": { //鎵爜鍣�
       "Enabled": true
     },
-    "Melsec": {
-      "ConString": "10.10.92.30",
-      "Port": 6000,
-      "Enabled": true
+    "Scanner1": { //鎵爜鍣�1
+      "Ip": "192.168.1.19",
+      "Name": "鎵爜鍣�1"
+    },
+    "Scanner2": { //鎵爜鍣�2
+      "Ip": "192.168.1.20",
+      "Name": "鎵爜鍣�2"
+    },
+    "ScannerGun": { //鎵爜鏋�
+      "Enabled": false
     }
   },
   "PLCServer": [
diff --git a/Aucma.Core.ProductOffLine/ViewModels/MainWindowViewModel.cs b/Aucma.Core.ProductOffLine/ViewModels/MainWindowViewModel.cs
index 3ac5118e..2c232ca4 100644
--- a/Aucma.Core.ProductOffLine/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.ProductOffLine/ViewModels/MainWindowViewModel.cs
@@ -68,7 +68,7 @@ namespace Aucma.Core.ProductOffLine.ViewModels
         /// <param name="e"></param>
         public void RefreshMesDb()
         {
-
+            MesDbState(true);
         }
 
 

From 0bb356e1b8f3e65e73725f4f9df413b44d5174de Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Mon, 11 Dec 2023 10:52:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?change=20-=20=E9=92=A3=E9=87=91plc=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/MainWindowViewModel.cs         |   2 +-
 .../ViewModels/MainWindowViewModel.cs         |   3 +-
 .../ViewModels/MainWindowViewModel.cs         | 231 ++++++++++++++++--
 Aucma.Core.SheetMetal/Views/MainWindow.xaml   |  21 +-
 4 files changed, 219 insertions(+), 38 deletions(-)

diff --git a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
index c46e4f88..191e4513 100644
--- a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
@@ -23,7 +23,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
         private FoamPlanPageView foamPlanPageView = new FoamPlanPageView();
         FoamMonitorPageView foamMonitorPageView = new FoamMonitorPageView();
         FoamMachinesPageView foamMachinesPageView = new FoamMachinesPageView();
-         
+          
         public MainWindowViewModel()
         {
             UserContent = firstPage;
diff --git a/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs
index 64c6c938..fc5dbf13 100644
--- a/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs
@@ -195,14 +195,13 @@ namespace Aucma.Core.CodeBinding.ViewModels
         /// </summary>
         public static void OpenOsk()
         {
-            Process proc = new Process();
+            Process proc = new Process();      
             proc.StartInfo.FileName = @"C:\Windows\System32\osk.exe";
             proc.StartInfo.UseShellExecute = true;
             proc.StartInfo.Verb = "runas";
             proc.Start();
         }
         #endregion
-
         #region 鐣岄潰鍒囨崲
         /// <summary>
         /// 鐣岄潰鍒囨崲
diff --git a/Aucma.Core.SheetMetal/ViewModels/MainWindowViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/MainWindowViewModel.cs
index 5353f367..04719c97 100644
--- a/Aucma.Core.SheetMetal/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.SheetMetal/ViewModels/MainWindowViewModel.cs
@@ -10,6 +10,9 @@ using System.Windows.Interop;
 using System.Collections.ObjectModel;
 using Admin.Core.Common;
 using System.IO;
+using Aucma.Core.PLc;
+using Aucma.Core.Scanner;
+using System.Linq;
 
 namespace Aucma.Core.SheetMetal.ViewModels
 {
@@ -19,12 +22,91 @@ namespace Aucma.Core.SheetMetal.ViewModels
         private IndexPageView firstPage = new IndexPageView();//棣栭〉
         private LogPageView logPage = new LogPageView();//鏃ュ織
         private StatisticsPageView statisticsPage = new StatisticsPageView();//缁熻
-        
+         
         public MainWindowViewModel()
         {
             UserContent = firstPage;
+            init();
         }
+        public void init()
+        {
+            // 璁惧鐘舵�佸埛鏂板畾鏃跺櫒
+            System.Timers.Timer timer = new System.Timers.Timer(1000 * 5);
+            timer.Elapsed += new System.Timers.ElapsedEventHandler(RefreshStatus);
+            timer.AutoReset = true;
+            timer.Enabled = true;
+            timer.Start();
+        }
+
+        #region 璁惧鐘舵�佸埛鏂�
+        /// <summary>
+        /// 璁惧鐘舵�佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshStatus(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            RefreshMesDb();
+            RefreshPlc();
+           
+
+        }
+        /// <summary>
+        /// 鏁版嵁搴撶姸鎬佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshMesDb()
+        {
+            MesDbState(true);
+        }
+
+
+        /// <summary>
+        /// plc鐘舵�佸埛鏂�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshPlc()
+        {
+            // 鍚庢澘plc
+            var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("鍚庢澘Plc"));
+            if (obj != null)
+            {
+                if (obj.plc.IsConnected)
+                {
+                    PlcState(true);
+                }
+                else
+                {
+                    PlcState(false);
+                }
+            }
+            else
+            {
+                PlcState(false);
+            }
+            // u澹硃lc
+            var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("U澹砅LC"));
+            if (obj2 != null)
+            {
+                if (obj2.plc.IsConnected)
+                {
+                    Plc2State(true);
+                }
+                else
+                {
+                    Plc2State(false);
+                }
+            }
+            else
+            {
+                Plc2State(false);
+            }
 
+        }
+      
+        #endregion
         #region 鏇存崲鐣岄潰
 
         public System.Windows.Controls.UserControl _content;
@@ -130,19 +212,69 @@ namespace Aucma.Core.SheetMetal.ViewModels
                     break;
             }
         }
-        #endregion 
+        #endregion
+        #region MES鏁版嵁搴撶姸鎬�
+        /// <summary>
+        /// MES鏁版嵁搴�-鏂囧瓧
+        /// </summary>
+        public string _mesDbUIStatusWb;
+        public string MesDbUIStatusWb
+        {
+            get => _mesDbUIStatusWb;
+            set => SetProperty(ref _mesDbUIStatusWb, value);
+        }
+        /// <summary>
+        /// MES鏁版嵁搴�-棰滆壊
+        /// </summary>
+        public string _mesDbUIColor;
+        public string MesDbUIColor
+        {
+            get => _mesDbUIColor;
+            set => SetProperty(ref _mesDbUIColor, value);
+        }
+        /// <summary>
+        /// MES鏁版嵁搴�-鍥炬爣
+        /// </summary>
+        public string _mesUIIcon;
+        public string MesUIIcon
+        {
+            get => _mesUIIcon;
+            set => SetProperty(ref _mesUIIcon, value);
+        }
 
-        #region plc 鐘舵��
+        /// <summary>
+        /// MES鏁版嵁搴撹繛鎺ョ姸鎬�
+        /// </summary>
+        /// <param name="type"></param>
+        public void MesDbState(bool type)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                if (type)
+                {
+                    MesDbUIStatusWb = "MES鏁版嵁搴撹繛鎺ユ垚鍔�";
+                    MesDbUIColor = "Green";
+                    MesUIIcon = "Assets/Images/Green.png";
+                }
+                else
+                {
+                    MesDbUIStatusWb = "MES鏁版嵁搴撳紓甯�";
+                    MesDbUIColor = "Red";
+                    MesUIIcon = "Assets/Images/Red.png";
+                }
+            });
+        }
+        #endregion
+
+        #region 鍚庢澘plc 鐘舵��
         /// <summary>
         /// UI plc 灞曠ず鐘舵��-鏂囧瓧
         /// </summary>
-        public string _plcUIStatus;
+        public string _plcUIStatusWb;
         public string PlcUIStatusWb
         {
-            //get { return plcUIStatusWb; }
-            //set { plcUIStatusWb = value; RaisePropertyChanged("PlcUIStatusWb"); }
-            get => _plcUIStatus;
-            set => SetProperty(ref _plcUIStatus, value);
+            get => _plcUIStatusWb;
+            set => SetProperty(ref _plcUIStatusWb, value);
         }
         /// <summary>
         /// UI plc 灞曠ず鐘舵��-棰滆壊
@@ -150,8 +282,6 @@ namespace Aucma.Core.SheetMetal.ViewModels
         public string _plcUIColor;
         public string PlcUIColor
         {
-            //get { return plcUIColor; }
-            //set { plcUIColor = value; RaisePropertyChanged("PlcUIColor"); }
             get => _plcUIColor;
             set => SetProperty(ref _plcUIColor, value);
         }
@@ -161,30 +291,85 @@ namespace Aucma.Core.SheetMetal.ViewModels
         public string _plcUIIcon;
         public string PlcUIIcon
         {
-            //get { return plcUIIcon; }
-            //set { plcUIIcon = value; RaisePropertyChanged("plcUIIcon"); }
             get => _plcUIIcon;
             set => SetProperty(ref _plcUIIcon, value);
         }
 
         /// <summary>
-        /// PLC杩炴帴鐘舵��-true:杩炴帴鎴愬姛锛沠alse:澶辫触
+        /// 鍚庢澘PLC杩炴帴鐘舵��-true:杩炴帴鎴愬姛锛沠alse:澶辫触
         /// </summary>
         /// <param name="type"></param>
         public void PlcState(bool type)
         {
-            if (type)
+            Application.Current.Dispatcher.Invoke(() =>
             {
-                PlcUIStatusWb = "PLC杩炴帴鎴愬姛";
-                PlcUIColor = "White";
-                PlcUIIcon = "Assets/Images/姝ｅ父.png";
-            }
-            else
+                if (type)
+                {
+                    PlcUIStatusWb = "鍚庢澘PLC杩炴帴鎴愬姛";
+                    PlcUIColor = "Green";
+                    PlcUIIcon = "Assets/Images/Green.png";
+                }
+                else
+                {
+                    PlcUIStatusWb = "鍚庢澘PLC鐘舵�佸紓甯�";
+                    PlcUIColor = "Red";
+                    PlcUIIcon = "Assets/Images/Red.png";
+                }
+            });
+        }
+        #endregion
+
+
+        #region U澹砅LC鐘舵��
+        /// <summary>
+        /// UI plc 灞曠ず鐘舵��-鏂囧瓧
+        /// </summary>
+        public string _plc2UIStatusWb;
+        public string Plc2UIStatusWb
+        {
+            get => _plc2UIStatusWb;
+            set => SetProperty(ref _plc2UIStatusWb, value);
+        }
+        /// <summary>
+        /// UI plc 灞曠ず鐘舵��-棰滆壊
+        /// </summary>
+        public string _plc2UIColor;
+        public string Plc2UIColor
+        {
+            get => _plc2UIColor;
+            set => SetProperty(ref _plc2UIColor, value);
+        }
+        /// <summary>
+        /// UI plc 灞曠ず鐘舵��-鍥炬爣
+        /// </summary>
+        public string _plc2UIIcon;
+        public string Plc2UIIcon
+        {
+            get => _plc2UIIcon;
+            set => SetProperty(ref _plc2UIIcon, value);
+        }
+
+        /// <summary>
+        /// PLC杩炴帴鐘舵��-true:杩炴帴鎴愬姛锛沠alse:澶辫触
+        /// </summary>
+        /// <param name="type"></param>
+        public void Plc2State(bool type)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
             {
-                PlcUIStatusWb = "PLC鐘舵�佸紓甯�";
-                PlcUIColor = "Red";
-                PlcUIIcon = "Assets/Images/澶辫触-01.png";
-            }
+                if (type)
+                {
+                    Plc2UIStatusWb = "U澹砅LC杩炴帴鎴愬姛";
+                    Plc2UIColor = "Green";
+                    Plc2UIIcon = "Assets/Images/Green.png";
+                }
+                else
+                {
+                    Plc2UIStatusWb = "U澹砅LC鐘舵�佸紓甯�";
+                    Plc2UIColor = "Red";
+                    Plc2UIIcon = "Assets/Images/Red.png";
+                }
+            });
         }
         #endregion
     }
diff --git a/Aucma.Core.SheetMetal/Views/MainWindow.xaml b/Aucma.Core.SheetMetal/Views/MainWindow.xaml
index 54875b0e..161341a9 100644
--- a/Aucma.Core.SheetMetal/Views/MainWindow.xaml
+++ b/Aucma.Core.SheetMetal/Views/MainWindow.xaml
@@ -60,10 +60,7 @@
             <DockPanel  Grid.Row="2" Margin="5 0 0 3">
                 <Border  BorderBrush="#0288d1"   BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch"  VerticalAlignment="Bottom">
                     <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="2*" />
-                        </Grid.RowDefinitions>
+                       
                         <StackPanel  Grid.Row="1" Height="60" Orientation="Horizontal"  Margin="5 0" HorizontalAlignment="Left">
                             <Button Content="鐢熶骇璁″垝" x:Name="FirstPage" FontSize="20" Height="40" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}"  />
                             <Button Content="璁惧鐩戞帶" x:Name="LogPage" FontSize="20" Height="40" Margin="5 0" Command="{Binding SwitchPagesCommand}"  CommandParameter="{Binding Name,ElementName=LogPage}" />
@@ -72,25 +69,25 @@
                             <Button Content="鏈�灏忓寲"   x:Name="Minimized" FontSize="20"  Height="40" Margin="5 0"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Minimized}"   Background="#FF9900" BorderBrush="#FF9900" />
                             <Button Content="閫�    鍑�" x:Name="Exit" FontSize="20"   Height="40" Margin="5 0" Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Exit}"  Background="#df4642" BorderBrush="#df4642" />
                         </StackPanel>
-                        <StackPanel  Grid.Row="2" Height="50" Margin="5 0" Orientation="Horizontal"   HorizontalAlignment="Right">
-                            <TextBlock x:Name="BeforPLcState" Text="绠卞３PLC" VerticalAlignment="Center" Foreground="white" FontSize="20" Margin="10,0"/>
+                        <StackPanel   Height="50" Orientation="Horizontal"   HorizontalAlignment="Right">
                             <Border Width="30" Height="30" CornerRadius="15">
                                 <Border.Background>
-                                    <ImageBrush x:Name="BeforPLcStateColor" ImageSource="/Assets/Images/Green.png"/>
+                                    <ImageBrush x:Name="MesDbStatus" ImageSource="{Binding MesUIIcon}"/>
                                 </Border.Background>
                             </Border>
-                            <TextBlock x:Name="AfterPlcState" Text="鍚庢澘PLC" VerticalAlignment="Center" Foreground="white" FontSize="20" Margin="10,0"/>
+                            <TextBlock x:Name="MesDbStateTxt" Text="{Binding MesDbUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding MesDbUIColor}"  FontSize="15" Margin="10,0"/>
                             <Border Width="30" Height="30" CornerRadius="15">
                                 <Border.Background>
-                                    <ImageBrush x:Name="AfterPlcStateColor" ImageSource="/Assets/Images/Green.png"/>
+                                    <ImageBrush x:Name="PlcStatus" ImageSource="{Binding PlcUIIcon}"/>
                                 </Border.Background>
                             </Border>
-                            <TextBlock x:Name="DB" Text="鏁版嵁搴�" VerticalAlignment="Center" Foreground="white" FontSize="20" Margin="10,0"/>
-                            <Border Width="30" Height="30" CornerRadius="15" >
+                            <TextBlock x:Name="PLCState" Text="{Binding PlcUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding PlcUIColor}"  FontSize="15" Margin="10,0"/>
+                            <Border Width="30" Height="30" CornerRadius="15">
                                 <Border.Background>
-                                    <ImageBrush x:Name="PlcStatusImage" ImageSource="/Assets/Images/Green.png"/>
+                                    <ImageBrush x:Name="Plc2Status" ImageSource="{Binding Plc2UIIcon}"/>
                                 </Border.Background>
                             </Border>
+                            <TextBlock x:Name="PLC2State" Text="{Binding Plc2UIStatusWb}" VerticalAlignment="Center" Foreground="{Binding Plc2UIColor}"  FontSize="15" Margin="10,0"/>
                         </StackPanel>
                     </Grid>
                 </Border>