diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 614431c..0131b0d 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -915,6 +915,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 ProductName 的本地化字符串。 + /// + public static string ProductName { + get { + return ResourceManager.GetString("ProductName", resourceCulture); + } + } + /// /// 查找类似 ProgramGroup 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index faf4966..95f3ed4 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -511,7 +511,7 @@ Jump - ProductCode + Product Code Grams @@ -543,4 +543,7 @@ Refuse + + Product Name + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index d57f7ff..19ed402 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -543,4 +543,7 @@ Refuse + + ProductName + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index 2696785..acc1b93 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -543,4 +543,7 @@ 拒绝 + + 原料名 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index 6852159..5d62983 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -543,4 +543,7 @@ 拒絕 + + 原料名 + \ No newline at end of file diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index 1af4933..2aa0eb4 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -434,6 +434,7 @@ namespace DyeingComputer.UserClass { Dictionary Chart_new = new Dictionary();//缓存函数 Chart_new.Add("LOCK", MainWindowViewModel._Lock_bool); + Chart_new.Add("CALL", MainWindowViewModel.CALL_FR); Chart_new.Add("Status", MainWindowViewModel.StatusStr); Chart_new.Add("Machine", MainWindowViewModel.S01); Chart_new.Add("WorkNumder", MainWindowViewModel.WorkNumder); diff --git a/View/TechnologicalProcessView.xaml b/View/TechnologicalProcessView.xaml index 184255b..f9f9890 100644 --- a/View/TechnologicalProcessView.xaml +++ b/View/TechnologicalProcessView.xaml @@ -6,10 +6,14 @@ xmlns:local="clr-namespace:DyeingComputer.View" xmlns:lang="clr-namespace:DyeingComputer.Properties" xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel" + xmlns:ConvertMoels="clr-namespace:DyeingComputer.ConvertMoels" d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}" mc:Ignorable="d" Loaded="UserControl_Loaded" KeyDown="UserControl_KeyDown" d:DesignHeight="630" d:DesignWidth="1280"> + + + - + @@ -130,10 +134,11 @@ - - - - + + + + + dat_FR = new Dictionary(); + dat_FR.Add("State", "201"); + dat_FR.Add("Tank", TANK.ToString()); + dat_FR.Add("Machine", S01); + dat_FR.Add("CALL_TIME", sys_Time); SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.InsertData("FeedingRecords", SQLiteHelpers.DataTableToDictionary(data_t));//行插入 + int SQLI = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where " + + "Dyelot = '"+Dyelot+ "' AND Step = '"+STEP+ "' AND Redye ='"+SYS_REDYE+"' AND State = '101'", null).Tables[0].Rows.Count; + if(SQLI>0) SQLiteHelpers.Update("Dyelot", dat_FR, "Dyelot = '"+Dyelot+ "' AND Step = '"+STEP+ "' AND Redye ='"+SYS_REDYE+"'", null);//行更新 SQLiteHelpers.Close(); //关闭连接 }