优化

Src/FrmMain.cs

@@ -898,19 +898,19 @@ namespace Kivii.Client.SampleInbounds
                 if (_currentScanSamples == null) _currentScanSamples = new List<Sample>();
                 foreach (var record in resp.Results)
                 {
+                    outputMessage($"{record.BizId}样品:[{record.Name}]交接至{_currentLocation.Address}完成.");
                     if (_currentScanSamples.Exists(o => o.Kvid == record.Kvid))
                     {
                         _currentScanSamples.RemoveAll(o => o.Kvid == record.Kvid);
-                        outputMessage($"{record.BizId}样品:[{record.Name}]交接至{_currentLocation.Address}完成.");
+                        this.Invoke(new Action(delegate
+                        {
+                            dgvRfidSamples.DataSource = null;
+                        }));
+                        this.Invoke(new Action(delegate
+                        {
+                            dgvRfidSamples.DataSource = _currentScanSamples;
+                        }));
                     }
-                    this.Invoke(new Action(delegate
-                    {
-                        dgvRfidSamples.DataSource = null;
-                    }));
-                    this.Invoke(new Action(delegate
-                    {
-                        dgvRfidSamples.DataSource = _currentScanSamples;
-                    }));
                 }
                 
             }
@@ -926,6 +926,7 @@ namespace Kivii.Client.SampleInbounds
             var kvids = new List<Guid>();
             var unPackageKvids = new List<Guid>();
             var notCurrentPackageKvids = new List<Guid>();
+            if (_currentScanSamples.IsNullOrEmpty()) _currentScanSamples = new List<Sample>();
             foreach (var sample in samples)//过滤重复交接的
             {
                 if (sample.PackageKvid == Guid.Empty)//扫描的样品并未在设置的包裹里
@@ -940,12 +941,12 @@ namespace Kivii.Client.SampleInbounds
                 }
                 if (sample.CurrentLocation == null)
                 {
+                    outputMessage($"{sample.BizId}样品:[{sample.Name}]无地点信息,已移除交接.");
                     this.Invoke(new Action(delegate
                     {
                         dgvRfidSamples.DataSource = null;
                     }));
                     _currentScanSamples.RemoveAll(o => o.Kvid == sample.Kvid);
-                    outputMessage($"{sample.BizId}样品:[{sample.Name}]无地点信息,已移除交接.");
 
                     this.Invoke(new Action(delegate
                     {
@@ -955,12 +956,12 @@ namespace Kivii.Client.SampleInbounds
                 }
                 if (sample.CurrentLocation.InternalCode == _currentLocation.InternalCode)
                 {
+                    outputMessage($"{sample.BizId}样品:[{sample.Name}]已经在仓库,重复交接,已自动移除.");
                     this.Invoke(new Action(delegate
                     {
                         dgvRfidSamples.DataSource = null;
                     }));
                     _currentScanSamples.RemoveAll(o => o.Kvid == sample.Kvid);
-                    outputMessage($"{sample.BizId}样品:[{sample.Name}]已经在仓库,重复交接,已自动移除.");
 
                     this.Invoke(new Action(delegate
                     {
@@ -1003,7 +1004,7 @@ namespace Kivii.Client.SampleInbounds
                 //tbSetCurrentPackage.Enabled = !btnLogin.Enabled;
                 setDefault(tbxServiceUrl, tbxUserName, tbxPassword);
                 outputMessage($"登录成功,登录人:{resp.DisplayName}", true);
-                //connectReader();
+                connectReader();
             }, true);
             task.Error(err =>
             {
@@ -1302,7 +1303,8 @@ namespace Kivii.Client.SampleInbounds
                 lbPackageSamplesCount.Text = _currentPackageSamples.Count.ToString();
                 lbPackageSampleMissCount.Text = _currentPackageSamples.Where(o => !o.IsMatched).Count().ToString();
             }));
-            sampleAssigning(new List<Guid> { currentRowSample.Kvid });
+            preSampleAssigning(new List<Sample> { currentRowSample });
+            //sampleAssigning(new List<Guid> { currentRowSample.Kvid });
         }
     }
 }

Src/Requests/RestfulRequests.cs

@@ -20,12 +20,13 @@ namespace Kivii.Samples.Transforms
         public SampleType Type { get; set; }
 
         public Guid? Kvid { get; set; }
+        //public bool IncludeLocation { get; set; } = true;
     }
 
     [Route(Configs.RouteSampleQuery)]
     public class SampleQuery2 : IReturn<RestfulQueryResponse<Sample>>
     {
-        //public bool IncludeLocation { get; set; } = true;
+        public bool IncludeLocation { get; set; } = true;
         public Guid PackageKvid { get; set; }
     }