Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

MainWindow.xaml

@@ -44,7 +44,7 @@
                 <TextBlock Text="{Binding Sys_Time}" VerticalAlignment="Center" FontSize="14" Foreground="White"/>
                 <materialDesign:PopupBox Foreground="White" Margin="10" PlacementMode="BottomAndAlignRightEdges" StaysOpen="False">
                     <StackPanel Width="150">
-                        <Button Content="账号"/>
+                        <Button Content="{x:Static lang:Resources.USER}"/>
                         <Button Content="{x:Static lang:Resources.SysSet}" Click="ButtonSYS_Click"/>
                         <Button Content="{x:Static lang:Resources.Help}" Click="Buttonhelp_Click"/>
                         <Separator/>
@@ -76,37 +76,37 @@
                     <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="ViewDashboard" Width="25" Height="25" Margin="10" VerticalAlignment="Center" />
-                            <TextBlock Text="监控" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                            <TextBlock Text="{x:Static lang:Resources.Monitor}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
                     <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="ClipboardTextClock" Width="25" Height="25" Margin="10" VerticalAlignment="Center" />
-                            <TextBlock Text="排程" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                            <TextBlock Text="{x:Static lang:Resources.ProductionPlanning}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
                     <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="ShowChart" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
-                            <TextBlock Text="曲线" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                            <TextBlock Text="{x:Static lang:Resources.Curve}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
                     <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Settings" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
-                            <TextBlock Text="染机" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                            <TextBlock Text="{x:Static lang:Resources.Machine}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
                     <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Database" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
-                            <TextBlock Text="程序组" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                            <TextBlock Text="{x:Static lang:Resources.Programgroup}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
                     <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="PipeLeak" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
-                            <TextBlock Text="输送中心" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                            <TextBlock Text="{x:Static lang:Resources.ConveyorCenters}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
                 </ListView>

Properties/Resources.Designer.cs

