diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs index 7500bd4..12b4267 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs @@ -76,35 +76,42 @@ return iRetval; } } - string sQry = "select ID from r_counter_detec_init where FREQUENCY='" + frequency +"' AND CYCLE='"+cycle+"'"; + string sQry = "select ID from r_counter_detec_init where FREQUENCY='" + frequency + "' AND CYCLE='" + cycle + "'"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + using (MySqlDataReader aReader = cmd.ExecuteReader()) { if (aReader.Read()) { initId = Convert.ToInt64(aReader.GetString(0)); - sQry = "UPDATE r_counter_detec_init SET FREQUENCY=@FREQUENCY, CYCLE=@CYCLE WHERE ID = " + initId; - - cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); - cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 30).Value = frequency; - cmd.Parameters.Add("@CYCLE", MySqlDbType.String, 30).Value = cycle; - cmd.ExecuteNonQuery(); - } - else - { - cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); - cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 30).Value = frequency; - cmd.Parameters.Add("@CYCLE", MySqlDbType.String, 30).Value = cycle; - - cmd.ExecuteNonQuery(); - } aReader.Close(); } + if (initId != -1) + { + sQry = "UPDATE r_counter_detec_init SET FREQUENCY=@FREQUENCY, CYCLE=@CYCLE WHERE ID = " + initId; + + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 30).Value = frequency; + cmd.Parameters.Add("@CYCLE", MySqlDbType.String, 30).Value = cycle; + cmd.ExecuteNonQuery(); + cmd.Dispose(); + } + else + { + sQry = "INSERT INTO r_counter_detec_init (FREQUENCY,CYCLE) VALUES (@FREQUENCY, @CYCLE)"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 30).Value = frequency; + cmd.Parameters.Add("@CYCLE", MySqlDbType.String, 30).Value = cycle; + + cmd.ExecuteNonQuery(); + cmd.Dispose(); + } + cmd.Dispose(); iRetval = 0; } - catch(MySqlException ex) + catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); return -1; diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs index 7500bd4..12b4267 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs @@ -76,35 +76,42 @@ return iRetval; } } - string sQry = "select ID from r_counter_detec_init where FREQUENCY='" + frequency +"' AND CYCLE='"+cycle+"'"; + string sQry = "select ID from r_counter_detec_init where FREQUENCY='" + frequency + "' AND CYCLE='" + cycle + "'"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + using (MySqlDataReader aReader = cmd.ExecuteReader()) { if (aReader.Read()) { initId = Convert.ToInt64(aReader.GetString(0)); - sQry = "UPDATE r_counter_detec_init SET FREQUENCY=@FREQUENCY, CYCLE=@CYCLE WHERE ID = " + initId; - - cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); - cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 30).Value = frequency; - cmd.Parameters.Add("@CYCLE", MySqlDbType.String, 30).Value = cycle; - cmd.ExecuteNonQuery(); - } - else - { - cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); - cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 30).Value = frequency; - cmd.Parameters.Add("@CYCLE", MySqlDbType.String, 30).Value = cycle; - - cmd.ExecuteNonQuery(); - } aReader.Close(); } + if (initId != -1) + { + sQry = "UPDATE r_counter_detec_init SET FREQUENCY=@FREQUENCY, CYCLE=@CYCLE WHERE ID = " + initId; + + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 30).Value = frequency; + cmd.Parameters.Add("@CYCLE", MySqlDbType.String, 30).Value = cycle; + cmd.ExecuteNonQuery(); + cmd.Dispose(); + } + else + { + sQry = "INSERT INTO r_counter_detec_init (FREQUENCY,CYCLE) VALUES (@FREQUENCY, @CYCLE)"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 30).Value = frequency; + cmd.Parameters.Add("@CYCLE", MySqlDbType.String, 30).Value = cycle; + + cmd.ExecuteNonQuery(); + cmd.Dispose(); + } + cmd.Dispose(); iRetval = 0; } - catch(MySqlException ex) + catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); return -1; diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 66e88a7..e81d805 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs index 7500bd4..12b4267 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs @@ -76,35 +76,42 @@ return iRetval; } } - string sQry = "select ID from r_counter_detec_init where FREQUENCY='" + frequency +"' AND CYCLE='"+cycle+"'"; + string sQry = "select ID from r_counter_detec_init where FREQUENCY='" + frequency + "' AND CYCLE='" + cycle + "'"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + using (MySqlDataReader aReader = cmd.ExecuteReader()) { if (aReader.Read()) { initId = Convert.ToInt64(aReader.GetString(0)); - sQry = "UPDATE r_counter_detec_init SET FREQUENCY=@FREQUENCY, CYCLE=@CYCLE WHERE ID = " + initId; - - cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); - cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 30).Value = frequency; - cmd.Parameters.Add("@CYCLE", MySqlDbType.String, 30).Value = cycle; - cmd.ExecuteNonQuery(); - } - else - { - cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); - cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 30).Value = frequency; - cmd.Parameters.Add("@CYCLE", MySqlDbType.String, 30).Value = cycle; - - cmd.ExecuteNonQuery(); - } aReader.Close(); } + if (initId != -1) + { + sQry = "UPDATE r_counter_detec_init SET FREQUENCY=@FREQUENCY, CYCLE=@CYCLE WHERE ID = " + initId; + + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 30).Value = frequency; + cmd.Parameters.Add("@CYCLE", MySqlDbType.String, 30).Value = cycle; + cmd.ExecuteNonQuery(); + cmd.Dispose(); + } + else + { + sQry = "INSERT INTO r_counter_detec_init (FREQUENCY,CYCLE) VALUES (@FREQUENCY, @CYCLE)"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 30).Value = frequency; + cmd.Parameters.Add("@CYCLE", MySqlDbType.String, 30).Value = cycle; + + cmd.ExecuteNonQuery(); + cmd.Dispose(); + } + cmd.Dispose(); iRetval = 0; } - catch(MySqlException ex) + catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); return -1; diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 66e88a7..e81d805 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/counter/CounterCtrlForm.cs b/RbFreqStandMeasure/counter/CounterCtrlForm.cs index e45f17b..85bbd68 100644 --- a/RbFreqStandMeasure/counter/CounterCtrlForm.cs +++ b/RbFreqStandMeasure/counter/CounterCtrlForm.cs @@ -72,7 +72,7 @@ comboBox_detecModel.SelectedIndex = 0; InitTableCounter(); - //LoadCounterDetecInitList(); + LoadCounterDetecInitList(); if (list != null && list.Count > 0) { @@ -390,22 +390,28 @@ private void btn_add_Click(object sender, EventArgs e) { - if (comboBox_counters.Text.Equals("")) + try { - MessageBox.Show("请先选择待检测计数器"); - return; + if (comboBox_counters.Text.Equals("")) + { + MessageBox.Show("请先选择待检测计数器"); + return; + } + + isAdd = true; + int index = table_counterDetecInit.Rows.Count; + table_counterDetecInit.Rows.Add(index + 1, devType, devCode, devPort, "", "", "", "", -1, -1); + + //dataGridView_CounterResult.dat + dataGridView_CounterResult.Rows[index].Cells[4].ReadOnly = false;//将当前单元格设为可读 + dataGridView_CounterResult.CurrentCell = dataGridView_CounterResult.Rows[index].Cells[4];//获取当前单元格 + dataGridView_CounterResult.BeginEdit(true);//将单元格设为编辑状态 + valueOld = dataGridView_CounterResult.CurrentCell.Value.ToString(); } + catch(Exception ex) + { - isAdd = true; - int index = table_counterDetecInit.Rows.Count; - table_counterDetecInit.Rows.Add(index+1, devType, devCode, devPort, "", "", "", "", -1, -1); - - //dataGridView_CounterResult.dat - dataGridView_CounterResult.Rows[index].Cells[4].ReadOnly = false;//将当前单元格设为可读 - dataGridView_CounterResult.CurrentCell = dataGridView_CounterResult.Rows[index].Cells[4];//获取当前单元格 - dataGridView_CounterResult.BeginEdit(true);//将单元格设为编辑状态 - valueOld = dataGridView_CounterResult.CurrentCell.Value.ToString(); - + } }