diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 5cb53d2..ffc9faa 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -68,13 +68,13 @@ namespace DyeingComputer if (!result_WorkorderSteps) LogGing.LogGingDATA("Master_WorkorderSteps_Table_Loss"); if (!result_System || !result_IOName || !result_ProgramName || !result_ProgramSteps || !result_RUN || !result_Dyelot || !result_Parameters || !result_WorkOrder || !result_WorkorderSteps) { - SQLiteHelpers.Close(); + // SQLiteHelpers.Close(); MessageBox.Show(Properties.Resources.SysDatLoss); return true; } else { - SQLiteHelpers.Close(); + // SQLiteHelpers.Close(); return false; } diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index 74cbf75..36e8e6a 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -69,8 +69,8 @@ namespace DyeingComputer.UserClass public static string[] Prohibit = new string[10] { "S01", "S02", "S03", "S05", "S06", "S07", "SL1", "SL2", "SL3", ""};//禁止操作的指令 - public static SQLiteHelper SQLiteHelpers = null; //定义数据库 - public static readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + // public static SQLiteHelper SQLiteHelpers = null; //定义数据库 + // public static readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 public static async Task Main() { NetFwManger.AllowPort(7790,"TCP");//开放7790端口 @@ -263,11 +263,11 @@ namespace DyeingComputer.UserClass else if (dat_821.GetValue("INSTRUCTION").ToString() == "INSERT") { int d = Convert.ToInt16(dat_821.GetValue("ID")); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 /**插入行**/ - string ProgramID = SQLiteHelpers.ExecuteScalar("select ProgramID from RUN where Step = '1'", null).ToString(); - string ProgramNAME = SQLiteHelpers.ExecuteScalar("select Program from RUN where Step = '1'", null).ToString(); + string ProgramID = MainWindow.SQLiteHelpers.ExecuteScalar("select ProgramID from RUN where Step = '1'", null).ToString(); + string ProgramNAME = MainWindow.SQLiteHelpers.ExecuteScalar("select Program from RUN where Step = '1'", null).ToString(); // TechnologicalProcessView.SQLiteHelpers.Close(); DataRow dr = MainWindowViewModel.dt_TP.NewRow();//添加表数据 dr["ProgramID"] = ProgramID; @@ -298,7 +298,7 @@ namespace DyeingComputer.UserClass /**存入信息**/ // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 // SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Delete("RUN", null, null); + MainWindow.SQLiteHelpers.Delete("RUN", null, null); DataTable data_t = MainWindowViewModel.dt_TP.Clone(); for (int i = 0; i < MainWindowViewModel.dt_TP.Rows.Count; i++) { @@ -312,9 +312,9 @@ namespace DyeingComputer.UserClass drT["DYELOT"] = MainWindowViewModel.WorkNumder; drT.EndEdit(); - SQLiteHelpers.InsertData("RUN", SQLiteHelpers.DataTableToDictionary(data_t));//行插入 + MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.DataTableToDictionary(data_t));//行插入 } - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 client.SendAsync("SC831" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_TP.ToJsonString()); MainWindowViewModel.TX++; @@ -339,9 +339,9 @@ namespace DyeingComputer.UserClass // _TechnologicalProcessView.Grid.ItemsSource = TechnologicalProcessView.sql.Tables[0].DefaultView; _TechnologicalProcessView.GridSTEP.SelectedIndex = -1; /**存入信息**/ - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Delete("RUN", null, null); + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Delete("RUN", null, null); DataTable data_t = MainWindowViewModel.dt_TP.Clone(); for (int i = 0; i < MainWindowViewModel.dt_TP.Rows.Count; i++) { @@ -355,9 +355,9 @@ namespace DyeingComputer.UserClass drT["DYELOT"] = MainWindowViewModel.WorkNumder; drT.EndEdit(); - SQLiteHelpers.InsertData("RUN", SQLiteHelpers.DataTableToDictionary(data_t));//行插入 + MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.DataTableToDictionary(data_t));//行插入 } - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 client.SendAsync("SC831" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_TP.ToJsonString()); MainWindowViewModel.TX++; @@ -368,9 +368,9 @@ namespace DyeingComputer.UserClass MainWindowViewModel.dt_TP.Rows.RemoveAt(d - 1); TechnologicalProcessView.Dat(); /**存入信息**/ - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Delete("RUN", null, null); + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Delete("RUN", null, null); DataTable data_t = MainWindowViewModel.dt_TP.Clone(); for (int i = 0; i < MainWindowViewModel.dt_TP.Rows.Count; i++) { @@ -384,9 +384,9 @@ namespace DyeingComputer.UserClass drT["DYELOT"] = MainWindowViewModel.WorkNumder; drT.EndEdit(); - SQLiteHelpers.InsertData("RUN", SQLiteHelpers.DataTableToDictionary(data_t));//行插入 + MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.DataTableToDictionary(data_t));//行插入 } - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 client.SendAsync("SC831" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_TP.ToJsonString()); MainWindowViewModel.TX++; @@ -407,12 +407,12 @@ namespace DyeingComputer.UserClass { try { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 string sql_script = "select * from Dyelot where State = '201' AND WorkOrder = '" + MainWindowViewModel.WorkNumder + "'"; - DataTable dt = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //转换 - SQLiteHelpers.Close(); //关闭连接 + DataTable dt = MainWindow.SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //转换 + //SQLiteHelpers.Close(); //关闭连接 client.SendAsync("SC827" + "[" + MainWindowViewModel.S01 + "]" + dt.ToJsonString()); MainWindowViewModel.TX++; @@ -430,8 +430,8 @@ namespace DyeingComputer.UserClass Dictionary Dyelot_dat; Dyelot_dat = SerializeConvert.JsonDeserializeFromString>(SYSDAT); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 Dictionary Product_data = new Dictionary();//缓存函数 Product_data.Add("State", Dyelot_dat.GetValue("State")); @@ -440,17 +440,17 @@ namespace DyeingComputer.UserClass Product_data.Add("Amount", Dyelot_dat.GetValue("Amount")); Product_data.Add("DispenseEndTime", Dyelot_dat.GetValue("DispenseEndTime")); } - SQLiteHelpers.Update("Dyelot", Product_data, "Dyelot ='" + Dyelot_dat.GetValue("Dyelot") + MainWindow.SQLiteHelpers.Update("Dyelot", Product_data, "Dyelot ='" + Dyelot_dat.GetValue("Dyelot") + "' AND Step ='" + Dyelot_dat.GetValue("Step") + "' AND ProductCode='" + Dyelot_dat.GetValue("ProductCode") + "'", null); - MainWindowViewModel.Dyelot_dat = SQLiteHelpers.ExecuteDataSet( + MainWindowViewModel.Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet( "select * from Dyelot where WorkOrder = '" + MainWindowViewModel.WorkNumder + "'", null).Tables[0]; - int dt = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Dyelot='" + + int dt = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Dyelot='" + Dyelot_dat.GetValue("Dyelot") + "' AND State ='201'", null).Tables[0].Rows.Count; if (dt == 0) MainWindowViewModel.CALL_FR = false; - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 client.SendAsync("SC828" + SYSKEY + SYSDAT); MainWindowViewModel.TX++; @@ -574,11 +574,11 @@ namespace DyeingComputer.UserClass { try { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 string sql_script = "select * from Dyelot where WorkOrder = '" + MainWindowViewModel.WorkNumder + "'"; - DataTable dt = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //转换 - SQLiteHelpers.Close(); //关闭连接 + DataTable dt = MainWindow.SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //转换 + // SQLiteHelpers.Close(); //关闭连接 client.SendAsync("SC833" + "[" + MainWindowViewModel.S01 + "]" + dt.ToJsonString()); MainWindowViewModel.TX++; @@ -656,17 +656,18 @@ namespace DyeingComputer.UserClass { try { + SQLiteHelper SQLiteHelpersLOG = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径 Dictionary dat_859; dat_859 = SerializeConvert.JsonDeserializeFromString>(SYSDAT); if (dat_859.GetValue("INSTRUCTION").ToString() == "SERVER") { - SQLiteHelpers = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - DataTable dt_ = SQLiteHelpers.ExecuteDataSet("select * from SERVER where TIME >"+ + //SQLiteHelper SQLiteHelpersLOG = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径 + SQLiteHelpersLOG.Open(); //打开数据库 + DataTable dt_ = SQLiteHelpersLOG.ExecuteDataSet("select * from SERVER where TIME >"+ DateTime.Parse(dat_859.GetValue("TIME_S").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "TIME <"+ DateTime.Parse(dat_859.GetValue("TIME_E").ToString()).ToString("yyyy/MM/dd HH:mm:ss"), null).Tables[0]; - SQLiteHelpers.Close();//关闭数据库 + SQLiteHelpersLOG.Close();//关闭数据库 client.SendAsync("SC859" + "[" + MainWindowViewModel.S01 + "]" + dt_.ToJsonString());//缓存信息 @@ -674,12 +675,12 @@ namespace DyeingComputer.UserClass } else if (dat_859.GetValue("INSTRUCTION").ToString() == "OperationLog") { - SQLiteHelpers = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - DataTable dt_ = SQLiteHelpers.ExecuteDataSet("select * from OperationLog where TIME >" + + //SQLiteHelpers = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径 + SQLiteHelpersLOG.Open(); //打开数据库 + DataTable dt_ = SQLiteHelpersLOG.ExecuteDataSet("select * from OperationLog where TIME >" + DateTime.Parse(dat_859.GetValue("TIME_S").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "TIME <" + DateTime.Parse(dat_859.GetValue("TIME_E").ToString()).ToString("yyyy/MM/dd HH:mm:ss"), null).Tables[0]; - SQLiteHelpers.Close();//关闭数据库 + SQLiteHelpersLOG.Close();//关闭数据库 client.SendAsync("SC859" + "[" + MainWindowViewModel.S01 + "]" + dt_.ToJsonString());//缓存信息 @@ -687,12 +688,12 @@ namespace DyeingComputer.UserClass } else if (dat_859.GetValue("INSTRUCTION").ToString() == "IOLog") { - SQLiteHelpers = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - DataTable dt_ = SQLiteHelpers.ExecuteDataSet("select * from IOLog where TIME >" + + //SQLiteHelpers = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径 + SQLiteHelpersLOG.Open(); //打开数据库 + DataTable dt_ = SQLiteHelpersLOG.ExecuteDataSet("select * from IOLog where TIME >" + DateTime.Parse(dat_859.GetValue("TIME_S").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "TIME <" + DateTime.Parse(dat_859.GetValue("TIME_E").ToString()).ToString("yyyy/MM/dd HH:mm:ss"), null).Tables[0]; - SQLiteHelpers.Close();//关闭数据库 + SQLiteHelpersLOG.Close();//关闭数据库 client.SendAsync("SC859" + "[" + MainWindowViewModel.S01 + "]" + dt_.ToJsonString());//缓存信息 @@ -700,12 +701,12 @@ namespace DyeingComputer.UserClass } else if (dat_859.GetValue("INSTRUCTION").ToString() == "ERRLog") { - SQLiteHelpers = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - DataTable dt_ = SQLiteHelpers.ExecuteDataSet("select * from ERRLog where TIME >" + + //SQLiteHelpers = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径 + SQLiteHelpersLOG.Open(); //打开数据库 + DataTable dt_ = SQLiteHelpersLOG.ExecuteDataSet("select * from ERRLog where TIME >" + DateTime.Parse(dat_859.GetValue("TIME_S").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "TIME <" + DateTime.Parse(dat_859.GetValue("TIME_E").ToString()).ToString("yyyy/MM/dd HH:mm:ss"), null).Tables[0]; - SQLiteHelpers.Close();//关闭数据库 + SQLiteHelpersLOG.Close();//关闭数据库 client.SendAsync("SC859" + "[" + MainWindowViewModel.S01 + "]" + dt_.ToJsonString());//缓存信息 @@ -731,11 +732,11 @@ namespace DyeingComputer.UserClass Dictionary datagrid_v = new Dictionary();//缓存函数 datagrid_v.Add("Value", dat_861.GetValue("Value")); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Update("Parameters", datagrid_v, "ParameterID ='" + dat_861.GetValue("ID") + "'", null);//更新 - MainWindowViewModel.dt_ParameterSet = SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0]; - SQLiteHelpers.Close();//关闭数据库 + // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Update("Parameters", datagrid_v, "ParameterID ='" + dat_861.GetValue("ID") + "'", null);//更新 + MainWindowViewModel.dt_ParameterSet = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0]; + //SQLiteHelpers.Close();//关闭数据库 client.SendAsync("SC854" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_ParameterSet.ToJsonString());//缓存信息 @@ -766,11 +767,11 @@ namespace DyeingComputer.UserClass Dictionary datagrid_v = new Dictionary();//缓存函数 datagrid_v.Add("Value", dat_862.GetValue("Value")); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Update("System", datagrid_v, "ParameterID ='" + dat_862.GetValue("ID") + "'", null);//更新 - MainWindowViewModel.dt_SysSet = SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0]; - SQLiteHelpers.Close();//关闭数据库 + // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Update("System", datagrid_v, "ParameterID ='" + dat_862.GetValue("ID") + "'", null);//更新 + MainWindowViewModel.dt_SysSet = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0]; + //SQLiteHelpers.Close();//关闭数据库 client.SendAsync("SC855" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_SysSet.ToJsonString());//缓存信息 diff --git a/UserClass/LogGing.cs b/UserClass/LogGing.cs index b53370c..8a1f6c1 100644 --- a/UserClass/LogGing.cs +++ b/UserClass/LogGing.cs @@ -10,8 +10,8 @@ namespace DyeingComputer.UserClass { public class LogGing { - private static SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly static string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + // private static SQLiteHelper SQLiteHelpers = null; //定义数据库 + // private readonly static string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 public static bool sqld=false; public static void LogGingDATA(string dat) { @@ -52,7 +52,7 @@ namespace DyeingComputer.UserClass if (!sqld) { sqld = true; - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 string Log_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); Dictionary logsql = new Dictionary(); // 添加元素 @@ -60,9 +60,9 @@ namespace DyeingComputer.UserClass logsql.Add("API", api); logsql.Add("MESSAGE", dat); logsql.Add("TIME", Log_time); - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.InsertData("SERVER", logsql);//行插入 - SQLiteHelpers.Close(); //关闭连接 + // SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.InsertData("SERVER", logsql);//行插入 + //SQLiteHelpers.Close(); //关闭连接 sqld = false; } } diff --git a/UserClass/SQLDATA.cs b/UserClass/SQLDATA.cs index 6deb357..e976b1d 100644 --- a/UserClass/SQLDATA.cs +++ b/UserClass/SQLDATA.cs @@ -14,18 +14,18 @@ namespace DyeingComputer.UserClass { public class SQLDATA { - private static SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly static string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + // private static SQLiteHelper SQLiteHelpers = null; //定义数据库 + // private readonly static string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 //WorkOrder表检查写入 public static bool WorkOrder(string WorkOrder, string ProgramName, string StartTime, string EndTime, string Time, string Remark,string lock_,string state,string ProgramID, string color,string dyelot) { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - object i = SQLiteHelpers.ExecuteScalar("select * from WorkOrder where WorkOrder = "+ WorkOrder,null); + // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 + object i = MainWindow.SQLiteHelpers.ExecuteScalar("select * from WorkOrder where WorkOrder = "+ WorkOrder,null); if (i!=null) { - SQLiteHelpers.Close(); + //SQLiteHelpers.Close(); return false; } Dictionary WorkOrder_new = new Dictionary();//缓存函数 @@ -40,59 +40,59 @@ namespace DyeingComputer.UserClass WorkOrder_new.Add("ProgramID", ProgramID); WorkOrder_new.Add("color", color); WorkOrder_new.Add("Dyelot", dyelot); - SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new); - SQLiteHelpers.Close(); + MainWindow.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new); + //SQLiteHelpers.Close(); return true; } public static bool WorkOderStep(DataTable WorkOrderStep_) { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 int a = WorkOrderStep_.Rows.Count; if (a < 1) { - SQLiteHelpers.Close(); + MainWindow.SQLiteHelpers.Close(); return false; } string Program = WorkOrderStep_.Rows[0][0].ToString(); - object n = SQLiteHelpers.ExecuteScalar("select * from WorkorderSteps where Program = " + Program, null); + object n = MainWindow.SQLiteHelpers.ExecuteScalar("select * from WorkorderSteps where Program = " + Program, null); if (n != null)//如id存在着返回错误状态 { - SQLiteHelpers.Close(); + //SQLiteHelpers.Close(); return false; } for (int i = 0; i < a; i++) - { - SQLiteHelpers.InsertData("WorkorderSteps", SQLiteHelpers.ToDictionary(WorkOrderStep_.Rows[i]));//行插入 + { + MainWindow.SQLiteHelpers.InsertData("WorkorderSteps", MainWindow.SQLiteHelpers.ToDictionary(WorkOrderStep_.Rows[i]));//行插入 } - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 return true; } public static void TechnologicalProcess_START(string workName) { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 int r = 0; string sql_script = "select * from WorkorderSteps where ProgramID = '" + workName + "'"; // if (TechnologicalProcessView.sql != null) TechnologicalProcessView.sql.Clear(); //清空缓存 - MainWindowViewModel.dt_TP = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //读取表写入缓存 - MainWindowViewModel.ProgramName = SQLiteHelpers.ExecuteScalar("select ProgramName from Workorder where ProgramID = '" + workName + "'", null).ToString(); + MainWindowViewModel.dt_TP = MainWindow.SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //读取表写入缓存 + MainWindowViewModel.ProgramName = MainWindow.SQLiteHelpers.ExecuteScalar("select ProgramName from Workorder where ProgramID = '" + workName + "'", null).ToString(); - SQLiteHelpers.Delete("RUN", null, null); //删除run信息 + MainWindow.SQLiteHelpers.Delete("RUN", null, null); //删除run信息 int a = MainWindowViewModel.dt_TP.Rows.Count; for (int i = 0; i < a; i++) { - SQLiteHelpers.InsertData("RUN", SQLiteHelpers.ToDictionary(MainWindowViewModel.dt_TP.Rows[i]));//行插入 + MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(MainWindowViewModel.dt_TP.Rows[i]));//行插入 } //数据插入 - MainWindowViewModel.WorkNumder = SQLiteHelpers.ExecuteDataSet("select WorkOrder from Workorder where ProgramID = '" + workName + "'", null);; + MainWindowViewModel.WorkNumder = MainWindow.SQLiteHelpers.ExecuteDataSet("select WorkOrder from Workorder where ProgramID = '" + workName + "'", null);; TechnologicalProcessView.workName = workName; MainWindowViewModel.SYS_REDYE = 0; MainWindowViewModel.ViewID = 1; - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 } public static bool Dyelot(DataTable Dyelot_)//领料单 @@ -127,19 +127,19 @@ namespace DyeingComputer.UserClass int a = DyelotTable.Rows.Count; if (a < 1) return false; string Dyelot = DyelotTable.Rows[0][0].ToString(); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - object n = SQLiteHelpers.ExecuteScalar("select * from Dyelot where Dyelot = " + Dyelot, null); + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + object n = MainWindow.SQLiteHelpers.ExecuteScalar("select * from Dyelot where Dyelot = " + Dyelot, null); if (n != null)//如id存在着返回错误状态 { - SQLiteHelpers.Close(); + //SQLiteHelpers.Close(); return false; } for (int i = 0; i < a; i++) { - SQLiteHelpers.InsertData("Dyelot", SQLiteHelpers.ToDictionary(DyelotTable.Rows[i]));//行插入 + MainWindow.SQLiteHelpers.InsertData("Dyelot", MainWindow.SQLiteHelpers.ToDictionary(DyelotTable.Rows[i]));//行插入 } - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 return true; } diff --git a/View/HistoryRecordsView.xaml.cs b/View/HistoryRecordsView.xaml.cs index c9568f6..5512c9a 100644 --- a/View/HistoryRecordsView.xaml.cs +++ b/View/HistoryRecordsView.xaml.cs @@ -26,18 +26,18 @@ namespace DyeingComputer.View /// public partial class HistoryRecordsView : UserControl { - private SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + // private SQLiteHelper SQLiteHelpers = null; //定义数据库 + // private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 DataTable GRIDDB = new DataTable(); public HistoryRecordsView() { InitializeComponent(); DataContext = new HistoryRecordsViewModel(); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - GRIDDB = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime > '" + DateTime.Now.AddDays(-30).ToString("yyyy/MM/dd HH:mm:ss") + "order by StartTime'", null).Tables[0]; - SQLiteHelpers.Close(); + // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 + GRIDDB = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime > '" + DateTime.Now.AddDays(-30).ToString("yyyy/MM/dd HH:mm:ss") + "order by StartTime'", null).Tables[0]; + // SQLiteHelpers.Close(); gridH.ItemsSource = GRIDDB.DefaultView; } diff --git a/View/InOutView.xaml.cs b/View/InOutView.xaml.cs index 1da20fe..61939f9 100644 --- a/View/InOutView.xaml.cs +++ b/View/InOutView.xaml.cs @@ -28,8 +28,8 @@ namespace DyeingComputer.View { InitializeComponent(); } - private SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + // private SQLiteHelper SQLiteHelpers = null; //定义数据库 + //private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 private void Grid_D_SelectionChanged(object sender, SelectionChangedEventArgs e) { @@ -59,10 +59,10 @@ namespace DyeingComputer.View Dictionary datagrid_v = new Dictionary();//缓存函数 datagrid_v.Add("PLC", newValue); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Update("IOName", datagrid_v, "ID ='" + ID + "'", null);//更新 - SQLiteHelpers.Close();//关闭数据库 + // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Update("IOName", datagrid_v, "ID ='" + ID + "'", null);//更新 + //SQLiteHelpers.Close();//关闭数据库 } MainWindowViewModel.SQL_data();//重新获得io表 MainWindowViewModel.D_view = true; @@ -85,10 +85,10 @@ namespace DyeingComputer.View Dictionary datagrid_v = new Dictionary();//缓存函数 datagrid_v.Add("PLC", newValue); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Update("IOName", datagrid_v, "ID ='" + ID + "'", null);//更新 - SQLiteHelpers.Close();//关闭数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Update("IOName", datagrid_v, "ID ='" + ID + "'", null);//更新 + //SQLiteHelpers.Close();//关闭数据库 } MainWindowViewModel.SQL_data();//重新获得io表 MainWindowViewModel.A_view = true; diff --git a/View/ParameterSetView.xaml.cs b/View/ParameterSetView.xaml.cs index 022d9e8..4d9daaa 100644 --- a/View/ParameterSetView.xaml.cs +++ b/View/ParameterSetView.xaml.cs @@ -35,16 +35,16 @@ namespace DyeingComputer.View set_sql(); } - private SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + //private SQLiteHelper SQLiteHelpers = null; //定义数据库 + //private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 public void set_sql() { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - MainWindowViewModel.dt_ParameterSet = SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0]; //读取计划表写入缓存 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindowViewModel.dt_ParameterSet = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0]; //读取计划表写入缓存 if (MainWindowViewModel.dt_ParameterSet.Rows.Count>0) Grid.ItemsSource = MainWindowViewModel.dt_ParameterSet.DefaultView; //转换显示计划表 - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 } @@ -60,11 +60,11 @@ namespace DyeingComputer.View Dictionary datagrid_v = new Dictionary();//缓存函数 datagrid_v.Add("Value", newValue); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Update("Parameters", datagrid_v, "ParameterID ='" + ID + "'", null);//更新 - MainWindowViewModel.dt_ParameterSet = SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0]; //读取计划表写入缓存 - SQLiteHelpers.Close();//关闭数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Update("Parameters", datagrid_v, "ParameterID ='" + ID + "'", null);//更新 + MainWindowViewModel.dt_ParameterSet = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0]; //读取计划表写入缓存 + //SQLiteHelpers.Close();//关闭数据库 } MainWindowViewModel.set_ = true; } diff --git a/View/ProgramgroupView.xaml.cs b/View/ProgramgroupView.xaml.cs index dd6284f..63fc36b 100644 --- a/View/ProgramgroupView.xaml.cs +++ b/View/ProgramgroupView.xaml.cs @@ -32,22 +32,22 @@ namespace DyeingComputer.View Programgroup_sql(); } - private SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + //private SQLiteHelper SQLiteHelpers = null; //定义数据库 + //private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 DataSet sql; //内存数据缓存 public void Programgroup_sql() { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 string sql_script = "select * from ProgramName order by ProgramID desc"; if (sql != null) sql.Clear(); //清空缓存 - sql = SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取计划表写入缓存 + sql = MainWindow.SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取计划表写入缓存 if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表 - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 //sql.Clear(); //清除缓存 //System.GC.Collect(); @@ -84,10 +84,10 @@ namespace DyeingComputer.View Program_new.Add("Time", "0:00"); Program_new.Add("Notes", null); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.InsertData("ProgramName", Program_new);// 执行插入 - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.InsertData("ProgramName", Program_new);// 执行插入 + //SQLiteHelpers.Close(); //关闭连接 Programgroup_Numder = VALUE; Programgroup_ID = ID; @@ -103,10 +103,10 @@ namespace DyeingComputer.View System.Windows.Forms.MessageBoxButtons.OKCancel, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.OK) { ///执行删除 - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Delete("ProgramName", "ProgramID='" + Programgroup_ID + "'", null); - SQLiteHelpers.Close(); + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Delete("ProgramName", "ProgramID='" + Programgroup_ID + "'", null); + //SQLiteHelpers.Close(); Programgroup_sql(); } Programgroup_Numder = null; @@ -129,10 +129,10 @@ namespace DyeingComputer.View Dictionary Program_Rename = new Dictionary();//缓存函数 Program_Rename.Add("ProgramName", VALUE); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Update("ProgramName", Program_Rename, "ProgramID='"+ Programgroup_ID + "'",null); - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Update("ProgramName", Program_Rename, "ProgramID='"+ Programgroup_ID + "'",null); + //SQLiteHelpers.Close(); //关闭连接 Programgroup_sql(); Programgroup_Numder = null; @@ -155,10 +155,10 @@ namespace DyeingComputer.View Dictionary Program_Remark = new Dictionary();//缓存函数 Program_Remark.Add("Notes", VALUE); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Update("ProgramName", Program_Remark, "ProgramID='" + Programgroup_ID + "'", null); - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Update("ProgramName", Program_Remark, "ProgramID='" + Programgroup_ID + "'", null); + //SQLiteHelpers.Close(); //关闭连接 Programgroup_sql(); Programgroup_Numder = null; diff --git a/View/ProgramstepsView .xaml.cs b/View/ProgramstepsView .xaml.cs index 7ee1440..10831d8 100644 --- a/View/ProgramstepsView .xaml.cs +++ b/View/ProgramstepsView .xaml.cs @@ -45,8 +45,8 @@ namespace DyeingComputer.View Programgroup_sql(); } - private SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + //private SQLiteHelper SQLiteHelpers = null; //定义数据库 + //private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 DataSet sql; //内存数据缓存 string ProgramID; @@ -54,13 +54,13 @@ namespace DyeingComputer.View public void Programgroup_sql() { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 string sql_script = "select * from ProgramSteps where ProgramID='" + ProgramID + "' order by Step asc"; if (sql != null) sql.Clear(); //清空缓存 - sql = SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取计划表写入缓存 + sql = MainWindow.SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取计划表写入缓存 //sql.Tables[0].Rows.Add(datatable_t); DataRow dr = sql.Tables[0].NewRow();//添加表数据 dr["ProgramID"] = ProgramID; @@ -68,7 +68,7 @@ namespace DyeingComputer.View sql.Tables[0].Rows.Add(dr); Dat(); if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表 - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 //sql.Clear(); //清除缓存 //System.GC.Collect(); @@ -258,9 +258,9 @@ namespace DyeingComputer.View { int r = 0; - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Delete("ProgramSteps", "ProgramID = '" + ProgramID + "'", null); + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Delete("ProgramSteps", "ProgramID = '" + ProgramID + "'", null); DataTable data_t = new DataTable(); data_t = sql.Tables[0].Clone(); @@ -275,14 +275,14 @@ namespace DyeingComputer.View dr.ItemArray = dt.ItemArray; data_t.Rows.InsertAt(dr, 0); - r = SQLiteHelpers.InsertData("ProgramSteps", SQLiteHelpers.DataTableToDictionary(data_t));//行插入 + r = MainWindow.SQLiteHelpers.InsertData("ProgramSteps", MainWindow.SQLiteHelpers.DataTableToDictionary(data_t));//行插入 } Dictionary Program_Step = new Dictionary();//缓存函数 Program_Step.Add("Step", a-1); - SQLiteHelpers.Update("ProgramName", Program_Step, "ProgramID='" + ProgramID + "'", null); + MainWindow.SQLiteHelpers.Update("ProgramName", Program_Step, "ProgramID='" + ProgramID + "'", null); - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 if (r != 0) { System.Windows.Forms.MessageBox.Show(ProgramNAME, Properties.Resources.Save); diff --git a/View/SysSetView.xaml.cs b/View/SysSetView.xaml.cs index 0fdc940..6f744a0 100644 --- a/View/SysSetView.xaml.cs +++ b/View/SysSetView.xaml.cs @@ -30,16 +30,16 @@ namespace DyeingComputer.View set_sql(); } - private SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + //private SQLiteHelper SQLiteHelpers = null; //定义数据库 + //private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 public void set_sql() { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - MainWindowViewModel.dt_SysSet = SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0]; //读取计划表写入缓存 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindowViewModel.dt_SysSet = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0]; //读取计划表写入缓存 if (MainWindowViewModel.dt_SysSet.Rows.Count>0) Grid.ItemsSource = MainWindowViewModel.dt_SysSet.DefaultView; //转换显示计划表 - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 } @@ -55,11 +55,11 @@ namespace DyeingComputer.View Dictionary datagrid_v = new Dictionary();//缓存函数 datagrid_v.Add("Value", newValue); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Update("System", datagrid_v, "ParameterID ='" + ID + "'", null);//更新 - MainWindowViewModel.dt_SysSet = SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0]; - SQLiteHelpers.Close();//关闭数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Update("System", datagrid_v, "ParameterID ='" + ID + "'", null);//更新 + MainWindowViewModel.dt_SysSet = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0]; + //SQLiteHelpers.Close();//关闭数据库 } MainWindowViewModel.set_ = true; diff --git a/View/TechnologicalProcessView.xaml.cs b/View/TechnologicalProcessView.xaml.cs index caa52e0..7b7ae98 100644 --- a/View/TechnologicalProcessView.xaml.cs +++ b/View/TechnologicalProcessView.xaml.cs @@ -249,12 +249,12 @@ namespace DyeingComputer.View { Receip.Visibility = Visibility.Visible; Parameter_set.Visibility = Visibility.Collapsed; - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 string sql_script = "select * from Dyelot where WorkOrder = '" + MainWindowViewModel.WorkNumder + "'"; - MainWindowViewModel.Dyelot_dat = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //转换显示 + MainWindowViewModel.Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //转换显示 Receip.ItemsSource = MainWindowViewModel.Dyelot_dat.DefaultView; - SQLiteHelpers.Close(); //关闭连接 + // SQLiteHelpers.Close(); //关闭连接 } private void ParameterSet_Click(object sender, RoutedEventArgs e)//参数 { @@ -263,8 +263,8 @@ namespace DyeingComputer.View } DataTable tblDatas = new DataTable("Datas"); public static object workName; - public static SQLiteHelper SQLiteHelpers = null; //定义数据库 - public static readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + // public static SQLiteHelper SQLiteHelpers = null; //定义数据库 + // public static readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 //public static DataSet sql; //内存数据缓存 string Numder = null; string ID = null; @@ -303,17 +303,17 @@ namespace DyeingComputer.View }*/ private void TechnologicalProcess_sql() { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 string sql_script = "select * from RUN"; - MainWindowViewModel.dt_TP = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //读取表写入缓存 + MainWindowViewModel.dt_TP = MainWindow.SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //读取表写入缓存 try { - MainWindowViewModel.ProgramName = SQLiteHelpers.ExecuteScalar("select Program from RUN where Step = '1'", null).ToString(); - MainWindowViewModel.WorkNumder = SQLiteHelpers.ExecuteScalar("select WorkOrder from RUN where Step = '1'", null).ToString(); + MainWindowViewModel.ProgramName = MainWindow.SQLiteHelpers.ExecuteScalar("select Program from RUN where Step = '1'", null).ToString(); + MainWindowViewModel.WorkNumder = MainWindow.SQLiteHelpers.ExecuteScalar("select WorkOrder from RUN where Step = '1'", null).ToString(); } catch (Exception) { } - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 // if (sql != null) } private void UserControl_Loaded(object sender, RoutedEventArgs e) @@ -381,18 +381,18 @@ namespace DyeingComputer.View MainWindowViewModel.User_Button = true; return; } - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Delete("RUN", null, null); + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Delete("RUN", null, null); for (int i = 0; i < MainWindowViewModel.dt_TP.Rows.Count; i++) { DataRow dt = MainWindowViewModel.dt_TP.Rows[i];//行转换 dt.BeginEdit(); //添加订单号 dt["DYELOT"] = MainWindowViewModel.Dyelot; dt.EndEdit(); - SQLiteHelpers.InsertData("RUN", SQLiteHelpers.ToDictionary(dt));//行插入 + MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dt));//行插入 } - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "EDIT STEP = " + n, "StepID=" + e.StepID + ";StepName=" + e.StepNAME + ";P=" + string.Join(",", e.Row_DAT.ItemArray)); MainWindowViewModel.User_Button = true; @@ -418,9 +418,9 @@ namespace DyeingComputer.View Dat(); GridSTEP.SelectedIndex = -1; - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Delete("RUN", null, null); + // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Delete("RUN", null, null); DataTable data_t = MainWindowViewModel.dt_TP.Clone(); a = MainWindowViewModel.dt_TP.Rows.Count; for (int i = 0; i < a; i++) @@ -433,20 +433,20 @@ namespace DyeingComputer.View drT.BeginEdit(); //添加订单号 drT["DYELOT"] = MainWindowViewModel.WorkNumder; drT.EndEdit(); - SQLiteHelpers.InsertData("RUN", SQLiteHelpers.DataTableToDictionary(data_t));//行插入 + MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.DataTableToDictionary(data_t));//行插入 } - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "Delete", "STEP = " + ID); MainWindowViewModel.User_Button = true; } private void ProgramgroupView_Insert_Click(object sender, RoutedEventArgs e)//插入 { int d = 0; - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - string ProgramID = SQLiteHelpers.ExecuteScalar("select ProgramID from RUN where Step = '1'", null).ToString(); - string ProgramNAME = SQLiteHelpers.ExecuteScalar("select Program from RUN where Step = '1'", null).ToString(); - SQLiteHelpers.Close(); + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + string ProgramID = MainWindow.SQLiteHelpers.ExecuteScalar("select ProgramID from RUN where Step = '1'", null).ToString(); + string ProgramNAME = MainWindow.SQLiteHelpers.ExecuteScalar("select Program from RUN where Step = '1'", null).ToString(); + // SQLiteHelpers.Close(); if (ID != null) { d = Convert.ToInt16(ID); } else { return; } DataRow dr = MainWindowViewModel.dt_TP.NewRow();//添加表数据 @@ -545,18 +545,18 @@ namespace DyeingComputer.View MainWindowViewModel.User_Button = true; return; } - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Delete("RUN", null, null); + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Delete("RUN", null, null); for (int i = 0; i < MainWindowViewModel.dt_TP.Rows.Count; i++) { DataRow dt = MainWindowViewModel.dt_TP.Rows[i];//行转换 dt.BeginEdit(); //添加订单号 dt["DYELOT"] = MainWindowViewModel.Dyelot; dt.EndEdit(); - SQLiteHelpers.InsertData("RUN", SQLiteHelpers.ToDictionary(dt));//行插入 + MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dt));//行插入 } - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "Insert STEP = " + n, "StepID=" + e.StepID + ";StepName=" + e.StepNAME + ";P=" + string.Join(",", e.Row_DAT.ItemArray)); MainWindowViewModel.User_Button = true; diff --git a/View/WorkOrderView.xaml.cs b/View/WorkOrderView.xaml.cs index 649bb1e..bf66f61 100644 --- a/View/WorkOrderView.xaml.cs +++ b/View/WorkOrderView.xaml.cs @@ -40,13 +40,13 @@ namespace DyeingComputer.View private void UserControl_Loaded(object sender, RoutedEventArgs e) { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - string S09 = SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S09'", null).ToString(); //读取 - string S10 = SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S10'", null).ToString(); - string S11 = SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S11'", null).ToString(); - string S18 = SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S18'", null).ToString(); - SQLiteHelpers.Close(); + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + string S09 = MainWindow.SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S09'", null).ToString(); //读取 + string S10 = MainWindow.SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S10'", null).ToString(); + string S11 = MainWindow.SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S11'", null).ToString(); + string S18 = MainWindow.SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S18'", null).ToString(); + //SQLiteHelpers.Close(); if (S09 == "0") WorkOrderView_new.IsEnabled = false;//禁止用户新建 if (S10 == "0") WorkOrderView_del.IsEnabled = false; if (S11 == "0") WorkOrderView_redy.IsEnabled = false; @@ -72,8 +72,8 @@ namespace DyeingComputer.View if(!SQL_UPDATE) Workorder_sql(); } - private SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + //private SQLiteHelper SQLiteHelpers = null; //定义数据库 + //private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 DataSet sql; //内存数据缓存 Dictionary updata_temp = new Dictionary();//缓存函数 DataTable dat = new DataTable(); @@ -89,16 +89,16 @@ namespace DyeingComputer.View public void Workorder_sql() { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 string sql_script = "select * from WorkOrder where EndTime > '" + DateTime.Now.AddHours(-8).ToString("yyyy/MM/dd HH:mm:ss") + "'"; if (sql != null) sql.Clear(); //清空缓存 - sql = SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取计划表写入缓存 + sql = MainWindow.SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取计划表写入缓存 if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表 - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 // WorkOrder_Numder = null; // Process_Name = null; @@ -109,20 +109,20 @@ namespace DyeingComputer.View private void WorkOrderView_lock_Click(object sender, RoutedEventArgs e)//锁定按钮 { if (WorkOrder_Numder == null) return; - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 updata_temp.Clear();//使用前清理缓存 if (_lock == "0") //改变lock的状态 { updata_temp.Add("lock", 1); - SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + WorkOrder_Numder + "'", null); + MainWindow.SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + WorkOrder_Numder + "'", null); } else { updata_temp.Add("lock", 0); - SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + WorkOrder_Numder + "'", null); + MainWindow.SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + WorkOrder_Numder + "'", null); } - SQLiteHelpers.Close(); + //SQLiteHelpers.Close(); Workorder_sql(); } @@ -155,12 +155,12 @@ namespace DyeingComputer.View WorkOrder_new.Add("color", "#FFFFFFFF"); WorkOrder_new.Add("USER", MainWindowViewModel.S01); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 /*插入表头信息*/ - SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);// + MainWindow.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);// /*获取转并插入步骤信息*/ - DataTable step_dat = SQLiteHelpers.ExecuteDataSet( + DataTable step_dat = MainWindow.SQLiteHelpers.ExecuteDataSet( "select * from ProgramSteps where ProgramID='" + Process_id + "'", null).Tables[0]; //读取表写入缓存 DataTable _t = step_dat.Clone(); _t.Columns.Add("WorkOrder", System.Type.GetType("System.String")); @@ -178,9 +178,9 @@ namespace DyeingComputer.View dr.EndEdit(); _t.Rows.InsertAt(dr, 0); //行转换 - SQLiteHelpers.InsertData("WorkorderSteps", SQLiteHelpers.DataTableToDictionary(_t));//行插入 + MainWindow.SQLiteHelpers.InsertData("WorkorderSteps", MainWindow.SQLiteHelpers.DataTableToDictionary(_t));//行插入 } - SQLiteHelpers.Close(); + //SQLiteHelpers.Close(); } private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮 { @@ -192,10 +192,10 @@ namespace DyeingComputer.View System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.OK) { ///执行删除 - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Delete("WorkOrder", "WorkOrder='" + WorkOrder_Numder + "'", null); - SQLiteHelpers.Close(); + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Delete("WorkOrder", "WorkOrder='" + WorkOrder_Numder + "'", null); + //SQLiteHelpers.Close(); Workorder_sql(); } SQL_UPDATE = false; @@ -230,11 +230,11 @@ namespace DyeingComputer.View SQL_UPDATE = true; - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - dat = SQLiteHelpers.ExecuteDataSet( + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + dat = MainWindow.SQLiteHelpers.ExecuteDataSet( "select * from WorkorderSteps where WorkOrder='" + WorkOrder_Numder + "'", null).Tables[0]; //读取表写入缓存 - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 inf_cont = 0; TEMP(); @@ -270,11 +270,11 @@ namespace DyeingComputer.View dataGrid.HorizontalGridLinesBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 201, 201, 201)); dataGrid.VerticalGridLinesBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 201, 201, 201)); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 string sql_script = "select * from WorkorderSteps where WorkOrder='" + WorkOrder_Numder + "'"; - DataTable inf = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //读取表写入缓存 - SQLiteHelpers.Close(); //关闭连接 + DataTable inf = MainWindow.SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //读取表写入缓存 + //SQLiteHelpers.Close(); //关闭连接 dataGrid.ItemsSource = inf.DefaultView; //转换显示计划表 Picture.Content = dataGrid; @@ -294,11 +294,11 @@ namespace DyeingComputer.View dataGrid_.HorizontalGridLinesBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 201, 201, 201)); dataGrid_.VerticalGridLinesBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 201, 201, 201)); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 string sql_script = "select * from Workorder where WorkOrder='" + WorkOrder_Numder + "'"; - DataRow inf = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0].Select().First(); //读取表写入缓存 - SQLiteHelpers.Close(); //关闭连接 + DataRow inf = MainWindow.SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0].Select().First(); //读取表写入缓存 + // SQLiteHelpers.Close(); //关闭连接 DataTable dataTable = new DataTable(); dataTable.Columns.Add("NAME", Type.GetType("System.String")); @@ -344,13 +344,13 @@ namespace DyeingComputer.View int a; /*检查并写入run信息*/ - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 - int R_D = SQLiteHelpers.ExecuteDataSet("select * from RUN", null).Tables[0].Rows.Count; //读取表写入缓存 + int R_D = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from RUN", null).Tables[0].Rows.Count; //读取表写入缓存 if (R_D > 0)//判断是否有运行中工艺 { - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 MessageBoxResult messageBoxResult = System.Windows.MessageBox.Show( Properties.Resources.RunningProcess, "800", MessageBoxButton.YesNo); @@ -362,21 +362,21 @@ namespace DyeingComputer.View System.Windows.MessageBox.Show(Properties.Resources.refuse, "800", MessageBoxButton.OK); return; } - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 } } updata_temp.Clear(); //使用前清缓存 updata_temp.Add("State", 205); - SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + WorkOrder_Numder + "'", null); - MainWindowViewModel.Dyelot_dat = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Dyelot = '" + + MainWindow.SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + WorkOrder_Numder + "'", null); + MainWindowViewModel.Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Dyelot = '" + Dyelot + "'", null).Tables[0]; - WorkorderSteps = SQLiteHelpers.ExecuteDataSet( + WorkorderSteps = MainWindow.SQLiteHelpers.ExecuteDataSet( "select * from WorkorderSteps where WorkOrder='" + WorkOrder_Numder + "'", null).Tables[0]; //读取表写入缓存 MainWindowViewModel.ProgramName = Process_Name; MainWindowViewModel.Dyelot = Dyelot; - SQLiteHelpers.Delete("RUN", null, null); //删除run信息 + MainWindow.SQLiteHelpers.Delete("RUN", null, null); //删除run信息 a = WorkorderSteps.Rows.Count; for (int i = 0; i < a; i++) { @@ -386,12 +386,12 @@ namespace DyeingComputer.View dr["Program"] = MainWindowViewModel.ProgramName; dr.EndEdit(); - SQLiteHelpers.InsertData("RUN", SQLiteHelpers.ToDictionary(dr));//行插入 + MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dr));//行插入 } updata_temp.Clear(); //使用前清缓存 updata_temp.Add("RUN", 1); - SQLiteHelpers.Update("RUN", updata_temp, "Step=1", null); - SQLiteHelpers.Close(); //关闭连接 + MainWindow.SQLiteHelpers.Update("RUN", updata_temp, "Step=1", null); + //SQLiteHelpers.Close(); //关闭连接 /*触发启动*/ string Numder = WorkorderSteps.Select("Step = 1").First().Field("StepID");// diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index aefe6e0..30b655d 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -71,8 +71,8 @@ namespace DyeingComputer.ViewModel { System.Windows.Media.Brush Status_red = new SolidColorBrush() { Color = System.Windows.Media.Color.FromArgb(255, 255, 0, 0) }; System.Windows.Media.Brush Status_Black = new SolidColorBrush() { Color = System.Windows.Media.Color.FromArgb(255, 0, 0, 0) }; - private static SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly static string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + // private static SQLiteHelper SQLiteHelpers = null; //定义数据库 + //private readonly static string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 private readonly string ChartAdress = Environment.CurrentDirectory + "\\DataBase\\Chart.db"; //数据库路径 private IniFile.IniFiles Configini = new IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "DyeingComputer.ini"); private PID pid = new PID(); @@ -238,18 +238,18 @@ namespace DyeingComputer.ViewModel ); WORK_RUN = 2; - SQLiteHelpers = new SQLiteHelper(DBAddress); - SQLiteHelpers.Open(); - Dyelot_dat = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" + + //SQLiteHelpers = new SQLiteHelper(DBAddress); + //SQLiteHelpers.Open(); + Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" + drEmployee.Field("WorkOrder") + "'", null).Tables[0]; - SQLiteHelpers.Close(); + //SQLiteHelpers.Close(); } else { - SQLiteHelpers = new SQLiteHelper(DBAddress); - SQLiteHelpers.Open(); - SQLiteHelpers.Delete("RUN", null, null); - SQLiteHelpers.Close(); + //SQLiteHelpers = new SQLiteHelper(DBAddress); + //SQLiteHelpers.Open(); + MainWindow.SQLiteHelpers.Delete("RUN", null, null); + //SQLiteHelpers.Close(); }//清楚任务列表 }//如果有未完成的工艺 CountDown(); //启动循环任务 @@ -363,11 +363,11 @@ namespace DyeingComputer.ViewModel public static bool set_=false; public void SYS_SET() { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - dt_con = SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID desc", null).Tables[0]; //读取表写入缓存 - dt_sys = SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID desc", null).Tables[0]; //读取表写入缓存 - SQLiteHelpers.Close(); + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + dt_con = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID desc", null).Tables[0]; //读取表写入缓存 + dt_sys = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID desc", null).Tables[0]; //读取表写入缓存 + //SQLiteHelpers.Close(); pid.Kp = Convert.ToDouble(Selet_con("MT21")); //读取pid pid.Ki = Convert.ToDouble(Selet_con("MT22")); @@ -482,11 +482,11 @@ namespace DyeingComputer.ViewModel DIDETime = 0; APILog.LOGlog(WorkNumder.ToString(), "UserActions", "PROCESS_END", WORK_RUN.ToString()); dt_TP.Rows.Clear(); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.Delete("RUN", null, null); - SQLiteHelpers.Update("WorkOrder", _temp, "WorkOrder='" + WorkNumder + "'", null); - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.Delete("RUN", null, null); + MainWindow.SQLiteHelpers.Update("WorkOrder", _temp, "WorkOrder='" + WorkNumder + "'", null); + //SQLiteHelpers.Close(); //关闭连接 UserButton = false; IsInteractive = false; @@ -699,10 +699,10 @@ namespace DyeingComputer.ViewModel Chart_new.Add("STTC", Selet_dtm("1014")); Chart_new.Add("STLC", Selet_dtm("1019")); - SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - SQLiteHelpers.InsertData("Chart", Chart_new);// 执行插入 - SQLiteHelpers.Close(); + //SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + MainWindow.SQLiteHelpers.InsertData("Chart", Chart_new);// 执行插入 + //SQLiteHelpers.Close(); }//历史记录 public static int WORK_RUN = 0; //运行状态0停止1暂停2运行 @@ -952,16 +952,16 @@ namespace DyeingComputer.ViewModel break; } - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 updata_RUN.Clear(); updata_RUN.Add("RUN", 0); - SQLiteHelpers.Update("RUN", updata_RUN, "RUN ='1'", null);//更新 + MainWindow.SQLiteHelpers.Update("RUN", updata_RUN, "RUN ='1'", null);//更新 updata_RUN.Clear(); updata_RUN.Add("RUN", 1); - SQLiteHelpers.Update("RUN", updata_RUN, "Step ='" + RUN_STEPID + "'", null);//更新 - dt_TP = SQLiteHelpers.ExecuteDataSet("select * from RUN", null).Tables[0]; - SQLiteHelpers.Close();//关闭数据库 + MainWindow.SQLiteHelpers.Update("RUN", updata_RUN, "Step ='" + RUN_STEPID + "'", null);//更新 + dt_TP = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from RUN", null).Tables[0]; + //SQLiteHelpers.Close();//关闭数据库 //启动副功能 STEP_RUN_slave_stop(); DataRow[] arrRows = dt_TP.Select("STEP ='" + RUN_STEPID + "'"); if (!String.IsNullOrEmpty((string)arrRows[0]["StepID_S1"])) @@ -2957,24 +2957,24 @@ namespace DyeingComputer.ViewModel dat_FR.Add("Type", Type); dat_FR.Add("CALL_TIME", sys_Time); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 if (SK05 == "1")//是否检查原料类型 { - SQLI = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where " + + SQLI = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where " + "Dyelot = '" + Dyelot + "' AND Step = '" + STEP + "' AND Redye ='" + SYS_REDYE + "' AND State = '101' AND ProductType='" + Type + "'", null).Tables[0].Rows.Count; } else { - SQLI = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where " + + SQLI = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where " + "Dyelot = '" + Dyelot + "' AND Step = '" + STEP + "' AND Redye ='" + SYS_REDYE + "' AND State != '301'", null).Tables[0].Rows.Count; } - if (SQLI > 0) SQLiteHelpers.Update("Dyelot", dat_FR, "Dyelot = '" + Dyelot + "' AND Step = '" + + if (SQLI > 0) MainWindow.SQLiteHelpers.Update("Dyelot", dat_FR, "Dyelot = '" + Dyelot + "' AND Step = '" + STEP + "' AND Redye ='" + SYS_REDYE + "'", null);//行更新 - SQLiteHelpers.Close(); //关闭连接 + //SQLiteHelpers.Close(); //关闭连接 } void FeedingRecords_inf() { @@ -3208,15 +3208,15 @@ namespace DyeingComputer.ViewModel public static bool User_Button = false; public static void SQL_data()//获得io表 { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - dt_d = SQLiteHelpers.ExecuteDataSet("select * from IOName where type='DO' OR type='DQ' order by ID", null).Tables[0]; //读取表写入缓存 - dt_a = SQLiteHelpers.ExecuteDataSet("select * from IOName where type='AI' OR type='AO' order by ID", null).Tables[0]; - dt_m = SQLiteHelpers.ExecuteDataSet("select * from IOName where type='M' order by ID", null).Tables[0]; - dt_ParameterSet = SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0]; - dt_SysSet = SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0]; - dt_TP = SQLiteHelpers.ExecuteDataSet("select * from RUN", null).Tables[0]; - SQLiteHelpers.Close(); + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + //SQLiteHelpers.Open(); //打开数据库 + dt_d = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from IOName where type='DO' OR type='DQ' order by ID", null).Tables[0]; //读取表写入缓存 + dt_a = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from IOName where type='AI' OR type='AO' order by ID", null).Tables[0]; + dt_m = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from IOName where type='M' order by ID", null).Tables[0]; + dt_ParameterSet = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0]; + dt_SysSet = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0]; + dt_TP = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from RUN", null).Tables[0]; + //SQLiteHelpers.Close(); dt_d.RowChanged += new DataRowChangeEventHandler(ROW_changed_D);//添加行改变触发事件 dt_a.RowChanged += new DataRowChangeEventHandler(ROW_changed_A); diff --git a/Windows/ViewProgram.xaml.cs b/Windows/ViewProgram.xaml.cs index cc78fd7..41b0af8 100644 --- a/Windows/ViewProgram.xaml.cs +++ b/Windows/ViewProgram.xaml.cs @@ -32,21 +32,21 @@ namespace DyeingComputer.Windows InitializeComponent(); Programgroup_sql(); } - private SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + // private SQLiteHelper SQLiteHelpers = null; //定义数据库 + // private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 DataSet sql; //内存数据缓存 public void Programgroup_sql() { - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 + //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 string sql_script = "select * from ProgramName order by ProgramID desc"; if (sql != null) sql.Clear(); //清空缓存 - sql = SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取计划表写入缓存 + sql = MainWindow.SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取计划表写入缓存 if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表 - SQLiteHelpers.Close(); //关闭连接 + // SQLiteHelpers.Close(); //关闭连接 //sql.Clear(); //清除缓存 //System.GC.Collect();