This commit is contained in:
xyy
2026-03-06 15:30:27 +08:00
parent fd1060706c
commit 0515869ce0
4 changed files with 156 additions and 155 deletions

View File

@@ -1497,18 +1497,18 @@ namespace 全自动水压检测仪
//
this.uiLabel26.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiLabel26.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.uiLabel26.Location = new System.Drawing.Point(277, 135);
this.uiLabel26.Location = new System.Drawing.Point(250, 134);
this.uiLabel26.Name = "uiLabel26";
this.uiLabel26.Size = new System.Drawing.Size(112, 30);
this.uiLabel26.Size = new System.Drawing.Size(153, 30);
this.uiLabel26.TabIndex = 25;
this.uiLabel26.Text = "水循环时间设置:";
this.uiLabel26.Text = "水循环时间设置(s):";
this.uiLabel26.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// uiTextBox14
//
this.uiTextBox14.Cursor = System.Windows.Forms.Cursors.IBeam;
this.uiTextBox14.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.uiTextBox14.Location = new System.Drawing.Point(395, 134);
this.uiTextBox14.Location = new System.Drawing.Point(407, 133);
this.uiTextBox14.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiTextBox14.MinimumSize = new System.Drawing.Size(1, 16);
this.uiTextBox14.Name = "uiTextBox14";
@@ -1775,9 +1775,9 @@ namespace 全自动水压检测仪
this.uiLabel47.ForeColor = System.Drawing.Color.Red;
this.uiLabel47.Location = new System.Drawing.Point(505, 125);
this.uiLabel47.Name = "uiLabel47";
this.uiLabel47.Size = new System.Drawing.Size(110, 30);
this.uiLabel47.Size = new System.Drawing.Size(130, 30);
this.uiLabel47.TabIndex = 8;
this.uiLabel47.Text = "保压时间(h):";
this.uiLabel47.Text = "保压时间(min):";
this.uiLabel47.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// uiTextBox8
@@ -1860,7 +1860,7 @@ namespace 全自动水压检测仪
//
this.uiTextBox5.Cursor = System.Windows.Forms.Cursors.IBeam;
this.uiTextBox5.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.uiTextBox5.Location = new System.Drawing.Point(156, 54);
this.uiTextBox5.Location = new System.Drawing.Point(156, 55);
this.uiTextBox5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiTextBox5.MinimumSize = new System.Drawing.Size(1, 16);
this.uiTextBox5.Name = "uiTextBox5";
@@ -1880,9 +1880,9 @@ namespace 全自动水压检测仪
this.uiLabel41.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.uiLabel41.Location = new System.Drawing.Point(7, 55);
this.uiLabel41.Name = "uiLabel41";
this.uiLabel41.Size = new System.Drawing.Size(139, 30);
this.uiLabel41.Size = new System.Drawing.Size(205, 30);
this.uiLabel41.TabIndex = 1;
this.uiLabel41.Text = "保压时间设置(h):";
this.uiLabel41.Text = "保压时间设置(min):";
this.uiLabel41.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// uiLabel4

View File

