Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
37516e883e
4 files changed
+66
-20
No files matched your search
+15
-15
@@ -217,19 +217,22 @@ namespace DyeingComputer.UserClass
|
||||
/**编辑行信息**/
|
||||
DataRow drtt = TechnologicalProcessView.sql.Tables[0].Rows[d - 1];
|
||||
drtt.BeginEdit();
|
||||
drtt["StepID"] = dat_821.GetValue("STEPID").ToString();
|
||||
drtt["StepName"] = dat_821.GetValue("STEPNAME").ToString();
|
||||
drtt["ParameterName"] = dat_821.GetValue("PNAME").ToString();
|
||||
drtt["Parameter1"] = dat_821.GetValue("P1").ToString();
|
||||
drtt["Parameter2"] = dat_821.GetValue("P2").ToString();
|
||||
drtt["Parameter3"] = dat_821.GetValue("P3").ToString();
|
||||
drtt["Parameter4"] = dat_821.GetValue("P4").ToString();
|
||||
drtt["Parameter5"] = dat_821.GetValue("P5").ToString();
|
||||
drtt["StepID"] = dat_821.GetValue("StepID").ToString();
|
||||
drtt["StepName"] = dat_821.GetValue("StepName").ToString();
|
||||
drtt["ParameterName"] = dat_821.GetValue("ParameterName").ToString();
|
||||
drtt["Parameter1"] = dat_821.GetValue("Parameter1").ToString();
|
||||
drtt["Parameter2"] = dat_821.GetValue("Parameter2").ToString();
|
||||
drtt["Parameter3"] = dat_821.GetValue("Parameter3").ToString();
|
||||
drtt["Parameter4"] = dat_821.GetValue("Parameter4").ToString();
|
||||
drtt["Parameter5"] = dat_821.GetValue("Parameter5").ToString();
|
||||
|
||||
drtt["RUN"] = "0";
|
||||
drtt["DYELOT"] = MainWindowViewModel.WorkNumder;
|
||||
drtt.EndEdit();
|
||||
|
||||
var _TechnologicalProcessView = Application.Current.Windows.Cast<UserControl>().FirstOrDefault(window => window is TechnologicalProcessView) as TechnologicalProcessView;//跨页面
|
||||
_TechnologicalProcessView.Grid.ItemsSource = TechnologicalProcessView.sql.Tables[0].DefaultView;
|
||||
_TechnologicalProcessView.Grid.SelectedIndex = -1;
|
||||
// var _TechnologicalProcessView = Application.Current.Windows.Cast<UserControl>().FirstOrDefault(window => window is TechnologicalProcessView) as TechnologicalProcessView;//跨页面
|
||||
// _TechnologicalProcessView.Grid.ItemsSource = TechnologicalProcessView.sql.Tables[0].DefaultView;
|
||||
//_TechnologicalProcessView.Grid.SelectedIndex = -1;
|
||||
/**存入信息**/
|
||||
TechnologicalProcessView.SQLiteHelpers.Delete("RUN", null, null);
|
||||
DataTable data_t = new DataTable();
|
||||
@@ -244,9 +247,6 @@ namespace DyeingComputer.UserClass
|
||||
DataRow drT = data_t.NewRow();
|
||||
drT.ItemArray = dt.ItemArray;
|
||||
data_t.Rows.InsertAt(drT, 0);
|
||||
drT.BeginEdit(); //添加订单号
|
||||
drT["DYELOT"] = MainWindowViewModel.WorkNumder;
|
||||
drT.EndEdit();
|
||||
|
||||
TechnologicalProcessView.SQLiteHelpers.InsertData("RUN", TechnologicalProcessView.SQLiteHelpers.DataTableToDictionary(data_t));//行插入
|
||||
}
|
||||
@@ -349,7 +349,7 @@ namespace DyeingComputer.UserClass
|
||||
if (SYSKEY == MainWindowViewModel.SYSKEY)
|
||||
{
|
||||
|
||||
client.SendAsync("SC831" + "[" + MainWindowViewModel.S01 + "]" +TechnologicalProcessView.sql.Tables[0].ToJsonString());
|
||||
client.SendAsync("SC831" + "[" + MainWindowViewModel.S01 + "]" +MainWindowViewModel.dt_TP.ToJsonString());
|
||||
}
|
||||
else { client.SendAsync("SC999"); }
|
||||
}//当前工作表
|
||||
|
||||
Reference in new issue
Block a user