优化

Src/FrmMain.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
             this.plLeft = new System.Windows.Forms.Panel();
@@ -477,6 +476,7 @@
             // 
             this.gbMain.Controls.Add(this.dgvSamples);
             this.gbMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gbMain.Font = new System.Drawing.Font("宋体", 9F);
             this.gbMain.Location = new System.Drawing.Point(0, 0);
             this.gbMain.Name = "gbMain";
             this.gbMain.Size = new System.Drawing.Size(912, 534);
@@ -498,14 +498,6 @@
             this.SampleDeadTime,
             this.SamplePackageName,
             this.SampleQuantityUnit});
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F);
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvSamples.DefaultCellStyle = dataGridViewCellStyle2;
             this.dgvSamples.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvSamples.Location = new System.Drawing.Point(3, 17);
             this.dgvSamples.Name = "dgvSamples";
@@ -513,6 +505,7 @@
             this.dgvSamples.RowTemplate.Height = 23;
             this.dgvSamples.Size = new System.Drawing.Size(906, 514);
             this.dgvSamples.TabIndex = 0;
+            this.dgvSamples.DataSourceChanged += new System.EventHandler(this.dgvSamples_DataSourceChanged);
             this.dgvSamples.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSamples_CellContentClick);
             this.dgvSamples.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvSamples_RowPostPaint);
             // 
@@ -602,7 +595,7 @@
             this.Controls.Add(this.plLeft);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "FrmMain";
-            this.Text = "样品入箱客户端 1.6(23.7.270 CP2101)";
+            this.Text = "样品入箱客户端 1.7(23.8.070 CP2101)";
             this.Load += new System.EventHandler(this.FrmMain_Load);
             this.plLeft.ResumeLayout(false);
             this.gbInfo.ResumeLayout(false);

Src/FrmMain.cs

@@ -751,7 +751,10 @@ namespace Kivii.Client.SamplePackages
             }
             var currentRowSample = _currentSamples[e.RowIndex];
             if (currentRowSample == null) return;
-            sampleUnpackaging(currentRowSample);
+            if (MessageBox.Show("是否确认撤销入箱？", "撤销入箱确认", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+            {
+                sampleUnpackaging(currentRowSample);
+            }
         }
 
         private void tbScanSample_KeyDown(object sender, KeyEventArgs e)
@@ -786,5 +789,13 @@ namespace Kivii.Client.SamplePackages
         {
             Reader.InstallDriver();
         }
+
+
+        private void dgvSamples_DataSourceChanged(object sender, EventArgs e)
+        {
+            int count = dgvSamples.RowCount;
+            if (count <= 0) gbMain.Text = "入箱列表";
+            else gbMain.Text = $"当前箱内数量：{count}";
+        }
     }
 }

Src/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.2023.7270")]
-[assembly: AssemblyFileVersion("5.4.2023.7270")]
+[assembly: AssemblyVersion("5.4.2023.8070")]
+[assembly: AssemblyFileVersion("5.4.2023.8070")]