@@ -620,7 +620,8 @@ namespace 全自动水压检测仪
// 压力保护
if (uiTextBox14 != null && !uiTextBox14.IsDisposed &&
modbusData.Real15 != null && modbusData.Real15.Length >= 2)
modbusData.Real15 != null //&& modbusData.Real15.Length >= 2
)
{
var propre = modbusData.Real15[0];
uiTextBox14.Text = (propre / 10).ToString("F1");

View File

@@ -264,7 +264,7 @@ namespace 全自动水压检测仪
dataGridView.Columns.Add(new DataGridViewTextBoxColumn
{
Name = "dwelltime",
HeaderText = "保压时间(h)",
HeaderText = "保压时间(min)",
Width = 80,
DataPropertyName = "DwellTime",
SortMode = DataGridViewColumnSortMode.NotSortable,
@@ -936,7 +936,7 @@ namespace 全自动水压检测仪
currentRow += 2; // 增加空行间距
// 表头
string[] headers = { "编号", "联络单号", "件号", "刻字号", "数量", "初始压力(PSI)", "开始时间", "结束时间", "结束压力(PSI)", "保压时间(h)", "压差(PSI)", "温度模式", "温度", "标准差值(PSI)", "测试结果", "创建时间" };
string[] headers = { "编号", "联络单号", "件号", "刻字号", "数量", "初始压力(PSI)", "开始时间", "结束时间", "结束压力(PSI)", "保压时间(min)", "压差(PSI)", "温度模式", "温度", "标准差值(PSI)", "测试结果", "创建时间" };
// 设置表头
for (int i = 0; i < headers.Length; i++)

View File

@@ -35,6 +35,20 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
this.save = new Sunny.UI.UIButton();
this.uiDataGridView1 = new Sunny.UI.UIDataGridView();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SerialNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnContactNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnItemNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnEngravingNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnQuantity = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnPressureDiff = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnStandardError = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.uiTextBox2 = new Sunny.UI.UITextBox();
this.uiTextBox11 = new Sunny.UI.UITextBox();
this.uiTextBoxEngravingNumber = new Sunny.UI.UITextBox();
@@ -65,20 +79,6 @@
this.uiPanel2 = new Sunny.UI.UIPanel();
this.uiPanel1 = new Sunny.UI.UIPanel();
this.uiPanelTop = new Sunny.UI.UIPanel();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SerialNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnContactNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnItemNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnEngravingNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnQuantity = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnPressureDiff = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnStandardError = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.uiDataGridView1)).BeginInit();
this.uiTableLayoutPanel1.SuspendLayout();
this.uiPanel3.SuspendLayout();
@@ -181,6 +181,132 @@
this.uiDataGridView1.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.uiDataGridView1_RowsAdded);
this.uiDataGridView1.RowsRemoved += new System.Windows.Forms.DataGridViewRowsRemovedEventHandler(this.uiDataGridView1_RowsRemoved);
//
// Column1
//
this.Column1.DataPropertyName = "Id";
this.Column1.HeaderText = "编号";
this.Column1.MinimumWidth = 6;
this.Column1.Name = "Column1";
this.Column1.ReadOnly = true;
this.Column1.Width = 75;
//
// SerialNumber
//
this.SerialNumber.HeaderText = "序号";
this.SerialNumber.MinimumWidth = 8;
this.SerialNumber.Name = "SerialNumber";
this.SerialNumber.ReadOnly = true;
this.SerialNumber.Width = 75;
//
// ColumnContactNumber
//
this.ColumnContactNumber.DataPropertyName = "lldh";
this.ColumnContactNumber.HeaderText = "联络单号";
this.ColumnContactNumber.MinimumWidth = 6;
this.ColumnContactNumber.Name = "ColumnContactNumber";
this.ColumnContactNumber.ReadOnly = true;
this.ColumnContactNumber.Visible = false;
this.ColumnContactNumber.Width = 150;
//
// ColumnItemNumber
//
this.ColumnItemNumber.DataPropertyName = "jh";
this.ColumnItemNumber.HeaderText = "件号";
this.ColumnItemNumber.MinimumWidth = 6;
this.ColumnItemNumber.Name = "ColumnItemNumber";
this.ColumnItemNumber.ReadOnly = true;
this.ColumnItemNumber.Width = 150;
//
// ColumnEngravingNumber
//
this.ColumnEngravingNumber.DataPropertyName = "kzh";
this.ColumnEngravingNumber.HeaderText = "刻字号";
this.ColumnEngravingNumber.MinimumWidth = 6;
this.ColumnEngravingNumber.Name = "ColumnEngravingNumber";
this.ColumnEngravingNumber.ReadOnly = true;
this.ColumnEngravingNumber.Width = 120;
//
// ColumnQuantity
//
this.ColumnQuantity.DataPropertyName = "Quantity";
this.ColumnQuantity.HeaderText = "数量";
this.ColumnQuantity.MinimumWidth = 6;
this.ColumnQuantity.Name = "ColumnQuantity";
this.ColumnQuantity.ReadOnly = true;
this.ColumnQuantity.Width = 80;
//
// Column3
//
this.Column3.DataPropertyName = "diffpressure";
this.Column3.HeaderText = "压力设置(PSI)";
this.Column3.MinimumWidth = 6;
this.Column3.Name = "Column3";
this.Column3.ReadOnly = true;
this.Column3.Width = 150;
//
// Column4
//
this.Column4.DataPropertyName = "exit_temperature";
this.Column4.HeaderText = "出口温度(℃)";
this.Column4.MinimumWidth = 6;
this.Column4.Name = "Column4";
this.Column4.ReadOnly = true;
this.Column4.Width = 110;
//
// Column7
//
this.Column7.DataPropertyName = "temperature";
this.Column7.HeaderText = "温度(℃)";
this.Column7.MinimumWidth = 6;
this.Column7.Name = "Column7";
this.Column7.ReadOnly = true;
this.Column7.Width = 150;
//
// Column5
//
this.Column5.DataPropertyName = "dwelltime";
this.Column5.HeaderText = "保压时间(h)";
this.Column5.MinimumWidth = 6;
this.Column5.Name = "Column5";
this.Column5.ReadOnly = true;
this.Column5.Width = 110;
//
// ColumnPressureDiff
//
this.ColumnPressureDiff.DataPropertyName = "pressuresetting";
this.ColumnPressureDiff.HeaderText = "压差设置";
this.ColumnPressureDiff.MinimumWidth = 6;
this.ColumnPressureDiff.Name = "ColumnPressureDiff";
this.ColumnPressureDiff.ReadOnly = true;
this.ColumnPressureDiff.Width = 125;
//
// ColumnStandardError
//
this.ColumnStandardError.DataPropertyName = "standarderror";
this.ColumnStandardError.HeaderText = "标准误差";
this.ColumnStandardError.MinimumWidth = 6;
this.ColumnStandardError.Name = "ColumnStandardError";
this.ColumnStandardError.ReadOnly = true;
this.ColumnStandardError.Width = 125;
//
// Column8
//
this.Column8.DataPropertyName = "TemperatureMode";
this.Column8.HeaderText = "温度模式";
this.Column8.MinimumWidth = 8;
this.Column8.Name = "Column8";
this.Column8.ReadOnly = true;
this.Column8.Width = 110;
//
// Column6
//
this.Column6.DataPropertyName = "CreateTime";
this.Column6.HeaderText = "录入时间";
this.Column6.MinimumWidth = 6;
this.Column6.Name = "Column6";
this.Column6.ReadOnly = true;
this.Column6.Width = 150;
//
// uiTextBox2
//
this.uiTextBox2.Cursor = System.Windows.Forms.Cursors.IBeam;
@@ -344,11 +470,11 @@
//
this.uiLabel41.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.uiLabel41.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.uiLabel41.Location = new System.Drawing.Point(390, 61);
this.uiLabel41.Location = new System.Drawing.Point(344, 57);
this.uiLabel41.Name = "uiLabel41";
this.uiLabel41.Size = new System.Drawing.Size(125, 30);
this.uiLabel41.Size = new System.Drawing.Size(178, 30);
this.uiLabel41.TabIndex = 17;
this.uiLabel41.Text = "保压时间设置(h):";
this.uiLabel41.Text = "保压时间设置(min):";
this.uiLabel41.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// uiLabel4
@@ -653,132 +779,6 @@
this.uiPanelTop.Text = null;
this.uiPanelTop.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
//
// Column1
//
this.Column1.DataPropertyName = "Id";
this.Column1.HeaderText = "编号";
this.Column1.MinimumWidth = 6;
this.Column1.Name = "Column1";
this.Column1.ReadOnly = true;
this.Column1.Width = 75;
//
// SerialNumber
//
this.SerialNumber.HeaderText = "序号";
this.SerialNumber.MinimumWidth = 8;
this.SerialNumber.Name = "SerialNumber";
this.SerialNumber.ReadOnly = true;
this.SerialNumber.Width = 75;
//
// ColumnContactNumber
//
this.ColumnContactNumber.DataPropertyName = "lldh";
this.ColumnContactNumber.HeaderText = "联络单号";
this.ColumnContactNumber.MinimumWidth = 6;
this.ColumnContactNumber.Name = "ColumnContactNumber";
this.ColumnContactNumber.ReadOnly = true;
this.ColumnContactNumber.Visible = false;
this.ColumnContactNumber.Width = 150;
//
// ColumnItemNumber
//
this.ColumnItemNumber.DataPropertyName = "jh";
this.ColumnItemNumber.HeaderText = "件号";
this.ColumnItemNumber.MinimumWidth = 6;
this.ColumnItemNumber.Name = "ColumnItemNumber";
this.ColumnItemNumber.ReadOnly = true;
this.ColumnItemNumber.Width = 150;
//
// ColumnEngravingNumber
//
this.ColumnEngravingNumber.DataPropertyName = "kzh";
this.ColumnEngravingNumber.HeaderText = "刻字号";
this.ColumnEngravingNumber.MinimumWidth = 6;
this.ColumnEngravingNumber.Name = "ColumnEngravingNumber";
this.ColumnEngravingNumber.ReadOnly = true;
this.ColumnEngravingNumber.Width = 120;
//
// ColumnQuantity
//
this.ColumnQuantity.DataPropertyName = "Quantity";
this.ColumnQuantity.HeaderText = "数量";
this.ColumnQuantity.MinimumWidth = 6;
this.ColumnQuantity.Name = "ColumnQuantity";
this.ColumnQuantity.ReadOnly = true;
this.ColumnQuantity.Width = 80;
//
// Column3
//
this.Column3.DataPropertyName = "diffpressure";
this.Column3.HeaderText = "压力设置(PSI)";
this.Column3.MinimumWidth = 6;
this.Column3.Name = "Column3";
this.Column3.ReadOnly = true;
this.Column3.Width = 150;
//
// Column4
//
this.Column4.DataPropertyName = "exit_temperature";
this.Column4.HeaderText = "出口温度(℃)";
this.Column4.MinimumWidth = 6;
this.Column4.Name = "Column4";
this.Column4.ReadOnly = true;
this.Column4.Width = 110;
//
// Column7
//
this.Column7.DataPropertyName = "temperature";
this.Column7.HeaderText = "温度(℃)";
this.Column7.MinimumWidth = 6;
this.Column7.Name = "Column7";
this.Column7.ReadOnly = true;
this.Column7.Width = 150;
//
// Column5
//
this.Column5.DataPropertyName = "dwelltime";
this.Column5.HeaderText = "保压时间(h)";
this.Column5.MinimumWidth = 6;
this.Column5.Name = "Column5";
this.Column5.ReadOnly = true;
this.Column5.Width = 110;
//
// ColumnPressureDiff
//
this.ColumnPressureDiff.DataPropertyName = "pressuresetting";
this.ColumnPressureDiff.HeaderText = "压差设置";
this.ColumnPressureDiff.MinimumWidth = 6;
this.ColumnPressureDiff.Name = "ColumnPressureDiff";
this.ColumnPressureDiff.ReadOnly = true;
this.ColumnPressureDiff.Width = 125;
//
// ColumnStandardError
//
this.ColumnStandardError.DataPropertyName = "standarderror";
this.ColumnStandardError.HeaderText = "标准误差";
this.ColumnStandardError.MinimumWidth = 6;
this.ColumnStandardError.Name = "ColumnStandardError";
this.ColumnStandardError.ReadOnly = true;
this.ColumnStandardError.Width = 125;
//
// Column8
//
this.Column8.DataPropertyName = "TemperatureMode";
this.Column8.HeaderText = "温度模式";
this.Column8.MinimumWidth = 8;
this.Column8.Name = "Column8";
this.Column8.ReadOnly = true;
this.Column8.Width = 110;
//
// Column6
//
this.Column6.DataPropertyName = "CreateTime";
this.Column6.HeaderText = "录入时间";
this.Column6.MinimumWidth = 6;
this.Column6.Name = "Column6";
this.Column6.ReadOnly = true;
this.Column6.Width = 150;
//
// ScanImport
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;