diff --git a/db/rollback_scandata_add_new_fields.sql b/db/rollback_scandata_add_new_fields.sql
new file mode 100644
index 0000000..6b56d28
--- /dev/null
+++ b/db/rollback_scandata_add_new_fields.sql
@@ -0,0 +1,31 @@
+-- 回滚scandata表新增字段：刻字号、数量、压差设置、标准误差
+-- 执行日期：2026-02-04
+
+USE fullautowaterpressure;
+
+-- 删除刻字号字段
+ALTER TABLE scandata
+DROP COLUMN IF EXISTS EngravingNumber;
+
+-- 删除数量字段
+ALTER TABLE scandata
+DROP COLUMN IF EXISTS Quantity;
+
+-- 删除压差设置字段
+ALTER TABLE scandata
+DROP COLUMN IF EXISTS PressureDifference;
+
+-- 删除标准误差字段
+ALTER TABLE scandata
+DROP COLUMN IF EXISTS StandardError;
+
+-- 验证字段是否删除成功
+SELECT
+ COLUMN_NAME,
+ DATA_TYPE,
+ COLUMN_COMMENT
+FROM
+ INFORMATION_SCHEMA.COLUMNS
+WHERE
+ TABLE_SCHEMA = 'fullautowaterpressure'
+ AND TABLE_NAME = 'scandata';
diff --git a/db/upgrade_scandata_add_new_fields.sql b/db/upgrade_scandata_add_new_fields.sql
new file mode 100644
index 0000000..73be3d0
--- /dev/null
+++ b/db/upgrade_scandata_add_new_fields.sql
@@ -0,0 +1,33 @@
+-- 为scandata表添加新字段：刻字号、数量、压差设置、标准误差
+-- 执行日期：2026-02-04
+
+USE fullautowaterpressure;
+
+-- 添加刻字号字段
+ALTER TABLE scandata
+ADD COLUMN IF NOT EXISTS EngravingNumber VARCHAR(100) DEFAULT '' COMMENT '刻字号';
+
+-- 添加数量字段
+ALTER TABLE scandata
+ADD COLUMN IF NOT EXISTS Quantity INT DEFAULT 0 COMMENT '数量';
+
+-- 添加压差设置字段
+ALTER TABLE scandata
+ADD COLUMN IF NOT EXISTS PressureDifference FLOAT DEFAULT 0 COMMENT '压差设置';
+
+-- 添加标准误差字段
+ALTER TABLE scandata
+ADD COLUMN IF NOT EXISTS StandardError FLOAT DEFAULT 0 COMMENT '标准误差';
+
+-- 验证字段是否添加成功
+SELECT
+ COLUMN_NAME,
+ DATA_TYPE,
+ COLUMN_DEFAULT,
+ COLUMN_COMMENT
+FROM
+ INFORMATION_SCHEMA.COLUMNS
+WHERE
+ TABLE_SCHEMA = 'fullautowaterpressure'
+ AND TABLE_NAME = 'scandata'
+ AND COLUMN_NAME IN ('EngravingNumber', 'Quantity', 'PressureDifference', 'StandardError');
diff --git a/全自动水压检测仪/DATA/ConductividyClass.cs b/全自动水压检测仪/DATA/ConductividyClass.cs
index e6adac7..143f95f 100644
--- a/全自动水压检测仪/DATA/ConductividyClass.cs
+++ b/全自动水压检测仪/DATA/ConductividyClass.cs
@@ -81,6 +81,16 @@ namespace 材料热传导系数
///
public string ItemNumber { get; set; }
+ ///
+ /// 刻字号
+ ///
+ public string EngravingNumber { get; set; }
+
+ ///
+ /// 数量
+ ///
+ public int Quantity { get; set; }
+
///
/// 压力
///
@@ -101,6 +111,15 @@ namespace 材料热传导系数
///
public float dwelltime { get; set; }
+ ///
+ /// 压差设置
+ ///
+ public float PressureDifference { get; set; }
+
+ ///
+ /// 标准误差
+ ///
+ public float StandardError { get; set; }
public DateTime CreateTime { get; set; }
@@ -151,9 +170,9 @@ namespace 材料热传导系数
{
connection.Open();
var sql = @"INSERT INTO scandata
- (barcode, ContactNumber, ItemNumber, diffpressure, exit_temperature, temperature, dwelltime, CreateTime, TemperatureMode)
+ (barcode, ContactNumber, ItemNumber, EngravingNumber, Quantity, diffpressure, exit_temperature, temperature, dwelltime, PressureDifference, StandardError, CreateTime, TemperatureMode)
VALUES
- (@barcode, @ContactNumber, @ItemNumber, @diffpressure, @exit_temperature, @temperature, @dwelltime, CURRENT_TIMESTAMP, @TemperatureMode)";
+ (@barcode, @ContactNumber, @ItemNumber, @EngravingNumber, @Quantity, @diffpressure, @exit_temperature, @temperature, @dwelltime, @PressureDifference, @StandardError, CURRENT_TIMESTAMP, @TemperatureMode)";
connection.Execute(sql, data);
}
}
diff --git a/全自动水压检测仪/ScanImport.Designer.cs b/全自动水压检测仪/ScanImport.Designer.cs
index 020d4b8..835cab3 100644
--- a/全自动水压检测仪/ScanImport.Designer.cs
+++ b/全自动水压检测仪/ScanImport.Designer.cs
@@ -39,22 +39,34 @@
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();
+ this.uiTextBoxQuantity = new Sunny.UI.UITextBox();
this.uiLabel50 = new Sunny.UI.UILabel();
this.uiLabel51 = new Sunny.UI.UILabel();
+ this.uiLabelEngravingNumber = new Sunny.UI.UILabel();
+ this.uiLabelQuantity = new Sunny.UI.UILabel();
this.uiLabel48 = new Sunny.UI.UILabel();
this.uiTextBox9 = new Sunny.UI.UITextBox();
this.uiTextBox5 = new Sunny.UI.UITextBox();
this.uiLabel41 = new Sunny.UI.UILabel();
this.uiLabel4 = new Sunny.UI.UILabel();
this.uiTextBox4 = new Sunny.UI.UITextBox();
+ this.uiTextBoxPressureDiff = new Sunny.UI.UITextBox();
+ this.uiTextBoxStandardError = new Sunny.UI.UITextBox();
+ this.uiLabelPressureDiff = new Sunny.UI.UILabel();
+ this.uiLabelStandardError = new Sunny.UI.UILabel();
this.uiButton1 = new Sunny.UI.UIButton();
this.uiLabel1 = new Sunny.UI.UILabel();
this.uiTextBox1 = new Sunny.UI.UITextBox();
@@ -120,10 +132,14 @@
this.SerialNumber,
this.ColumnContactNumber,
this.ColumnItemNumber,
+ this.ColumnEngravingNumber,
+ this.ColumnQuantity,
this.Column3,
this.Column4,
this.Column7,
this.Column5,
+ this.ColumnPressureDiff,
+ this.ColumnStandardError,
this.Column8,
this.Column6});
dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
@@ -200,6 +216,24 @@
this.ColumnItemNumber.ReadOnly = true;
this.ColumnItemNumber.Width = 150;
//
+ // ColumnEngravingNumber
+ //
+ this.ColumnEngravingNumber.DataPropertyName = "EngravingNumber";
+ 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";
@@ -236,6 +270,24 @@
this.Column5.ReadOnly = true;
this.Column5.Width = 110;
//
+ // ColumnPressureDiff
+ //
+ this.ColumnPressureDiff.DataPropertyName = "PressureDifference";
+ this.ColumnPressureDiff.HeaderText = "压差设置";
+ this.ColumnPressureDiff.MinimumWidth = 6;
+ this.ColumnPressureDiff.Name = "ColumnPressureDiff";
+ this.ColumnPressureDiff.ReadOnly = true;
+ this.ColumnPressureDiff.Width = 100;
+ //
+ // ColumnStandardError
+ //
+ this.ColumnStandardError.DataPropertyName = "StandardError";
+ this.ColumnStandardError.HeaderText = "标准误差";
+ this.ColumnStandardError.MinimumWidth = 6;
+ this.ColumnStandardError.Name = "ColumnStandardError";
+ this.ColumnStandardError.ReadOnly = true;
+ this.ColumnStandardError.Width = 100;
+ //
// Column8
//
this.Column8.DataPropertyName = "TemperatureMode";
@@ -304,12 +356,68 @@
this.uiTextBox11.Padding = new System.Windows.Forms.Padding(8, 5, 8, 5);
this.uiTextBox11.RectSize = 2;
this.uiTextBox11.ShowText = false;
- this.uiTextBox11.Size = new System.Drawing.Size(200, 38);
+ this.uiTextBox11.Size = new System.Drawing.Size(150, 38);
this.uiTextBox11.Style = Sunny.UI.UIStyle.Custom;
this.uiTextBox11.TabIndex = 33;
this.uiTextBox11.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiTextBox11.Watermark = "请输入件号";
//
+ // uiLabelEngravingNumber
+ //
+ this.uiLabelEngravingNumber.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold);
+ this.uiLabelEngravingNumber.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+ this.uiLabelEngravingNumber.Location = new System.Drawing.Point(20, 15);
+ this.uiLabelEngravingNumber.Name = "uiLabelEngravingNumber";
+ this.uiLabelEngravingNumber.Size = new System.Drawing.Size(80, 35);
+ this.uiLabelEngravingNumber.TabIndex = 34;
+ this.uiLabelEngravingNumber.Text = "刻字号:";
+ this.uiLabelEngravingNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // uiTextBoxEngravingNumber
+ //
+ this.uiTextBoxEngravingNumber.Cursor = System.Windows.Forms.Cursors.IBeam;
+ this.uiTextBoxEngravingNumber.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.uiTextBoxEngravingNumber.Location = new System.Drawing.Point(105, 13);
+ this.uiTextBoxEngravingNumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.uiTextBoxEngravingNumber.MinimumSize = new System.Drawing.Size(1, 16);
+ this.uiTextBoxEngravingNumber.Name = "uiTextBoxEngravingNumber";
+ this.uiTextBoxEngravingNumber.Padding = new System.Windows.Forms.Padding(8, 5, 8, 5);
+ this.uiTextBoxEngravingNumber.RectSize = 2;
+ this.uiTextBoxEngravingNumber.ShowText = false;
+ this.uiTextBoxEngravingNumber.Size = new System.Drawing.Size(80, 38);
+ this.uiTextBoxEngravingNumber.Style = Sunny.UI.UIStyle.Custom;
+ this.uiTextBoxEngravingNumber.TabIndex = 35;
+ this.uiTextBoxEngravingNumber.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ this.uiTextBoxEngravingNumber.Watermark = "刻字号";
+ //
+ // uiLabelQuantity
+ //
+ this.uiLabelQuantity.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold);
+ this.uiLabelQuantity.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+ this.uiLabelQuantity.Location = new System.Drawing.Point(770, 15);
+ this.uiLabelQuantity.Name = "uiLabelQuantity";
+ this.uiLabelQuantity.Size = new System.Drawing.Size(60, 35);
+ this.uiLabelQuantity.TabIndex = 36;
+ this.uiLabelQuantity.Text = "数量:";
+ this.uiLabelQuantity.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // uiTextBoxQuantity
+ //
+ this.uiTextBoxQuantity.Cursor = System.Windows.Forms.Cursors.IBeam;
+ this.uiTextBoxQuantity.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.uiTextBoxQuantity.Location = new System.Drawing.Point(835, 13);
+ this.uiTextBoxQuantity.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.uiTextBoxQuantity.MinimumSize = new System.Drawing.Size(1, 16);
+ this.uiTextBoxQuantity.Name = "uiTextBoxQuantity";
+ this.uiTextBoxQuantity.Padding = new System.Windows.Forms.Padding(8, 5, 8, 5);
+ this.uiTextBoxQuantity.RectSize = 2;
+ this.uiTextBoxQuantity.ShowText = false;
+ this.uiTextBoxQuantity.Size = new System.Drawing.Size(80, 38);
+ this.uiTextBoxQuantity.Style = Sunny.UI.UIStyle.Custom;
+ this.uiTextBoxQuantity.TabIndex = 37;
+ this.uiTextBoxQuantity.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ this.uiTextBoxQuantity.Watermark = "数量";
+ //
// uiLabel48
//
this.uiLabel48.Font = new System.Drawing.Font("微软雅黑", 10.5F);
@@ -443,6 +551,62 @@
this.uiTextBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.uiTextBox1.Watermark = "";
//
+ // uiLabelPressureDiff
+ //
+ this.uiLabelPressureDiff.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+ this.uiLabelPressureDiff.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+ this.uiLabelPressureDiff.Location = new System.Drawing.Point(58, 15);
+ this.uiLabelPressureDiff.Name = "uiLabelPressureDiff";
+ this.uiLabelPressureDiff.Size = new System.Drawing.Size(100, 30);
+ this.uiLabelPressureDiff.TabIndex = 38;
+ this.uiLabelPressureDiff.Text = "压差设置:";
+ this.uiLabelPressureDiff.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // uiTextBoxPressureDiff
+ //
+ this.uiTextBoxPressureDiff.Cursor = System.Windows.Forms.Cursors.IBeam;
+ this.uiTextBoxPressureDiff.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+ this.uiTextBoxPressureDiff.Location = new System.Drawing.Point(158, 15);
+ this.uiTextBoxPressureDiff.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.uiTextBoxPressureDiff.MinimumSize = new System.Drawing.Size(1, 16);
+ this.uiTextBoxPressureDiff.Name = "uiTextBoxPressureDiff";
+ this.uiTextBoxPressureDiff.Padding = new System.Windows.Forms.Padding(5);
+ this.uiTextBoxPressureDiff.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
+ this.uiTextBoxPressureDiff.ShowText = false;
+ this.uiTextBoxPressureDiff.Size = new System.Drawing.Size(91, 35);
+ this.uiTextBoxPressureDiff.Style = Sunny.UI.UIStyle.Custom;
+ this.uiTextBoxPressureDiff.TabIndex = 39;
+ this.uiTextBoxPressureDiff.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+ this.uiTextBoxPressureDiff.Watermark = "";
+ //
+ // uiLabelStandardError
+ //
+ this.uiLabelStandardError.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+ this.uiLabelStandardError.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+ this.uiLabelStandardError.Location = new System.Drawing.Point(260, 15);
+ this.uiLabelStandardError.Name = "uiLabelStandardError";
+ this.uiLabelStandardError.Size = new System.Drawing.Size(100, 30);
+ this.uiLabelStandardError.TabIndex = 40;
+ this.uiLabelStandardError.Text = "标准误差:";
+ this.uiLabelStandardError.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // uiTextBoxStandardError
+ //
+ this.uiTextBoxStandardError.Cursor = System.Windows.Forms.Cursors.IBeam;
+ this.uiTextBoxStandardError.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+ this.uiTextBoxStandardError.Location = new System.Drawing.Point(360, 15);
+ this.uiTextBoxStandardError.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.uiTextBoxStandardError.MinimumSize = new System.Drawing.Size(1, 16);
+ this.uiTextBoxStandardError.Name = "uiTextBoxStandardError";
+ this.uiTextBoxStandardError.Padding = new System.Windows.Forms.Padding(5);
+ this.uiTextBoxStandardError.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
+ this.uiTextBoxStandardError.ShowText = false;
+ this.uiTextBoxStandardError.Size = new System.Drawing.Size(91, 35);
+ this.uiTextBoxStandardError.Style = Sunny.UI.UIStyle.Custom;
+ this.uiTextBoxStandardError.TabIndex = 41;
+ this.uiTextBoxStandardError.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+ this.uiTextBoxStandardError.Watermark = "";
+ //
// uiCheckBox1
//
this.uiCheckBox1.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -552,10 +716,14 @@
//
// uiPanelTop
//
+ this.uiPanelTop.Controls.Add(this.uiLabelEngravingNumber);
+ this.uiPanelTop.Controls.Add(this.uiTextBoxEngravingNumber);
this.uiPanelTop.Controls.Add(this.uiLabel50);
this.uiPanelTop.Controls.Add(this.uiTextBox2);
this.uiPanelTop.Controls.Add(this.uiLabel51);
this.uiPanelTop.Controls.Add(this.uiTextBox11);
+ this.uiPanelTop.Controls.Add(this.uiLabelQuantity);
+ this.uiPanelTop.Controls.Add(this.uiTextBoxQuantity);
this.uiPanelTop.Dock = System.Windows.Forms.DockStyle.Fill;
this.uiPanelTop.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiPanelTop.Location = new System.Drawing.Point(4, 5);
@@ -569,6 +737,10 @@
//
// uiPanel2
//
+ this.uiPanel2.Controls.Add(this.uiLabelPressureDiff);
+ this.uiPanel2.Controls.Add(this.uiTextBoxPressureDiff);
+ this.uiPanel2.Controls.Add(this.uiLabelStandardError);
+ this.uiPanel2.Controls.Add(this.uiTextBoxStandardError);
this.uiPanel2.Controls.Add(this.uiLabel48);
this.uiPanel2.Controls.Add(this.uiCheckBox2);
this.uiPanel2.Controls.Add(this.uiTextBox9);
@@ -630,14 +802,22 @@
private Sunny.UI.UIDataGridView uiDataGridView1;
private Sunny.UI.UITextBox uiTextBox2;
private Sunny.UI.UITextBox uiTextBox11;
+ private Sunny.UI.UITextBox uiTextBoxEngravingNumber;
+ private Sunny.UI.UITextBox uiTextBoxQuantity;
private Sunny.UI.UILabel uiLabel50;
private Sunny.UI.UILabel uiLabel51;
+ private Sunny.UI.UILabel uiLabelEngravingNumber;
+ private Sunny.UI.UILabel uiLabelQuantity;
private Sunny.UI.UILabel uiLabel48;
private Sunny.UI.UITextBox uiTextBox9;
private Sunny.UI.UITextBox uiTextBox5;
private Sunny.UI.UILabel uiLabel41;
private Sunny.UI.UILabel uiLabel4;
private Sunny.UI.UITextBox uiTextBox4;
+ private Sunny.UI.UITextBox uiTextBoxPressureDiff;
+ private Sunny.UI.UITextBox uiTextBoxStandardError;
+ private Sunny.UI.UILabel uiLabelPressureDiff;
+ private Sunny.UI.UILabel uiLabelStandardError;
private Sunny.UI.UIButton uiButton1;
private Sunny.UI.UILabel uiLabel1;
private Sunny.UI.UITextBox uiTextBox1;
@@ -653,10 +833,14 @@
private System.Windows.Forms.DataGridViewTextBoxColumn SerialNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnContactNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnItemNumber;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnEngravingNumber;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnQuantity;
private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnPressureDiff;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnStandardError;
private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
private Sunny.UI.UIButton uiButton3;
diff --git a/全自动水压检测仪/ScanImport.cs b/全自动水压检测仪/ScanImport.cs
index a1437f1..e1ac06a 100644
--- a/全自动水压检测仪/ScanImport.cs
+++ b/全自动水压检测仪/ScanImport.cs
@@ -63,10 +63,16 @@ namespace 全自动水压检测仪
SafeInvoke(() =>
{
float diffpressure = 0, exit_temperature = 0, dwelltime = 0, temperature = 0;
+ float pressureDifference = 0, standardError = 0;
+ int quantity = 0;
+
float.TryParse(uiTextBox4?.Text ?? "", out diffpressure);
float.TryParse(uiTextBox9?.Text ?? "", out exit_temperature);
float.TryParse(uiTextBox5?.Text ?? "", out dwelltime);
float.TryParse(uiTextBox1?.Text ?? "", out temperature);
+ float.TryParse(uiTextBoxPressureDiff?.Text ?? "", out pressureDifference);
+ float.TryParse(uiTextBoxStandardError?.Text ?? "", out standardError);
+ int.TryParse(uiTextBoxQuantity?.Text ?? "", out quantity);
string temperatureMode = "";
if (uiCheckBox1?.Checked == true)
@@ -78,9 +84,10 @@ namespace 全自动水压检测仪
temperatureMode = "高温模式";
}
- // 获取联络单号和件号
+ // 获取联络单号、件号、刻字号和数量
string contactNumber = uiTextBox2?.Text?.Trim() ?? "";
string itemNumber = uiTextBox11?.Text?.Trim() ?? "";
+ string engravingNumber = uiTextBoxEngravingNumber?.Text?.Trim() ?? "";
if (string.IsNullOrEmpty(contactNumber))
{
@@ -104,11 +111,15 @@ namespace 全自动水压检测仪
barcode = barcode,
ContactNumber = contactNumber,
ItemNumber = itemNumber,
+ EngravingNumber = engravingNumber,
+ Quantity = quantity,
diffpressure = diffpressure,
exit_temperature = exit_temperature,
dwelltime = dwelltime,
IsHighMode = temperature > 0,
temperature = temperature,
+ PressureDifference = pressureDifference,
+ StandardError = standardError,
TemperatureMode = temperatureMode
});
@@ -131,9 +142,13 @@ namespace 全自动水压检测仪
if (uiTextBox1 != null) uiTextBox1.Text = "";
if (uiTextBox2 != null) uiTextBox2.Text = "";
if (uiTextBox11 != null) uiTextBox11.Text = "";
+ if (uiTextBoxEngravingNumber != null) uiTextBoxEngravingNumber.Text = "";
+ if (uiTextBoxQuantity != null) uiTextBoxQuantity.Text = "";
if (uiTextBox4 != null) uiTextBox4.Text = "";
if (uiTextBox5 != null) uiTextBox5.Text = "";
if (uiTextBox9 != null) uiTextBox9.Text = "";
+ if (uiTextBoxPressureDiff != null) uiTextBoxPressureDiff.Text = "";
+ if (uiTextBoxStandardError != null) uiTextBoxStandardError.Text = "";
if (uiCheckBox1 != null) uiCheckBox1.Checked = false;
if (uiCheckBox2 != null) uiCheckBox2.Checked = false;
}