优化

.gitignore

@@ -7,3 +7,4 @@
 /packages
 /.vs
 /Src/bin/Debug
+/Src/obj/Release

Src/FrmMain.cs

@@ -225,10 +225,6 @@ namespace Kivii.Client.SampleInbounds
                         _currentTotalEpcs.Add(epc);
                         samplePreAssigning(null, epc);
                     }
-                    this.Invoke(new Action(delegate
-                    {
-                        outputMessage($"共扫描到:{_currentTotalEpcs.Count}个Rfid。");
-                    }));
                     break;
                 case 0x74:
                     ReaderExtension.ProcessSetWorkAntenna(msgTran, reader, currentInventoryBuffer, currentSetting, m_bInventory);
@@ -378,17 +374,17 @@ namespace Kivii.Client.SampleInbounds
             btnClearCurrentPackage.Enabled = _currentPackage != null;
             //cbSetCurrentPackageNode.Enabled = _currentPackage.Status == (int)PackageStatus.Empty || _currentPackage.Status == (int)PackageStatus.Full;
             //btnScanRfid.Enabled = _currentPackage.Status == (int)PackageStatus.Full;
-            btnSampleAssign.Enabled = _currentPackage.Status == (int)PackageStatus.Full;
+            btnSampleAssign.Enabled = _currentPackage.Status != (int)PackageStatus.Inbound;
             //tbScanSample.Enabled = _currentPackage.Status == (int)PackageStatus.Full;
             //tbScanSample.Text = "";
             if (_currentPackage.Status != (int)PackageStatus.Empty)
             {
                 querySampleInPackaged();
             }
-            if (_currentPackage.Status != (int)PackageStatus.Full)
+            if (_currentPackage.Status == (int)PackageStatus.Inbound)
             {
-                lbCurrentPackageStatus.Text = _currentPackage.Status == (int)PackageStatus.Inbound ? "当前箱子已入库" : "当前箱子无样品";
-                outputMessage($"当前箱子为{(_currentPackage.Status == (int)PackageStatus.Inbound ? "已入库" : "空闲")}状态,无法继续操作!");
+                lbCurrentPackageStatus.Text = "当前箱子已入库";
+                outputMessage($"当前箱子为已入库状态,无法继续操作!");
                 return;
             }
             Thread.Sleep(200);
@@ -456,6 +452,8 @@ namespace Kivii.Client.SampleInbounds
             this.Invoke(new Action(delegate
             {
                 dgvSamples.DataSource = null;
+                lbPackageSamplesCount.Text = "0";
+                lbPackageSampleMissCount.Text = "0";
             }));
             var request = new SampleQuery2();
             request.PackageKvid = _currentPackage.Kvid;
@@ -486,6 +484,8 @@ namespace Kivii.Client.SampleInbounds
                 {
                     if (index != -1) cbSetCurrentPackageOwner.SelectedIndex = index;
                     dgvSamples.DataSource = _currentPackageSamples;
+                    lbPackageSamplesCount.Text = _currentPackageSamples.Count.ToString();
+                    lbPackageSampleMissCount.Text = _currentPackageSamples.Where(o => !o.IsMatched).Count().ToString();
                 }));
                 outputMessage($"成功查询到箱号:{_currentPackage.Name}中{_currentPackageSamples.Count}件样品!");
             });
@@ -530,6 +530,8 @@ namespace Kivii.Client.SampleInbounds
                 this.Invoke(new Action(delegate
                 {
                     dgvRfidSamples.DataSource = null;
+                    lbScanSamplesCount.Text = "0";
+                    lbScanSampleMoreCount.Text = "0";
                 }));
                 if (_currentScanSamples == null) _currentScanSamples = new List<Sample>();
                 if (!_currentPackageSamples.IsNullOrEmpty())
@@ -549,15 +551,20 @@ namespace Kivii.Client.SampleInbounds
                     this.Invoke(new Action(delegate
                     {
                         dgvSamples.DataSource = _currentPackageSamples;
+                        lbPackageSamplesCount.Text = _currentPackageSamples.Count.ToString();
+                        lbPackageSampleMissCount.Text = _currentPackageSamples.Where(o => !o.IsMatched).Count().ToString();
                     }));
                 }
                 if (!_currentScanSamples.Exists(o => o.Kvid == record.Kvid))
                 {
                     _currentScanSamples.Add(record);
+                    outputMessage($"扫描结果增加：报告号[{record.BizId}]");
                 }
                 this.Invoke(new Action(delegate
                 {
                     dgvRfidSamples.DataSource = _currentScanSamples;
+                    lbScanSamplesCount.Text = _currentScanSamples.Count.ToString();
+                    lbScanSampleMoreCount.Text = _currentScanSamples.Where(o => !o.IsMatched).Count().ToString();
                 }));
                 //sampleAssigning(record);
             }
@@ -793,6 +800,10 @@ namespace Kivii.Client.SampleInbounds
             btnClearCurrentPackage.Enabled = false;
             //btnScanRfid.Enabled = false;
             btnSampleAssign.Enabled = false;
+            lbPackageSamplesCount.Text = "0";
+            lbPackageSampleMissCount.Text = "0";
+            lbScanSamplesCount.Text = "0";
+            lbScanSampleMoreCount.Text = "0";
             //tbScanSample.Enabled = false;
             //tbScanSample.Text = "";
             lbCurrentPackageStatus.Text = "";
@@ -824,17 +835,17 @@ namespace Kivii.Client.SampleInbounds
 
         private void dgvRfidSamples_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e)
         {
-            dgvSamples.TopLeftHeaderCell.Value = "序号";
+            dgvRfidSamples.TopLeftHeaderCell.Value = "序号";
             //自动编号，与数据无关
             Rectangle rectangle = new Rectangle(e.RowBounds.Location.X,
                e.RowBounds.Location.Y,
-               dgvSamples.RowHeadersWidth - 4,
+               dgvRfidSamples.RowHeadersWidth - 4,
                e.RowBounds.Height);
             TextRenderer.DrawText(e.Graphics,
                   (e.RowIndex + 1).ToString(),
-                   dgvSamples.RowHeadersDefaultCellStyle.Font,
+                   dgvRfidSamples.RowHeadersDefaultCellStyle.Font,
                    rectangle,
-                   dgvSamples.RowHeadersDefaultCellStyle.ForeColor,
+                   dgvRfidSamples.RowHeadersDefaultCellStyle.ForeColor,
                    TextFormatFlags.VerticalCenter | TextFormatFlags.Right);
         }