优化了扫描到样品后不交接的情况下不能重置箱号的bug

Src/FrmMain.cs

@@ -185,7 +185,7 @@ namespace Kivii.Client.SampleInbounds
             //设置回调方法
             reader.AnalyCallback = AnalyData;
             reader.GetFrequencyRegion(currentSetting.btReadId);
-            Thread.Sleep(500);
+            Thread.Sleep(50);
 
             currentInventoryBuffer.ClearInventoryPar();
             currentInventoryBuffer.btRepeat = Convert.ToByte(1);//设置每条命令盘存次数 1次
@@ -295,7 +295,7 @@ namespace Kivii.Client.SampleInbounds
                 btnScanRfid.BackColor = Color.PapayaWhip;
                 btnScanRfid.ForeColor = Color.Chocolate;
             }));
-            Thread.Sleep(400);
+            Thread.Sleep(50);
             disConnectReader();
             outputMessage("停止扫描");
             return;
@@ -857,6 +857,10 @@ namespace Kivii.Client.SampleInbounds
                 if (_currentScanSamples == null) _currentScanSamples = new List<Sample>();
                 foreach (var record in resp.Results)
                 {
+                    this.Invoke(new Action(delegate
+                    {
+                        dgvRfidSamples.DataSource = null;
+                    }));
                     if (_currentScanSamples.Exists(o => o.Kvid == record.Kvid))
                     {
                         _currentScanSamples.RemoveAll(o => o.Kvid == record.Kvid);
@@ -864,10 +868,6 @@ namespace Kivii.Client.SampleInbounds
                     }
                     this.Invoke(new Action(delegate
                     {
-                        dgvRfidSamples.DataSource = null;
-                    }));
-                    this.Invoke(new Action(delegate
-                    {
                         dgvRfidSamples.DataSource = _currentScanSamples;
                     }));
                 }
@@ -1080,6 +1080,12 @@ namespace Kivii.Client.SampleInbounds
 
         private void btnClearCurrentPackage_Click(object sender, EventArgs e)
         {
+            btnRealTimeInventory_Stop();
+            this.Invoke(new Action(delegate
+            {
+                dgvSamples.DataSource = null;
+                dgvRfidSamples.DataSource = null;
+            }));
             _currentPackage = null;
             _currentPackageSamples = null;
             _currentScanSamples = null;
@@ -1100,9 +1106,6 @@ namespace Kivii.Client.SampleInbounds
             //cbSetCurrentPackageOwner.DisplayMember = "OwnerName";
             //cbSetCurrentPackageOwner.ValueMember = "OwnerKvid";
             //cbSetCurrentPackageOwner.Enabled = false;
-            dgvSamples.DataSource = null;
-            dgvRfidSamples.DataSource = null;
-            btnRealTimeInventory_Stop();
             outputMessage($"箱号已重设!");
         }
 
@@ -1189,7 +1192,7 @@ namespace Kivii.Client.SampleInbounds
                     MessageBox.Show("读写器未连接,请查看是否读写器设备!");
                     return;
                 }
-                Thread.Sleep(200);
+                Thread.Sleep(50);
             }
             if (currentInventoryBuffer.bLoopInventory)
             {
@@ -1203,6 +1206,10 @@ namespace Kivii.Client.SampleInbounds
 
         private void btnSampleAssign_Click(object sender, EventArgs e)
         {
+            if (currentInventoryBuffer.bLoopInventory)
+            {
+                btnRealTimeInventory_Stop();
+            }
             if (cbAssignOperatorName.Text.IsNullOrEmpty())
             {
                 MessageBox.Show("请先设置好交接人信息", "设置");

Src/Properties/AssemblyInfo.cs

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