@@ -402,6 +402,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 ConveyorCenters 的本地化字符串。
+        /// </summary>
+        public static string ConveyorCenters {
+            get {
+                return ResourceManager.GetString("ConveyorCenters", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Cooling 的本地化字符串。
         /// </summary>
@@ -1059,6 +1068,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Machine 的本地化字符串。
+        /// </summary>
+        public static string Machine {
+            get {
+                return ResourceManager.GetString("Machine", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 MachineGroup 的本地化字符串。
+        /// </summary>
+        public static string MachineGroup {
+            get {
+                return ResourceManager.GetString("MachineGroup", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Malfunction 的本地化字符串。
         /// </summary>
@@ -1212,6 +1239,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Monitor 的本地化字符串。
+        /// </summary>
+        public static string Monitor {
+            get {
+                return ResourceManager.GetString("Monitor", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 New 的本地化字符串。
         /// </summary>
@@ -1599,6 +1635,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 ProductionPlanning 的本地化字符串。
+        /// </summary>
+        public static string ProductionPlanning {
+            get {
+                return ResourceManager.GetString("ProductionPlanning", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 ProgramGroup 的本地化字符串。
         /// </summary>
@@ -2175,6 +2220,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 USER 的本地化字符串。
+        /// </summary>
+        public static string USER {
+            get {
+                return ResourceManager.GetString("USER", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Washing 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -867,4 +867,32 @@
   <data name="orders" xml:space="preserve">
     <value>Orders</value>
   </data>
+  <data name="USER" xml:space="preserve">
+    <value>USER</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Monitor" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="Machine" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="MachineGroup" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="ConveyorCenters" xml:space="preserve">
+    <value>Conveyor</value>
+  </data>
+  <data name="ProductionPlanning" xml:space="preserve">
+    <value>Planning</value>
+  </data>
+  <data name="Monitor" xml:space="preserve">
+    <value>Monitor</value>
+  </data>
+  <data name="Machine" xml:space="preserve">
+    <value>Machine</value>
+  </data>
+  <data name="MachineGroup" xml:space="preserve">
+    <value>MachineGroup</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -867,4 +867,22 @@
   <data name="orders" xml:space="preserve">
     <value>orders</value>
   </data>
+  <data name="USER" xml:space="preserve">
+    <value>USER</value>
+  </data>
+  <data name="Monitor" xml:space="preserve">
+    <value>Monitor</value>
+  </data>
+  <data name="Machine" xml:space="preserve">
+    <value>Machine</value>
+  </data>
+  <data name="MachineGroup" xml:space="preserve">
+    <value>MachineGroup</value>
+  </data>
+  <data name="ConveyorCenters" xml:space="preserve">
+    <value>ConveyorCenters</value>
+  </data>
+  <data name="ProductionPlanning" xml:space="preserve">
+    <value>ProductionPlanning</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -867,4 +867,22 @@
   <data name="orders" xml:space="preserve">
     <value>工单</value>
   </data>
+  <data name="USER" xml:space="preserve">
+    <value>用户</value>
+  </data>
+  <data name="ProductionPlanning" xml:space="preserve">
+    <value>生产计划</value>
+  </data>
+  <data name="Monitor" xml:space="preserve">
+    <value>监控</value>
+  </data>
+  <data name="Machine" xml:space="preserve">
+    <value>设备</value>
+  </data>
+  <data name="MachineGroup" xml:space="preserve">
+    <value>设备组</value>
+  </data>
+  <data name="ConveyorCenters" xml:space="preserve">
+    <value>输送中心</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -867,4 +867,22 @@
   <data name="orders" xml:space="preserve">
     <value>訂單</value>
   </data>
+  <data name="USER" xml:space="preserve">
+    <value>使用者</value>
+  </data>
+  <data name="Monitor" xml:space="preserve">
+    <value>監測</value>
+  </data>
+  <data name="Machine" xml:space="preserve">
+    <value>機器</value>
+  </data>
+  <data name="MachineGroup" xml:space="preserve">
+    <value>機器羣組</value>
+  </data>
+  <data name="ProductionPlanning" xml:space="preserve">
+    <value>生產計劃</value>
+  </data>
+  <data name="ConveyorCenters" xml:space="preserve">
+    <value>輸送中心</value>
+  </data>
 </root>

View/Whole.xaml.cs

@@ -42,9 +42,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 inf[i].Margin = new Thickness(5, 5, 0, 5);
                 inf[i].Width = 300;
                 inf[i].Height = 400;
-                inf[i].name.Text = Selet_Machines(MainWindowViewModel.Machines, "name",i.ToString()).ToString();
+                inf[i].name.Text = Selet_Machines(MainWindowViewModel.Machines, "name",i).ToString();
 
-                string State_ = Selet_Machines(MainWindowViewModel.Machines, "State", i.ToString()).ToString();
+                string State_ = Selet_Machines(MainWindowViewModel.Machines, "State",i).ToString();
                 if (State_ == "101")
                 { inf[i].name.Background = new SolidColorBrush(Color.FromRgb(100, 100, 100)); }
                 else if (State_ == "201")
@@ -54,12 +54,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 else
                 { inf[i].name.Background = new SolidColorBrush(Color.FromRgb(255, 0, 0)); }
 
-                inf[i].temp.Text = (Selet_Machines(MainWindowViewModel.Machines, "Temperature", i.ToString()) + "°C").ToString();
+                inf[i].temp.Text = (Selet_Machines(MainWindowViewModel.Machines, "Temperature", i) + "°C").ToString();
-                inf[i].Process.Text = Selet_Machines(MainWindowViewModel.Machines, "Process", i.ToString()).ToString();
+                inf[i].Process.Text = Selet_Machines(MainWindowViewModel.Machines, "Process", i).ToString();
-                inf[i].Step.Text = Selet_Machines(MainWindowViewModel.Machines, "Step", i.ToString()).ToString();
+                inf[i].Step.Text = Selet_Machines(MainWindowViewModel.Machines, "Step", i).ToString();
-                inf[i].Message.Text = Selet_Machines(MainWindowViewModel.Machines, "Message", i.ToString()).ToString();
+                inf[i].Message.Text = Selet_Machines(MainWindowViewModel.Machines, "Message", i).ToString();
-                inf[i].Orders.Text = Selet_Machines(MainWindowViewModel.Machines, "Orders", i.ToString()).ToString();
+                inf[i].Orders.Text = Selet_Machines(MainWindowViewModel.Machines, "Orders", i).ToString();
-                inf[i].time.Text = Selet_Machines(MainWindowViewModel.Machines, "time", i.ToString()).ToString();
+                inf[i].time.Text = Selet_Machines(MainWindowViewModel.Machines, "time", i).ToString();
 
                 WholeView.Children.Add(inf[i]);
             }
@@ -67,13 +67,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             CountDown();
         }
 
-        public static object Selet_Machines(DataTable DB,string name ,string key)//查询
+        public static object Selet_Machines(DataTable DB,string name ,int key)//查询
         {
             try
             {
                 lock (DB)
                 {
-                    DataRow drEmployee = DB.Select("ID=" + key).First();;
+                    DataRow drEmployee = DB.Rows[key]; 
                     object index = drEmployee.Field<object>(name);
                     return index;
                 }
@@ -98,7 +98,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         {
             for (int i = 0; i < MainWindowViewModel.Machines.Rows.Count; i++)
             {
-                string State_ = Selet_Machines(MainWindowViewModel.Machines, "State", i.ToString()).ToString();
+                string State_ = Selet_Machines(MainWindowViewModel.Machines, "State", i).ToString();
                 if (State_ == "101")
                 { inf[i].name.Background = new SolidColorBrush(Color.FromRgb(100, 100, 100)); }
                 else if (State_ == "201")
@@ -108,12 +108,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 else
                 { inf[i].name.Background = new SolidColorBrush(Color.FromRgb(255, 0, 0)); }
 
-                inf[i].temp.Text = (Selet_Machines(MainWindowViewModel.Machines, "Temperature", i.ToString()) + "°C").ToString();
+                inf[i].temp.Text = (Selet_Machines(MainWindowViewModel.Machines, "Temperature", i) + "°C").ToString();
-                inf[i].Process.Text = Selet_Machines(MainWindowViewModel.Machines, "Process", i.ToString()).ToString();
+                inf[i].Process.Text = Selet_Machines(MainWindowViewModel.Machines, "Process", i).ToString();
-                inf[i].Step.Text = Selet_Machines(MainWindowViewModel.Machines, "Step", i.ToString()).ToString();
+                inf[i].Step.Text = Selet_Machines(MainWindowViewModel.Machines, "Step", i).ToString();
-                inf[i].Message.Text = Selet_Machines(MainWindowViewModel.Machines, "Message", i.ToString()).ToString();
+                inf[i].Message.Text = Selet_Machines(MainWindowViewModel.Machines, "Message", i).ToString();
-                inf[i].Orders.Text = Selet_Machines(MainWindowViewModel.Machines, "Orders", i.ToString()).ToString();
+                inf[i].Orders.Text = Selet_Machines(MainWindowViewModel.Machines, "Orders", i).ToString();
-                inf[i].time.Text = Selet_Machines(MainWindowViewModel.Machines, "time", i.ToString()).ToString();
+                inf[i].time.Text = Selet_Machines(MainWindowViewModel.Machines, "time", i).ToString();
 
             }
         }