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

ConvertMoels/StatenConvert.cs

@@ -28,7 +28,8 @@ namespace DyeingComputer.ConvertMoels
                 else if (i == "203") Staten = Properties.Resources.Await;
                 else if (i == "301") Staten = Properties.Resources.Finish;
                 else if (i == "309") Staten = Properties.Resources.Abnormal;
-                else if (i == "800") Staten = Properties.Resources.NotxEcuted;
+                else if (i == "800") Staten = Properties.Resources.Notimplementation;
+                else if (i == "801") Staten = Properties.Resources.Implementation;
                 else Staten = "null";
 
                 return Staten;

Properties/Resources.Designer.cs

@@ -366,6 +366,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Implementation 的本地化字符串。
+        /// </summary>
+        public static string Implementation {
+            get {
+                return ResourceManager.GetString("Implementation", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 I/O 的本地化字符串。
         /// </summary>
@@ -457,11 +466,11 @@ namespace DyeingComputer.Properties {
         }
         
         /// <summary>
-        ///   查找类似 NotExecuted 的本地化字符串。
+        ///   查找类似 Notimplementation 的本地化字符串。
         /// </summary>
-        public static string NotxEcuted {
+        public static string Notimplementation {
             get {
-                return ResourceManager.GetString("NotxEcuted", resourceCulture);
+                return ResourceManager.GetString("Notimplementation", resourceCulture);
             }
         }
         
@@ -573,6 +582,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 The process does not exist 的本地化字符串。
+        /// </summary>
+        public static string process_not {
+            get {
+                return ResourceManager.GetString("process_not", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 ProcessName 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -210,9 +210,6 @@
   <data name="LineUp" xml:space="preserve">
     <value>Line Up</value>
   </data>
-  <data name="NotxEcuted" xml:space="preserve">
-    <value>Not Executed</value>
-  </data>
   <data name="State" xml:space="preserve">
     <value>State</value>
   </data>
@@ -396,4 +393,13 @@
   <data name="Overflow" xml:space="preserve">
     <value>Overflow</value>
   </data>
+  <data name="process_not" xml:space="preserve">
+    <value>The process does not exist</value>
+  </data>
+  <data name="Implementation" xml:space="preserve">
+    <value>Implementation</value>
+  </data>
+  <data name="Notimplementation" xml:space="preserve">
+    <value>Not Implementation</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -210,8 +210,8 @@
   <data name="LineUp" xml:space="preserve">
     <value>LineUp</value>
   </data>
-  <data name="NotxEcuted" xml:space="preserve">
+  <data name="Notimplementation" xml:space="preserve">
-    <value>NotExecuted</value>
+    <value>Notimplementation</value>
   </data>
   <data name="Confirm" xml:space="preserve">
     <value>Confirm</value>
@@ -396,4 +396,10 @@
   <data name="Wiggle" xml:space="preserve">
     <value>Wiggle</value>
   </data>
+  <data name="Implementation" xml:space="preserve">
+    <value>Implementation</value>
+  </data>
+  <data name="process_not" xml:space="preserve">
+    <value>The process does not exist</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -210,9 +210,6 @@
   <data name="Ready" xml:space="preserve">
     <value>准备</value>
   </data>
-  <data name="NotxEcuted" xml:space="preserve">
-    <value>未执行</value>
-  </data>
   <data name="State" xml:space="preserve">
     <value>状态</value>
   </data>
@@ -396,4 +393,13 @@
   <data name="Overflow" xml:space="preserve">
     <value>溢流</value>
   </data>
+  <data name="process_not" xml:space="preserve">
+    <value>工艺不存在</value>
+  </data>
+  <data name="Notimplementation" xml:space="preserve">
+    <value>未执行</value>
+  </data>
+  <data name="Implementation" xml:space="preserve">
+    <value>执行</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -210,9 +210,6 @@
   <data name="Measure" xml:space="preserve">
     <value>計量</value>
   </data>
-  <data name="NotxEcuted" xml:space="preserve">
-    <value>未執行</value>
-  </data>
   <data name="State" xml:space="preserve">
     <value>狀態</value>
   </data>
@@ -396,4 +393,13 @@
   <data name="Overflow" xml:space="preserve">
     <value>溢流</value>
   </data>
+  <data name="process_not" xml:space="preserve">
+    <value>流程不存在</value>
+  </data>
+  <data name="Notimplementation" xml:space="preserve">
+    <value>未執行</value>
+  </data>
+  <data name="Implementation" xml:space="preserve">
+    <value>執行</value>
+  </data>
 </root>

View/TechnologicalProcessView.xaml

@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:DyeingComputer.View"
              xmlns:lang="clr-namespace:DyeingComputer.Properties"              
-             mc:Ignorable="d" 
+             mc:Ignorable="d" Loaded="UserControl_Loaded"
              d:DesignHeight="630" d:DesignWidth="1280">
     <Grid>
         <TextBlock x:Name="log" HorizontalAlignment="Left" Margin="0,0,0,0" TextWrapping="Wrap" Width="600" FontSize="20" Background="White"/>

View/TechnologicalProcessView.xaml.cs

@@ -27,7 +27,6 @@ namespace DyeingComputer.View
         public TechnologicalProcessView()
         {
             InitializeComponent();         
-            TechnologicalProcess_sql();
         }
 
         public static object workName;
@@ -50,5 +49,10 @@ namespace DyeingComputer.View
             SQLiteHelpers.Close();  //关闭连接
             if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView;  //转换显示计划表
         }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            if(workName !=null) TechnologicalProcess_sql();
+        }
     }
 }

View/WorkOrderView.xaml

@@ -70,7 +70,7 @@
                 <DataGridTextColumn Header="{x:Static lang:Resources.ProcessName}" Width="300" Binding="{Binding ProcessName}" IsReadOnly="True"/>
                 <DataGridTextColumn Header="ProcessID" Binding="{Binding ProcessID}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Header="lock" Binding="{Binding lock}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.State}" Width="90" IsReadOnly="True">
+                <DataGridTextColumn Header="{x:Static lang:Resources.State}" Width="120" IsReadOnly="True">
                     <DataGridTextColumn.ElementStyle>
                         <Style TargetType="{x:Type TextBlock}">
                             <Setter Property="Text" Value="{Binding Path=State,Converter={StaticResource StatenConvert}}"/>

View/WorkOrderView.xaml.cs

@@ -41,6 +41,7 @@ namespace DyeingComputer.View
         private SQLiteHelper SQLiteHelpers = null;  //定义数据库
         private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db";  //数据库路径
         DataSet sql; //内存数据缓存
+        Dictionary<string, object> updata_temp = new Dictionary<string, object>();//缓存函数
 
         string WorkOrder_Numder;
         string Process_Name;
@@ -89,21 +90,19 @@ namespace DyeingComputer.View
         private void WorkOrderView_lock_Click(object sender, RoutedEventArgs e)//锁定按钮
         {
             if (WorkOrder_Numder == null) return;
-            Dictionary<string, object> lock_v = new Dictionary<string, object>();//缓存函数
             SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
             SQLiteHelpers.Open();  //打开数据库
-
+            updata_temp.Clear();//使用前清理缓存
             if (_lock == "0") //改变lock的状态
             {
-                lock_v.Add("lock", 1);
+                updata_temp.Add("lock", 1);
-                SQLiteHelpers.Update("WorkOrder", lock_v, "WorkOrder='" + WorkOrder_Numder + "'", null);
+                SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + WorkOrder_Numder + "'", null);
             }
             else
             {
-                lock_v.Add("lock", 0);
+                updata_temp.Add("lock", 0);
-                SQLiteHelpers.Update("WorkOrder", lock_v, "WorkOrder='" + WorkOrder_Numder + "'", null);
+                SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + WorkOrder_Numder + "'", null);
             }
-
             SQLiteHelpers.Close();
             Workorder_sql();
         }
