merge

全自动水压检测仪/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,10 +84,11 @@ namespace 全自动水压检测仪
                     temperatureMode = "高温模式";
                 }
 
-                // 获取联络单号和件号
+                // 获取联络单号、件号、刻字号和数量
                 string contactNumber = uiTextBox2?.Text?.Trim() ?? "";
                 string itemNumber = uiTextBox11?.Text?.Trim() ?? "";
-
+                string engravingNumber = uiTextBoxEngravingNumber?.Text?.Trim() ?? "";
+                
                 if (string.IsNullOrEmpty(contactNumber))
                 {
                     MessageBox.Show("请输入联络单号！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
@@ -104,22 +111,16 @@ namespace 全自动水压检测仪
                         barcode = barcode,
                         ContactNumber = contactNumber,
                         ItemNumber = itemNumber,
+                        EngravingNumber = engravingNumber,
+                        Quantity = quantity,
                         diffpressure = diffpressure,
                         exit_temperature = exit_temperature,
                         dwelltime = dwelltime,
                         IsHighMode = temperature > 0,
                         temperature = temperature,
-                        TemperatureMode = temperatureMode,
-
-                        //新增
-                        jh = string.Empty,
-                        kzh = string.Empty,
-                        lldh = string.Empty,
-                        pressuresetting = 0,
-                        quantity = 0,
-                        standarderror = 0,
-
-
+                        PressureDifference = pressureDifference,
+                        StandardError = standardError,
+                        TemperatureMode = temperatureMode
                     });
 
                     // 重新加载数据
@@ -141,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;
         }