diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 3f61c45..162c0e3 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 3f61c45..162c0e3 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 9f570f7..3df0a54 100644 --- a/RbFreqStandMeasure/counter/CounterCtrlForm.cs +++ b/RbFreqStandMeasure/counter/CounterCtrlForm.cs @@ -382,11 +382,9 @@ string outValue = dataGridView_CounterResult.CurrentRow.Cells[4].Value.ToString(); string value = dataGridView_CounterResult.CurrentRow.Cells[5].Value.ToString(); string sensitivity = dataGridView_CounterResult.CurrentRow.Cells[6].Value.ToString(); - string logTime = dataGridView_CounterResult.CurrentRow.Cells[7].Value.ToString(); - if (!String.IsNullOrEmpty(outValue)&& !String.IsNullOrEmpty(sensitivity)) - { - counterDataService.delete(deviceId, outValue, logTime); - } + string logTime = dataGridView_CounterResult.CurrentRow.Cells[7].Value.ToString(); + counterDataService.delete(deviceId, outValue, logTime); + //deviceService.delete(Convert.ToInt32(dataGridView_DevList.Rows[dataGridView_DevList.CurrentRow.Index].Cells[8].Value)); MessageBox.Show("删除成功", "提示"); LoadCounterDetecInitList(); @@ -795,11 +793,14 @@ catch (Exception ex) { } finally { - string valueTime = dataGridView_CounterResult.Rows[e.RowIndex].Cells[7].Value.ToString(); + if (!isAdd) + { + string valueTime = dataGridView_CounterResult.Rows[e.RowIndex].Cells[7].Value.ToString(); - if (!String.IsNullOrEmpty(value) && e.ColumnIndex != 4 && String.IsNullOrEmpty(valueTime)) dataGridView_CounterResult.Rows[e.RowIndex].Cells[7].Value = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + if (!String.IsNullOrEmpty(value) && e.ColumnIndex != 4 && String.IsNullOrEmpty(valueTime)) dataGridView_CounterResult.Rows[e.RowIndex].Cells[7].Value = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - updateDatabase(); + updateDatabase(); + } } } private bool checkFreq(string val)