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

View/EquipmentSimulationView.xaml

@@ -5,6 +5,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:DyeingComputer.View"
              mc:Ignorable="d" 
-             d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
-    <Grid/>
+             d:DesignHeight="630" d:DesignWidth="1280">
+    <Grid>
+        
+    </Grid>
 </UserControl>

View/WorkOrderView.xaml.cs

@@ -205,6 +205,7 @@ namespace DyeingComputer.View
                 {
                     MainWindowViewModel.WorkNumder = WorkOrder_Numder;
                     TechnologicalProcessView.workName = Process_id;
+                    MainWindowViewModel.SYS_REDYE = 0;
 
                     MainWindowViewModel.ViewID = 1;
                     var _mainWindow = Application.Current.Windows.Cast<Window>().FirstOrDefault(window => window is MainWindow) as MainWindow;//跨页面