diff --git a/ConvertMoels/StatenClassConvert.cs b/ConvertMoels/StatenClassConvert.cs
new file mode 100644
index 0000000..33c240e
--- /dev/null
+++ b/ConvertMoels/StatenClassConvert.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SunlightCentralizedControlManagement_SCCM_.ConvertMoels
+{
+ internal class StatenClassConvert
+ {
+ public static string Convert(object value)
+ {
+ if (value == null)
+ {
+ return null;
+ }
+ else
+ {
+ string Staten = null;
+ string i = value.ToString();
+
+ if (i == "100") Staten = Properties.Resources.Await;//等待
+ else if (i == "101") Staten = Properties.Resources.Ready;//准备
+ else if (i == "102") Staten = Properties.Resources.Measure;//计量
+ else if (i == "109") Staten = Properties.Resources.ERR;//错误
+ else if (i == "110") Staten = Properties.Resources.NotSent;//未发送
+ else if (i == "111") Staten = Properties.Resources.LtemizedSending;//发送明细
+ else if (i == "112") Staten = Properties.Resources.DNotSent;//未发送明细
+ else if (i == "119") Staten = Properties.Resources.Fail;//失败
+ 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.Notimplementation;//未连接
+ else if (i == "801") Staten = Properties.Resources.Implementation;//连接成功
+ else if (i == "801") Staten = Properties.Resources.Online;//在线
+ else if (i == "899") Staten = Properties.Resources.CloseTheConnection;//关闭连接
+ else Staten = "null";
+
+ return Staten;
+ }
+ }
+
+ }
+}
diff --git a/ConvertMoels/StatenConvert.cs b/ConvertMoels/StatenConvert.cs
index 6534e88..98299f4 100644
--- a/ConvertMoels/StatenConvert.cs
+++ b/ConvertMoels/StatenConvert.cs
@@ -21,15 +21,23 @@ namespace SunlightCentralizedControlManagement_SCCM_.ConvertMoels
string Staten = null;
string i = value.ToString();
- 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.Notimplementation;
- else if (i == "801") Staten = Properties.Resources.Implementation;
+ if (i == "100") Staten = Properties.Resources.Await;//等待
+ else if (i == "101") Staten = Properties.Resources.Ready;//准备
+ else if (i == "102") Staten = Properties.Resources.Measure;//计量
+ else if (i == "109") Staten = Properties.Resources.ERR;//错误
+ else if (i == "110") Staten = Properties.Resources.NotSent;//未发送
+ else if (i == "111") Staten = Properties.Resources.LtemizedSending;//发送明细
+ else if (i == "112") Staten = Properties.Resources.DNotSent;//未发送明细
+ else if (i == "119") Staten = Properties.Resources.Fail;//失败
+ 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.Notimplementation;//未连接
+ else if (i == "801") Staten = Properties.Resources.Implementation;//连接成功
+ else if (i == "801") Staten = Properties.Resources.Online;//在线
+ else if (i == "899") Staten = Properties.Resources.CloseTheConnection;//关闭连接
else Staten = "null";
return Staten;
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index b8c3935..b726596 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -276,6 +276,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 Close the connection 的本地化字符串。
+ ///
+ public static string CloseTheConnection {
+ get {
+ return ResourceManager.GetString("CloseTheConnection", resourceCulture);
+ }
+ }
+
///
/// 查找类似 ClothIntake 的本地化字符串。
///
@@ -654,6 +663,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 Details were not sent 的本地化字符串。
+ ///
+ public static string DNotSent {
+ get {
+ return ResourceManager.GetString("DNotSent", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Does Not Exist 的本地化字符串。
///
@@ -816,6 +834,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 err 的本地化字符串。
+ ///
+ public static string ERR {
+ get {
+ return ResourceManager.GetString("ERR", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Expected 的本地化字符串。
///
@@ -834,6 +861,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 fail 的本地化字符串。
+ ///
+ public static string Fail {
+ get {
+ return ResourceManager.GetString("Fail", resourceCulture);
+ }
+ }
+
///
/// 查找类似 FailureRecovery 的本地化字符串。
///
@@ -1005,15 +1041,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 High-water level 的本地化字符串。
- ///
- public static string High_waterlevel1 {
- get {
- return ResourceManager.GetString("High-waterlevel1", resourceCulture);
- }
- }
-
///
/// 查找类似 History 的本地化字符串。
///
@@ -1023,15 +1050,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 History 的本地化字符串。
- ///
- public static string HistoryRecords1 {
- get {
- return ResourceManager.GetString("HistoryRecords1", resourceCulture);
- }
- }
-
///
/// 查找类似 ID 的本地化字符串。
///
@@ -1041,15 +1059,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 ID 的本地化字符串。
- ///
- public static string ID1 {
- get {
- return ResourceManager.GetString("ID1", resourceCulture);
- }
- }
-
///
/// 查找类似 Implementation 的本地化字符串。
///
@@ -1059,15 +1068,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 Implementation 的本地化字符串。
- ///
- public static string Implementation1 {
- get {
- return ResourceManager.GetString("Implementation1", resourceCulture);
- }
- }
-
///
/// 查找类似 I/O 的本地化字符串。
///
@@ -1077,15 +1077,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 I/O 的本地化字符串。
- ///
- public static string InOut1 {
- get {
- return ResourceManager.GetString("InOut1", resourceCulture);
- }
- }
-
///
/// 查找类似 Insert 的本地化字符串。
///
@@ -1095,15 +1086,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 Insert 的本地化字符串。
- ///
- public static string Insert1 {
- get {
- return ResourceManager.GetString("Insert1", resourceCulture);
- }
- }
-
///
/// 查找类似 Invalid features 的本地化字符串。
///
@@ -1113,15 +1095,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 Invalid features 的本地化字符串。
- ///
- public static string Invalidfeatures1 {
- get {
- return ResourceManager.GetString("Invalidfeatures1", resourceCulture);
- }
- }
-
///
/// 查找类似 Jump 的本地化字符串。
///
@@ -1140,15 +1113,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 Language 的本地化字符串。
- ///
- public static string Language1 {
- get {
- return ResourceManager.GetString("Language1", resourceCulture);
- }
- }
-
///
/// 查找类似 LineUp 的本地化字符串。
///
@@ -1158,15 +1122,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 LineUp 的本地化字符串。
- ///
- public static string LineUp1 {
- get {
- return ResourceManager.GetString("LineUp1", resourceCulture);
- }
- }
-
///
/// 查找类似 LnsufficientPower 的本地化字符串。
///
@@ -1176,24 +1131,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 LnsufficientPower 的本地化字符串。
- ///
- public static string LnsufficientPower1 {
- get {
- return ResourceManager.GetString("LnsufficientPower1", resourceCulture);
- }
- }
-
- ///
- /// 查找类似 lock 的本地化字符串。
- ///
- public static string lock1 {
- get {
- return ResourceManager.GetString("lock1", resourceCulture);
- }
- }
-
///
/// 查找类似 Log 的本地化字符串。
///
@@ -1213,11 +1150,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
///
- /// 查找类似 Low-water level 的本地化字符串。
+ /// 查找类似 Itemized sending 的本地化字符串。
///
- public static string Low_waterlevel1 {
+ public static string LtemizedSending {
get {
- return ResourceManager.GetString("Low-waterlevel1", resourceCulture);
+ return ResourceManager.GetString("LtemizedSending", resourceCulture);
}
}
@@ -1491,6 +1428,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 Not sent 的本地化字符串。
+ ///
+ public static string NotSent {
+ get {
+ return ResourceManager.GetString("NotSent", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Nozzle 的本地化字符串。
///
@@ -1536,6 +1482,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 online 的本地化字符串。
+ ///
+ public static string Online {
+ get {
+ return ResourceManager.GetString("Online", resourceCulture);
+ }
+ }
+
///
/// 查找类似 orders 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index 46eb0c6..6924b8b 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -150,21 +150,12 @@
History
-
- History
-
I/O
-
- I/O
-
Lock/Unlock
-
- Lock/Unlock
-
New
@@ -294,9 +285,6 @@
Line Up
-
- Line Up
-
Not Implementation
@@ -348,15 +336,9 @@
ID
-
- ID
-
Insert
-
- Insert
-
Recover
@@ -537,9 +519,6 @@
Invalid features
-
- Invalid features
-
NO
@@ -657,9 +636,6 @@
Implementation
-
- Implementation
-
The process does not exist
@@ -687,9 +663,6 @@
Language
-
- Language
-
Paused
@@ -771,15 +744,9 @@
High-water level
-
- High-water level
-
Low-water level
-
- Low-water level
-
Cloth Wheel
@@ -807,9 +774,6 @@
Lnsufficient Power
-
- Lnsufficient Power
-
Working Status
@@ -996,4 +960,25 @@
ColorName
+
+ Close the connection
+
+
+ Online
+
+
+ ERR
+
+
+ Fail
+
+
+ LtemizedSending
+
+
+ Not Sent
+
+
+ Details Were Not Sent
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 278c778..3f96816 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -150,21 +150,12 @@
History
-
- History
-
I/O
-
- I/O
-
lock
-
- lock
-
New
@@ -294,9 +285,6 @@
LineUp
-
- LineUp
-
Notimplementation
@@ -348,15 +336,9 @@
ID
-
- ID
-
Insert
-
- Insert
-
Recover
@@ -537,9 +519,6 @@
Invalid features
-
- Invalid features
-
NO
@@ -657,9 +636,6 @@
Implementation
-
- Implementation
-
The process does not exist
@@ -687,9 +663,6 @@
Language
-
- Language
-
Paused
@@ -771,15 +744,9 @@
High-water level
-
- High-water level
-
Low-water level
-
- Low-water level
-
ClothWheel
@@ -807,9 +774,6 @@
LnsufficientPower
-
- LnsufficientPower
-
WorkingStatus
@@ -996,4 +960,25 @@
ColorName
+
+ Close the connection
+
+
+ online
+
+
+ err
+
+
+ fail
+
+
+ Itemized sending
+
+
+ Not sent
+
+
+ Details were not sent
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 1443731..869f3cc 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -150,21 +150,12 @@
历史
-
- 历史
-
输入输出
-
- 输入输出
-
锁定/解锁
-
- 锁定/解锁
-
新建
@@ -294,9 +285,6 @@
排队
-
- 排队
-
未执行
@@ -348,15 +336,9 @@
ID
-
- ID
-
插入
-
- 插入
-
恢复
@@ -537,9 +519,6 @@
功能无效
-
- 功能无效
-
否
@@ -657,9 +636,6 @@
执行
-
- 执行
-
工艺不存在
@@ -687,9 +663,6 @@
语言
-
- 语言
-
暂停
@@ -771,15 +744,9 @@
高水位
-
- 高水位
-
低水位
-
- 低水位
-
布轮
@@ -807,9 +774,6 @@
功率不足
-
- 功率不足
-
工作状态
@@ -996,4 +960,25 @@
色名
+
+ 断开连接
+
+
+ 在线
+
+
+ 错误
+
+
+ 失败
+
+
+ 发送明细
+
+
+ 未发送
+
+
+ 未发送明细
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index 7368945..40371e1 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -150,21 +150,12 @@
歷史
-
- 歷史
-
輸入輸出
-
- 輸入輸出
-
鎖定
-
- 鎖定
-
新建
@@ -294,9 +285,6 @@
轉入
-
- 轉入
-
未執行
@@ -348,15 +336,9 @@
ID
-
- ID
-
插入
-
- 插入
-
恢復
@@ -537,9 +519,6 @@
無效的圖徵
-
- 無效的圖徵
-
否
@@ -657,9 +636,6 @@
執行
-
- 執行
-
流程不存在
@@ -687,9 +663,6 @@
語言
-
- 語言
-
已暫停
@@ -771,15 +744,9 @@
高水位
-
- 高水位
-
低水位
-
- 低水位
-
布輪
@@ -807,9 +774,6 @@
功率不足
-
- 功率不足
-
工作狀態
@@ -994,6 +958,27 @@
總浴量
-
+ 色名
+
+
+ 斷開連線
+
+
+ 在線
+
+
+ 錯誤
+
+
+ 失敗
+
+
+ 發送明細
+
+
+ 未發送
+
+
+ 未發送明細
\ No newline at end of file
diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj
index a92f872..c5f00aa 100644
--- a/SunlightCentralizedControlManagement_SCCM_.csproj
+++ b/SunlightCentralizedControlManagement_SCCM_.csproj
@@ -100,6 +100,7 @@
Designer
+
Login.xaml
diff --git a/View/ProductionPlanningView.xaml.cs b/View/ProductionPlanningView.xaml.cs
index 106cb8e..521e339 100644
--- a/View/ProductionPlanningView.xaml.cs
+++ b/View/ProductionPlanningView.xaml.cs
@@ -42,6 +42,7 @@ using System.Windows.Markup;
using System.Collections.ObjectModel;
using SkiaSharp;
using System.Windows.Threading;
+using SunlightCentralizedControlManagement_SCCM_.ConvertMoels;
namespace SunlightCentralizedControlManagement_SCCM_.View
@@ -123,7 +124,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
Name = Properties.Resources.ProcessName + ";" + dataRows[j].Field("ProgramName"),
Background = colorBackground,
Status = colorStatus,
- ID = Properties.Resources.WorkOrder + ";" + dataRows[j].Field("WorkOrder"),
+ ID = Properties.Resources.WorkOrder + ";" + dataRows[j].Field("WorkOrder").ToString(),
Dyelot = Properties.Resources.Dyelot + ";" + dataRows[j].Field("Dyelot"),
Remark = Properties.Resources.Remark + ";" + dataRows[j].Field("Remark"),
ColorNumber = Properties.Resources.ColorNumber + ";" + dataRows[j].Field("ColorNumber"),
@@ -134,6 +135,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
BathRatio = Properties.Resources.BathRatio + ";" + dataRows[j].Field("BathRatio"),
Total = Properties.Resources.Total + ";" + dataRows[j].Field("Total"),
USER = Properties.Resources.USER + ";" + dataRows[j].Field("user"),
+ STATE = Properties.Resources.State + ";" +StatenClassConvert.Convert( dataRows[j].Field("State").ToString()),
TaskProgressVisibility = System.Windows.Visibility.Hidden
});
}