@@ -152,27 +151,34 @@ namespace DyeingComputer.View
                 Process_id = (Grid.Columns[2].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
                 _lock = (Grid.Columns[3].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第1列，
             }         
+        }
 
+        private void UserControl_KeyDown(object sender, KeyEventArgs e) //键盘监控
+        {
+            if (e.Key == Key.Y) //按键y
+            {
                 SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
                 SQLiteHelpers.Open();  //打开数据库
                 string sql_script = "select * from ProgramName where  ProgramID = '" + Process_id + "'";
                 int i = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0].Rows.Count;  //读取工艺表返回0工艺不存在
-            SQLiteHelpers.Close();  //关闭连接
 
-            if(i == 0) //工艺不存在提示
+                if (i == 0) //工艺不存在提示
                 {
+                    SQLiteHelpers.Close();  //关闭连接
                     WorkOrder_Numder = null;
                     Process_id = null;
-                Process_Name = null;
+                    if (System.Windows.Forms.MessageBox.Show("["+Process_Name+"] "+ Properties.Resources.process_not, "800 ",
-
+                        System.Windows.Forms.MessageBoxButtons.OK) == System.Windows.Forms.DialogResult.OK) return;
                 }
+                else //否则修改工艺执行状态
+                {
+                    updata_temp.Clear(); //使用前清缓存
+                    updata_temp.Add("State", 101);
+                    SQLiteHelpers.Update("WorkOrder", updata_temp, "ProcessID='" + Process_id + "'", null);
+                    SQLiteHelpers.Close();  //关闭连接
                 }
 
-        private void UserControl_KeyDown(object sender, KeyEventArgs e)
+                if (Process_id != null)  //选定工艺有效跳转准备                                      
-        {
-            if (e.Key == Key.K) 
-            {
-                if (Process_id != null)
                 {
                     MainWindowViewModel.WorkNumder = WorkOrder_Numder;
                     TechnologicalProcessView.workName = Process_id;