diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 02c832a..e8f634e 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -330,6 +330,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 DyeingMachine 的本地化字符串。
+ ///
+ public static string DyeingMachine {
+ get {
+ return ResourceManager.GetString("DyeingMachine", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Dyelot 的本地化字符串。
///
@@ -906,6 +915,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Receipt 的本地化字符串。
+ ///
+ public static string Receipt {
+ get {
+ return ResourceManager.GetString("Receipt", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Recover 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index 34c102d..b77bca1 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -483,4 +483,10 @@
Bottom
+
+ Receipt
+
+
+ Dyeing
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index f0b59a1..36cf590 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -483,4 +483,10 @@
Bottom
+
+ Receipt
+
+
+ DyeingMachine
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index feeac58..bbd4689 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -483,4 +483,10 @@
底
+
+ 领料单
+
+
+ 染色机
+
\ No newline at end of file
diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs
index f6ced2f..a986840 100644
--- a/UserClass/AsyncTcpServer.cs
+++ b/UserClass/AsyncTcpServer.cs
@@ -237,6 +237,15 @@ namespace DyeingComputer.UserClass
}
else { client.SendAsync("SC999"); }
}//当前细节信息
+ else if (SYSAPI == "SC833")
+ {
+ if (SYSKEY == MainWindowViewModel.SYSKEY)
+ {
+
+ client.SendAsync("SC832" + "[" + MainWindowViewModel.S01 + "]" + "sc833");
+ }
+ else { client.SendAsync("SC999"); }
+ }//当前领料单
else if (SYSAPI == "SC851")
{
if (SYSKEY == MainWindowViewModel.SYSKEY)
diff --git a/View/TechnologicalProcessView.xaml b/View/TechnologicalProcessView.xaml
index 890ff11..6f9ccaf 100644
--- a/View/TechnologicalProcessView.xaml
+++ b/View/TechnologicalProcessView.xaml
@@ -12,7 +12,7 @@
d:DesignHeight="630" d:DesignWidth="1280">
-
-
-
-
+
+
+
+
+
+
+
diff --git a/View/TechnologicalProcessView.xaml.cs b/View/TechnologicalProcessView.xaml.cs
index 23ba81e..6080c56 100644
--- a/View/TechnologicalProcessView.xaml.cs
+++ b/View/TechnologicalProcessView.xaml.cs
@@ -238,6 +238,16 @@ namespace DyeingComputer.View
string Numder = null;
string ID = null;
string P1 = "0", P2 = "0", P3 = "0", P4 = "0", P5 = "0";
+
+ private void DyeingMachine_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
+ private void Receipt_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
+
private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (MainWindowViewModel.WORK_RUN == 2) Grid.SelectedIndex = MainWindowViewModel.RUN_STEPID - 1;//设定图表显示