sc/DyeingComputer
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sc committed 2024-08-18 13:51:09 +08:00
2 parents 743eb186a5 7916ab9f43
commit 03c712b2eb
10 files changed
+202 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

App.xaml.cs
-1
View File
@@ -7,7 +7,6 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using Microsoft.Data.Sqlite;
namespace DyeingComputer
{
ConvertMoels/StatenConvert.cs
+9 -7
View File
@@ -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;
}
DyeingComputer.csproj
+1 -3
View File
@@ -95,6 +95,7 @@
<Compile Include="UserClass\TCPServer.cs" />
<Compile Include="ViewModel\MainWindowViewModel.cs" />
<Compile Include="ViewModel\ViewModelLocator.cs" />
<Compile Include="ViewModel\WorkOrderViewModel.cs" />
<Compile Include="View\CurveDiagramView.xaml.cs">
<DependentUpon>CurveDiagramView.xaml</DependentUpon>
</Compile>
@@ -265,9 +266,6 @@
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
<Version>8.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Data.Sqlite">
<Version>8.0.7</Version>
</PackageReference>
<PackageReference Include="System.Buffers">
<Version>4.5.1</Version>
</PackageReference>
Properties/Resources.Designer.cs
Generated
+72
View File
@@ -69,6 +69,33 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Abnormal 的本地化字符串。
/// </summary>
public static string Abnormal {
get {
return ResourceManager.GetString("Abnormal", resourceCulture);
}
}
/// <summary>
/// 查找类似 Auto 的本地化字符串。
/// </summary>
public static string Auto {
get {
return ResourceManager.GetString("Auto", resourceCulture);
}
}
/// <summary>
/// 查找类似 Await 的本地化字符串。
/// </summary>
public static string Await {
get {
return ResourceManager.GetString("Await", resourceCulture);
}
}
/// <summary>
/// 查找类似 Curve 的本地化字符串。
/// </summary>
@@ -114,6 +141,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Finish 的本地化字符串。
/// </summary>
public static string Finish {
get {
return ResourceManager.GetString("Finish", resourceCulture);
}
}
/// <summary>
/// 查找类似 History 的本地化字符串。
/// </summary>
@@ -132,6 +168,24 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 LineUp 的本地化字符串。
/// </summary>
public static string LineUp {
get {
return ResourceManager.GetString("LineUp", resourceCulture);
}
}
/// <summary>
/// 查找类似 Measure 的本地化字符串。
/// </summary>
public static string Measure {
get {
return ResourceManager.GetString("Measure", resourceCulture);
}
}
/// <summary>
/// 查找类似 New 的本地化字符串。
/// </summary>
@@ -150,6 +204,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 的本地化字符串。
/// </summary>
public static string NotxEcuted {
get {
return ResourceManager.GetString("NotxEcuted", resourceCulture);
}
}
/// <summary>
/// 查找类似 Parameter 的本地化字符串。
/// </summary>
@@ -186,6 +249,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Ready 的本地化字符串。
/// </summary>
public static string Ready {
get {
return ResourceManager.GetString("Ready", resourceCulture);
}
}
/// <summary>
/// 查找类似 Redye 的本地化字符串。
/// </summary>
Properties/Resources.en-US.resx
+25
View File
@@ -189,4 +189,29 @@
<data name="Time" xml:space="preserve">
<value>Time</value>
</data>
<data name="Ready" xml:space="preserve">
<value>Ready</value>
</data>
<data name="Abnormal" xml:space="preserve">
<value>Abnormal</value>
</data>
<data name="Auto" xml:space="preserve">
<value>Auto</value>
</data>
<data name="Await" xml:space="preserve">
<value>Await</value>
</data>
<data name="Finish" xml:space="preserve">
<value>Finish</value>
</data>
<data name="Measure" xml:space="preserve">
<value>Measure</value>
</data>
<data name="LineUp" xml:space="preserve">
<value>Line Up</value>
</data>
<data name="NotxEcuted" xml:space="preserve">
<value>Not Executed
</value>
</data>
</root>
Properties/Resources.resx
+24
View File
@@ -189,4 +189,28 @@
<data name="WorkOrderNumder" xml:space="preserve">
<value>WorkOrderNumder</value>
</data>
<data name="Ready" xml:space="preserve">
<value>Ready</value>
</data>
<data name="Abnormal" xml:space="preserve">
<value>Abnormal</value>
</data>
<data name="Auto" xml:space="preserve">
<value>Auto</value>
</data>
<data name="Await" xml:space="preserve">
<value>Await</value>
</data>
<data name="Finish" xml:space="preserve">
<value>Finish</value>
</data>
<data name="Measure" xml:space="preserve">
<value>Measure</value>
</data>
<data name="LineUp" xml:space="preserve">
<value>LineUp</value>
</data>
<data name="NotxEcuted" xml:space="preserve">
<value>NotExecuted</value>
</data>
</root>
Properties/Resources.zh-CN.resx
+24
View File
@@ -189,4 +189,28 @@
<data name="Time" xml:space="preserve">
<value>时间</value>
</data>
<data name="Abnormal" xml:space="preserve">
<value>异常</value>
</data>
<data name="Auto" xml:space="preserve">
<value>自动状态</value>
</data>
<data name="Await" xml:space="preserve">
<value>等待命令</value>
</data>
<data name="Finish" xml:space="preserve">
<value>完成</value>
</data>
<data name="LineUp" xml:space="preserve">
<value>转入排队</value>
</data>
<data name="Measure" xml:space="preserve">
<value>计量</value>
</data>
<data name="Ready" xml:space="preserve">
<value>准备就绪</value>
</data>
<data name="NotxEcuted" xml:space="preserve">
<value>未执行</value>
</data>
</root>
Properties/Resources.zh-TW.resx
+24
View File
@@ -189,4 +189,28 @@
<data name="Time" xml:space="preserve">
<value>時間</value>
</data>
<data name="Ready" xml:space="preserve">
<value>準備就緒</value>
</data>
<data name="Abnormal" xml:space="preserve">
<value>異常</value>
</data>
<data name="Auto" xml:space="preserve">
<value>自動狀態</value>
</data>
<data name="Await" xml:space="preserve">
<value>等待命令</value>
</data>
<data name="Finish" xml:space="preserve">
<value>完成</value>
</data>
<data name="LineUp" xml:space="preserve">
<value>轉入</value>
</data>
<data name="Measure" xml:space="preserve">
<value>計量</value>
</data>
<data name="NotxEcuted" xml:space="preserve">
<value>未執行</value>
</data>
</root>
UserClass/SqliteHelper.cs
-1
View File
@@ -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;
ViewModel/WorkOrderViewModel.cs
+23
View File
@@ -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()
{
}
}
}