This commit is contained in:
@@ -103,6 +103,88 @@ namespace 材料热传导系数
|
||||
}
|
||||
}
|
||||
|
||||
public void InsertReportItems(PenetrationModel data)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"INSERT INTO penetration
|
||||
(Id2, O22, result2, temperature2,
|
||||
yuhui2, yuyan2, Isfire, costTime2,penetime2,Testtime2)
|
||||
VALUES
|
||||
(@Id2 , @O22,@result2, @temperature2 ,
|
||||
@yuhui2,@yuyan2,@Isfire,@costTime2,@penetime2,@Testtime2)";
|
||||
connection.Execute(sql, data);
|
||||
}
|
||||
}
|
||||
|
||||
public void InsertTestDataList(List<PenetrationModel> dataList)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"INSERT INTO normaltemperature
|
||||
(barcode, temperature, startpressure, dwelltime,
|
||||
diffpressure, endpressure, CreateTime, type)
|
||||
VALUES
|
||||
(@barcode, @temperature, @startpressure, @dwelltime, @diffpressure,@endpressure,CURRENT_TIMESTAMP,@type)";
|
||||
connection.Execute(sql, dataList);
|
||||
}
|
||||
}
|
||||
|
||||
public List<PenetrationModel> GetTestData2(DateTime startDate, DateTime endDate)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"SELECT * FROM penetration
|
||||
WHERE Testtime2 BETWEEN @StartDate AND @EndDate
|
||||
ORDER BY Testtime2 DESC";
|
||||
return connection.Query<PenetrationModel>(sql, new { StartDate = startDate, EndDate = endDate }).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
public void InsertReportItems(SecondaryIgnitionModel data)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"INSERT INTO SecondaryIgnitionModel
|
||||
(Id3, O23, result3,
|
||||
yuhui3, yuyan3, Isdianhuo3, Iszixi3,Testtime3)
|
||||
VALUES
|
||||
(@Id3 , @O23,@result3,
|
||||
@yuhui3,@yuyan3,@Isdianhuo3,,@Iszixi3,@Testtime3)";
|
||||
connection.Execute(sql, data);
|
||||
}
|
||||
}
|
||||
|
||||
public void InsertTestDataList(List<SecondaryIgnitionModel> dataList)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"INSERT INTO normaltemperature
|
||||
(barcode, temperature, startpressure, dwelltime,
|
||||
diffpressure, endpressure, CreateTime, type)
|
||||
VALUES
|
||||
(@barcode, @temperature, @startpressure, @dwelltime, @diffpressure,@endpressure,CURRENT_TIMESTAMP,@type)";
|
||||
connection.Execute(sql, dataList);
|
||||
}
|
||||
}
|
||||
|
||||
public List<SecondaryIgnitionModel> GetTestData3(DateTime startDate, DateTime endDate)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"SELECT * FROM SecondaryIgnitionModel
|
||||
WHERE Testtime3 BETWEEN @StartDate AND @EndDate
|
||||
ORDER BY Testtime3 DESC";
|
||||
return connection.Query<SecondaryIgnitionModel>(sql, new { StartDate = startDate, EndDate = endDate }).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public bool TestConnection()
|
||||
{
|
||||
|
||||
@@ -19,6 +19,7 @@ using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using 外科辅料和患者防护罩激光抗性测试仪.Data;
|
||||
using 外科辅料和患者防护罩激光抗性测试仪.Model;
|
||||
using 材料热传导系数;
|
||||
|
||||
namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
{
|
||||
@@ -41,11 +42,15 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
private readonly object _serialLock = new object();
|
||||
private System.Windows.Forms.Timer _powerMeterTimer;
|
||||
|
||||
ConductivityRepository conductivityRepository;
|
||||
|
||||
public bool RunStatus = false;
|
||||
public PenetrationForm()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
conductivityRepository = new ConductivityRepository();
|
||||
|
||||
InitComboBoxPattern();
|
||||
InitComboBox2Pattern();
|
||||
|
||||
@@ -323,7 +328,8 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
|
||||
if (_lastRunStatus && !currentRunStatus && !_isReported)
|
||||
{
|
||||
_ = InsertReportAsync();
|
||||
var model = await InsertReportAsync();
|
||||
conductivityRepository.InsertReportItems(model);
|
||||
_isReported = true;
|
||||
}
|
||||
|
||||
@@ -355,18 +361,19 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
//private double costtime;
|
||||
//private float penetime;
|
||||
|
||||
private async Task InsertReportAsync()
|
||||
private async Task<PenetrationModel> InsertReportAsync()
|
||||
{
|
||||
if (uiLabel10.Text == null) return;
|
||||
var report = new PenetrationModel();
|
||||
if (uiLabel10.Text == null) return report;
|
||||
|
||||
var sampleId = uiLabel10.Text.Trim();
|
||||
if (string.IsNullOrEmpty(sampleId)) return;
|
||||
if (string.IsNullOrEmpty(sampleId)) return report;
|
||||
|
||||
// 解析样品ID
|
||||
if (!int.TryParse(sampleId, out int sampleIndex) || sampleIndex < 1 || sampleIndex > 5)
|
||||
{
|
||||
Debug.WriteLine($"无效的样品ID: {sampleId}");
|
||||
return;
|
||||
return report;
|
||||
}
|
||||
|
||||
int coilBaseAddress = 159 + sampleIndex; // 160,161,162,163,164
|
||||
@@ -398,7 +405,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
if (classify == null)
|
||||
{
|
||||
Debug.WriteLine("未检测到有效分类");
|
||||
return;
|
||||
return report;
|
||||
}
|
||||
|
||||
|
||||
@@ -447,11 +454,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
try
|
||||
{
|
||||
string selectedO2Text = uiComboBox1.Text;
|
||||
string id= uiLabel10.Text;
|
||||
reportList.Add(new PenetrationModel
|
||||
string id = uiLabel10.Text;
|
||||
var model = new PenetrationModel
|
||||
{
|
||||
sampleType2 = sampleIndex,
|
||||
Id2 = id,
|
||||
Id2 = id,
|
||||
O22 = selectedO2Text,
|
||||
result2 = classify,
|
||||
temperature2 = temperature,
|
||||
@@ -462,12 +469,17 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
penetime2 = penetime,
|
||||
Testtime2 = DateTime.Now
|
||||
|
||||
});
|
||||
};
|
||||
reportList.Add(model);
|
||||
report = model;
|
||||
|
||||
await Task.Delay(100);
|
||||
return model;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Debug.WriteLine($"报表插入失败: {ex.Message}");
|
||||
return report;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1576,6 +1588,6 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
this.Close();//返回主页面
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,15 +78,9 @@
|
||||
dataGridViewTextBoxColumn7 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn8 = new DataGridViewTextBoxColumn();
|
||||
Column9 = new DataGridViewTextBoxColumn();
|
||||
Column1 = new DataGridViewTextBoxColumn();
|
||||
tabPage3 = new TabPage();
|
||||
uiDataGridView3 = new Sunny.UI.UIDataGridView();
|
||||
dataGridViewTextBoxColumn16 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn17 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn18 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn20 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn21 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn22 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn23 = new DataGridViewTextBoxColumn();
|
||||
uiPanel1 = new Sunny.UI.UIPanel();
|
||||
uiGroupBox1 = new Sunny.UI.UIGroupBox();
|
||||
uiLabel1 = new Sunny.UI.UILabel();
|
||||
@@ -104,6 +98,14 @@
|
||||
dataGridViewTextBoxColumn13 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn14 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn15 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn16 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn17 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn18 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn20 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn21 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn22 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn23 = new DataGridViewTextBoxColumn();
|
||||
Column2 = new DataGridViewTextBoxColumn();
|
||||
uiTableLayoutPanel1.SuspendLayout();
|
||||
uiPanel2.SuspendLayout();
|
||||
uiGroupBox2.SuspendLayout();
|
||||
@@ -411,7 +413,7 @@
|
||||
uiDataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
|
||||
uiDataGridView2.ColumnHeadersHeight = 42;
|
||||
uiDataGridView2.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
|
||||
uiDataGridView2.Columns.AddRange(new DataGridViewColumn[] { dataGridViewTextBoxColumn1, dataGridViewTextBoxColumn2, dataGridViewTextBoxColumn3, dataGridViewTextBoxColumn4, dataGridViewTextBoxColumn5, dataGridViewTextBoxColumn6, dataGridViewTextBoxColumn7, dataGridViewTextBoxColumn8, Column9 });
|
||||
uiDataGridView2.Columns.AddRange(new DataGridViewColumn[] { dataGridViewTextBoxColumn1, dataGridViewTextBoxColumn2, dataGridViewTextBoxColumn3, dataGridViewTextBoxColumn4, dataGridViewTextBoxColumn5, dataGridViewTextBoxColumn6, dataGridViewTextBoxColumn7, dataGridViewTextBoxColumn8, Column9, Column1 });
|
||||
dataGridViewCellStyle16.Alignment = DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle16.BackColor = Color.White;
|
||||
dataGridViewCellStyle16.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
|
||||
@@ -446,6 +448,7 @@
|
||||
//
|
||||
// dataGridViewTextBoxColumn1
|
||||
//
|
||||
dataGridViewTextBoxColumn1.DataPropertyName = "Id2";
|
||||
dataGridViewTextBoxColumn1.HeaderText = "测试项/样品";
|
||||
dataGridViewTextBoxColumn1.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
|
||||
@@ -454,6 +457,7 @@
|
||||
//
|
||||
// dataGridViewTextBoxColumn2
|
||||
//
|
||||
dataGridViewTextBoxColumn2.DataPropertyName = "O22";
|
||||
dataGridViewTextBoxColumn2.HeaderText = "氧浓度(%)";
|
||||
dataGridViewTextBoxColumn2.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
|
||||
@@ -462,6 +466,7 @@
|
||||
//
|
||||
// dataGridViewTextBoxColumn3
|
||||
//
|
||||
dataGridViewTextBoxColumn3.DataPropertyName = "result2";
|
||||
dataGridViewTextBoxColumn3.HeaderText = "分类结果";
|
||||
dataGridViewTextBoxColumn3.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
|
||||
@@ -470,6 +475,7 @@
|
||||
//
|
||||
// dataGridViewTextBoxColumn4
|
||||
//
|
||||
dataGridViewTextBoxColumn4.DataPropertyName = "temperature2";
|
||||
dataGridViewTextBoxColumn4.HeaderText = "P1背面温度(℃)";
|
||||
dataGridViewTextBoxColumn4.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
|
||||
@@ -478,6 +484,7 @@
|
||||
//
|
||||
// dataGridViewTextBoxColumn5
|
||||
//
|
||||
dataGridViewTextBoxColumn5.DataPropertyName = "yuyan2";
|
||||
dataGridViewTextBoxColumn5.HeaderText = "燃烧时间(s)";
|
||||
dataGridViewTextBoxColumn5.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
|
||||
@@ -486,6 +493,7 @@
|
||||
//
|
||||
// dataGridViewTextBoxColumn6
|
||||
//
|
||||
dataGridViewTextBoxColumn6.DataPropertyName = "yuhui2";
|
||||
dataGridViewTextBoxColumn6.HeaderText = "余辉时间(s)";
|
||||
dataGridViewTextBoxColumn6.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
|
||||
@@ -494,6 +502,7 @@
|
||||
//
|
||||
// dataGridViewTextBoxColumn7
|
||||
//
|
||||
dataGridViewTextBoxColumn7.DataPropertyName = "Isfire";
|
||||
dataGridViewTextBoxColumn7.HeaderText = "是否起火";
|
||||
dataGridViewTextBoxColumn7.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
|
||||
@@ -502,6 +511,7 @@
|
||||
//
|
||||
// dataGridViewTextBoxColumn8
|
||||
//
|
||||
dataGridViewTextBoxColumn8.DataPropertyName = "costTime2";
|
||||
dataGridViewTextBoxColumn8.HeaderText = "总测试时长(s)";
|
||||
dataGridViewTextBoxColumn8.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
|
||||
@@ -510,12 +520,22 @@
|
||||
//
|
||||
// Column9
|
||||
//
|
||||
Column9.DataPropertyName = "penetime2";
|
||||
Column9.HeaderText = "穿透时间(s)";
|
||||
Column9.MinimumWidth = 8;
|
||||
Column9.Name = "Column9";
|
||||
Column9.ReadOnly = true;
|
||||
Column9.Width = 150;
|
||||
//
|
||||
// Column1
|
||||
//
|
||||
Column1.DataPropertyName = "Testtime2";
|
||||
Column1.HeaderText = "测试时间";
|
||||
Column1.MinimumWidth = 8;
|
||||
Column1.Name = "Column1";
|
||||
Column1.ReadOnly = true;
|
||||
Column1.Width = 150;
|
||||
//
|
||||
// tabPage3
|
||||
//
|
||||
tabPage3.BackColor = Color.White;
|
||||
@@ -542,7 +562,7 @@
|
||||
uiDataGridView3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20;
|
||||
uiDataGridView3.ColumnHeadersHeight = 42;
|
||||
uiDataGridView3.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
|
||||
uiDataGridView3.Columns.AddRange(new DataGridViewColumn[] { dataGridViewTextBoxColumn16, dataGridViewTextBoxColumn17, dataGridViewTextBoxColumn18, dataGridViewTextBoxColumn20, dataGridViewTextBoxColumn21, dataGridViewTextBoxColumn22, dataGridViewTextBoxColumn23 });
|
||||
uiDataGridView3.Columns.AddRange(new DataGridViewColumn[] { dataGridViewTextBoxColumn16, dataGridViewTextBoxColumn17, dataGridViewTextBoxColumn18, dataGridViewTextBoxColumn20, dataGridViewTextBoxColumn21, dataGridViewTextBoxColumn22, dataGridViewTextBoxColumn23, Column2 });
|
||||
dataGridViewCellStyle21.Alignment = DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle21.BackColor = Color.White;
|
||||
dataGridViewCellStyle21.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
|
||||
@@ -575,62 +595,6 @@
|
||||
uiDataGridView3.StripeOddColor = Color.FromArgb(240, 248, 255);
|
||||
uiDataGridView3.TabIndex = 1;
|
||||
//
|
||||
// dataGridViewTextBoxColumn16
|
||||
//
|
||||
dataGridViewTextBoxColumn16.HeaderText = "测试项/样品";
|
||||
dataGridViewTextBoxColumn16.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn16.Name = "dataGridViewTextBoxColumn16";
|
||||
dataGridViewTextBoxColumn16.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn16.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn17
|
||||
//
|
||||
dataGridViewTextBoxColumn17.HeaderText = "氧浓度(%)";
|
||||
dataGridViewTextBoxColumn17.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17";
|
||||
dataGridViewTextBoxColumn17.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn17.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn18
|
||||
//
|
||||
dataGridViewTextBoxColumn18.HeaderText = "分类结果";
|
||||
dataGridViewTextBoxColumn18.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
|
||||
dataGridViewTextBoxColumn18.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn18.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn20
|
||||
//
|
||||
dataGridViewTextBoxColumn20.HeaderText = "余焰时间(s)";
|
||||
dataGridViewTextBoxColumn20.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20";
|
||||
dataGridViewTextBoxColumn20.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn20.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn21
|
||||
//
|
||||
dataGridViewTextBoxColumn21.HeaderText = "余辉时间(s)";
|
||||
dataGridViewTextBoxColumn21.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
|
||||
dataGridViewTextBoxColumn21.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn21.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn22
|
||||
//
|
||||
dataGridViewTextBoxColumn22.HeaderText = "是否自熄";
|
||||
dataGridViewTextBoxColumn22.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
|
||||
dataGridViewTextBoxColumn22.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn22.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn23
|
||||
//
|
||||
dataGridViewTextBoxColumn23.HeaderText = "是否点火";
|
||||
dataGridViewTextBoxColumn23.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23";
|
||||
dataGridViewTextBoxColumn23.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn23.Width = 150;
|
||||
//
|
||||
// uiPanel1
|
||||
//
|
||||
uiPanel1.Controls.Add(uiGroupBox1);
|
||||
@@ -875,6 +839,70 @@
|
||||
dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
|
||||
dataGridViewTextBoxColumn15.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn16
|
||||
//
|
||||
dataGridViewTextBoxColumn16.HeaderText = "测试项/样品";
|
||||
dataGridViewTextBoxColumn16.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn16.Name = "dataGridViewTextBoxColumn16";
|
||||
dataGridViewTextBoxColumn16.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn16.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn17
|
||||
//
|
||||
dataGridViewTextBoxColumn17.HeaderText = "氧浓度(%)";
|
||||
dataGridViewTextBoxColumn17.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17";
|
||||
dataGridViewTextBoxColumn17.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn17.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn18
|
||||
//
|
||||
dataGridViewTextBoxColumn18.HeaderText = "分类结果";
|
||||
dataGridViewTextBoxColumn18.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
|
||||
dataGridViewTextBoxColumn18.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn18.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn20
|
||||
//
|
||||
dataGridViewTextBoxColumn20.HeaderText = "余焰时间(s)";
|
||||
dataGridViewTextBoxColumn20.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20";
|
||||
dataGridViewTextBoxColumn20.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn20.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn21
|
||||
//
|
||||
dataGridViewTextBoxColumn21.HeaderText = "余辉时间(s)";
|
||||
dataGridViewTextBoxColumn21.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
|
||||
dataGridViewTextBoxColumn21.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn21.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn22
|
||||
//
|
||||
dataGridViewTextBoxColumn22.HeaderText = "是否自熄";
|
||||
dataGridViewTextBoxColumn22.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
|
||||
dataGridViewTextBoxColumn22.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn22.Width = 150;
|
||||
//
|
||||
// dataGridViewTextBoxColumn23
|
||||
//
|
||||
dataGridViewTextBoxColumn23.HeaderText = "是否点火";
|
||||
dataGridViewTextBoxColumn23.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23";
|
||||
dataGridViewTextBoxColumn23.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn23.Width = 150;
|
||||
//
|
||||
// Column2
|
||||
//
|
||||
Column2.HeaderText = "测试时间";
|
||||
Column2.MinimumWidth = 8;
|
||||
Column2.Name = "Column2";
|
||||
Column2.ReadOnly = true;
|
||||
Column2.Width = 150;
|
||||
//
|
||||
// ReportForm
|
||||
//
|
||||
AutoScaleMode = AutoScaleMode.None;
|
||||
@@ -936,23 +964,7 @@
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn14;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn15;
|
||||
private Sunny.UI.UIDataGridView uiDataGridView2;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
|
||||
private DataGridViewTextBoxColumn Column9;
|
||||
private Sunny.UI.UIDataGridView uiDataGridView3;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn16;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn17;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn18;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn20;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn21;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn22;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn23;
|
||||
private DataGridViewTextBoxColumn id;
|
||||
private DataGridViewTextBoxColumn O2;
|
||||
private DataGridViewTextBoxColumn result;
|
||||
@@ -962,5 +974,23 @@
|
||||
private DataGridViewTextBoxColumn iszixi;
|
||||
private DataGridViewTextBoxColumn costtime;
|
||||
private DataGridViewTextBoxColumn CreateTime;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
|
||||
private DataGridViewTextBoxColumn Column9;
|
||||
private DataGridViewTextBoxColumn Column1;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn16;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn17;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn18;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn20;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn21;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn22;
|
||||
private DataGridViewTextBoxColumn dataGridViewTextBoxColumn23;
|
||||
private DataGridViewTextBoxColumn Column2;
|
||||
}
|
||||
}
|
||||
@@ -57,6 +57,16 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
uiDataGridView1.DataSource = data;
|
||||
uiDataGridView1.Refresh();
|
||||
|
||||
var data2= conductivityRepository.GetTestData2(uiDatetimePicker1.Text.ToDateTime(),
|
||||
uiDatetimePicker2.Text.ToDateTime());
|
||||
uiDataGridView2.DataSource = data2;
|
||||
uiDataGridView2.Refresh();
|
||||
|
||||
var data3 = conductivityRepository.GetTestData3(uiDatetimePicker1.Text.ToDateTime(),
|
||||
uiDatetimePicker2.Text.ToDateTime());
|
||||
uiDataGridView3.DataSource = data3;
|
||||
uiDataGridView3.Refresh();
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -171,6 +171,9 @@
|
||||
<metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="dataGridViewTextBoxColumn16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
@@ -192,6 +195,9 @@
|
||||
<metadata name="dataGridViewTextBoxColumn23.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="dataGridViewTextBoxColumn9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
||||
@@ -15,6 +15,7 @@ using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using 外科辅料和患者防护罩激光抗性测试仪.Data;
|
||||
using 外科辅料和患者防护罩激光抗性测试仪.Model;
|
||||
using 材料热传导系数;
|
||||
|
||||
namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
{
|
||||
@@ -31,10 +32,14 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
private System.Windows.Forms.Timer _readtimer;
|
||||
public bool RunStatus = false;
|
||||
|
||||
ConductivityRepository conductivityRepository;
|
||||
|
||||
public SecondaryIgnitionForm()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
conductivityRepository = new ConductivityRepository();
|
||||
|
||||
InitComboBoxPattern();
|
||||
InitComboBox2Pattern();
|
||||
InitComboBox3Pattern();
|
||||
@@ -268,7 +273,8 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
|
||||
if (_lastRunStatus && !currentRunStatus && !_isReported)
|
||||
{
|
||||
_ = InsertReportAsync();
|
||||
var model = await InsertReportAsync();
|
||||
conductivityRepository.InsertReportItems(model);
|
||||
_isReported = true;
|
||||
}
|
||||
|
||||
@@ -298,7 +304,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
private float yh=0;
|
||||
private bool iszixi=false;
|
||||
private bool isdianhuo=false;
|
||||
private async Task InsertReportAsync()
|
||||
private async Task<SecondaryIgnitionModel> InsertReportAsync()
|
||||
{
|
||||
if (uiComboBox2.Text != null && uiComboBox2.Text.Trim() == "样品1")
|
||||
{
|
||||
@@ -702,7 +708,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
{
|
||||
string selectedO2Text = uiComboBox1.Text;
|
||||
string id = uiComboBox2.Text;
|
||||
reportList.Add(new SecondaryIgnitionModel
|
||||
var model = new SecondaryIgnitionModel
|
||||
{
|
||||
Id3 = id,
|
||||
Iszixi3 = iszixi,
|
||||
@@ -717,13 +723,15 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
|
||||
yuhui3 = yh,
|
||||
yuyan3 = yy,
|
||||
Testtime3 = DateTime.Now
|
||||
});
|
||||
};
|
||||
reportList.Add(model);
|
||||
await Task.Delay(100);
|
||||
|
||||
return model;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Debug.WriteLine($"报表插入失败: {ex.Message}");
|
||||
return new SecondaryIgnitionModel();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user