diff --git a/App.xaml.cs b/App.xaml.cs
index d500038..36f4a71 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -7,7 +7,6 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
-using Microsoft.Data.Sqlite;
namespace DyeingComputer
{
diff --git a/ConvertMoels/StatenConvert.cs b/ConvertMoels/StatenConvert.cs
index 8ad2fdd..bed7fc0 100644
--- a/ConvertMoels/StatenConvert.cs
+++ b/ConvertMoels/StatenConvert.cs
@@ -20,13 +20,15 @@ namespace DyeingComputer.ConvertMoels
string Staten = null;
string i = value.ToString();
- if (i == "101") Staten = "准备就绪";
- if (i == "102") Staten = "计量输送";
- if (i == "201") Staten = "自动状态";
- if (i == "202") Staten = "转入排队";
- if (i == "203") Staten = "等待命令";
- if (i == "301") Staten = "步骤完成";
- if (i == "309") Staten = "输送异常";
+ if (i == "101") Staten = Properties.Resources.Ready;
+ else if (i == "102") Staten = Properties.Resources.Measure;
+ else if (i == "201") Staten = Properties.Resources.Auto;
+ else if (i == "202") Staten = Properties.Resources.LineUp;
+ 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 Staten = "null";
return Staten;
}
diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj
index be57368..1f3e950 100644
--- a/DyeingComputer.csproj
+++ b/DyeingComputer.csproj
@@ -95,6 +95,7 @@
+
CurveDiagramView.xaml
@@ -265,9 +266,6 @@
8.0.0
-
- 8.0.7
-
4.5.1
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 5701ffe..8abb85a 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -69,6 +69,33 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Abnormal 的本地化字符串。
+ ///
+ public static string Abnormal {
+ get {
+ return ResourceManager.GetString("Abnormal", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 Auto 的本地化字符串。
+ ///
+ public static string Auto {
+ get {
+ return ResourceManager.GetString("Auto", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 Await 的本地化字符串。
+ ///
+ public static string Await {
+ get {
+ return ResourceManager.GetString("Await", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Curve 的本地化字符串。
///
@@ -114,6 +141,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Finish 的本地化字符串。
+ ///
+ public static string Finish {
+ get {
+ return ResourceManager.GetString("Finish", resourceCulture);
+ }
+ }
+
///
/// 查找类似 History 的本地化字符串。
///
@@ -132,6 +168,24 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 LineUp 的本地化字符串。
+ ///
+ public static string LineUp {
+ get {
+ return ResourceManager.GetString("LineUp", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 Measure 的本地化字符串。
+ ///
+ public static string Measure {
+ get {
+ return ResourceManager.GetString("Measure", resourceCulture);
+ }
+ }
+
///
/// 查找类似 New 的本地化字符串。
///
@@ -150,6 +204,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 的本地化字符串。
+ ///
+ public static string NotxEcuted {
+ get {
+ return ResourceManager.GetString("NotxEcuted", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Parameter 的本地化字符串。
///
@@ -186,6 +249,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Ready 的本地化字符串。
+ ///
+ public static string Ready {
+ get {
+ return ResourceManager.GetString("Ready", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Redye 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index 2235bd5..84a9b8d 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -189,4 +189,29 @@
Time
+
+ Ready
+
+
+ Abnormal
+
+
+ Auto
+
+
+ Await
+
+
+ Finish
+
+
+ Measure
+
+
+ Line Up
+
+
+ Not Executed
+
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index a2a7e93..9f91524 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -189,4 +189,28 @@
WorkOrderNumder
+
+ Ready
+
+
+ Abnormal
+
+
+ Auto
+
+
+ Await
+
+
+ Finish
+
+
+ Measure
+
+
+ LineUp
+
+
+ NotExecuted
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 7df624c..edd91ce 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -189,4 +189,28 @@
时间
+
+ 异常
+
+
+ 自动状态
+
+
+ 等待命令
+
+
+ 完成
+
+
+ 转入排队
+
+
+ 计量
+
+
+ 准备就绪
+
+
+ 未执行
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index bf1d9b3..25f7441 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -189,4 +189,28 @@
時間
+
+ 準備就緒
+
+
+ 異常
+
+
+ 自動狀態
+
+
+ 等待命令
+
+
+ 完成
+
+
+ 轉入
+
+
+ 計量
+
+
+ 未執行
+
\ No newline at end of file
diff --git a/UserClass/SqliteHelper.cs b/UserClass/SqliteHelper.cs
index 525a45a..dff22e6 100644
--- a/UserClass/SqliteHelper.cs
+++ b/UserClass/SqliteHelper.cs
@@ -5,7 +5,6 @@ using System.Text;
using System.Threading.Tasks;
using System.Data;
using System.IO;
-using Microsoft.Data.Sqlite;
using System.Data.Common;
using System.Windows.Media.Animation;
using System.Data.SQLite;
diff --git a/ViewModel/WorkOrderViewModel.cs b/ViewModel/WorkOrderViewModel.cs
new file mode 100644
index 0000000..e50b027
--- /dev/null
+++ b/ViewModel/WorkOrderViewModel.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace DyeingComputer.ViewModel
+{
+ public class WorkOrderViewModel : ViewModelBase
+ {
+ public WorkOrderViewModel()
+ {
+
+
+ }
+
+
+
+ }
+
+}