优化

Src/FrmMain.cs

@@ -77,6 +77,8 @@ namespace Kivii.Client.SampleInbounds
             btnClearCurrentPackage.Enabled = false;
             tbCurrentLocation.Text = "";
             lbCurrentPackageStatus.Text = "";
+            cbAssignOperatorName.Enabled = false;
+            cbAssignOperatorName.DataSource = null;
             cbSetCurrentPackageOwner.DataSource = null;
             cbSetCurrentPackageOwner.DisplayMember = "FullName";
             cbSetCurrentPackageOwner.ValueMember = "Kvid";
@@ -321,6 +323,7 @@ namespace Kivii.Client.SampleInbounds
                 int indexWuli = _currentOrgs.FindIndex(o => o.FullName.Contains("物理"));
                 this.Invoke(new Action(delegate
                 {
+                    cbAssignOperatorName.Enabled = true;
                     cbSetCurrentPackageOwner.Enabled = true;
                     cbSetCurrentPackageOwner.DataSource = _currentOrgs;
                     if (indexWuli != -1) cbSetCurrentPackageOwner.SelectedIndex = indexWuli;
@@ -564,6 +567,8 @@ namespace Kivii.Client.SampleInbounds
                             record.IsMatched = true;
                         }
                     }
+                    _currentPackageSamples = _currentPackageSamples.OrderBy(o => o.IsMatched).ThenBy(o => o.BizId).ToList();
+
                     this.Invoke(new Action(delegate
                     {
                         dgvSamples.DataSource = _currentPackageSamples;
@@ -638,6 +643,8 @@ namespace Kivii.Client.SampleInbounds
             var request = new SampleAssign();
             request.Kvids = kvids;
             request.Location = _currentLocation;
+            request.Route = new Route();
+            request.Route.OperatorName = cbAssignOperatorName.Text;
             //var task = _client.PostAsync(request);
             try
             {
@@ -931,6 +938,11 @@ namespace Kivii.Client.SampleInbounds
 
         private void btnSampleAssign_Click(object sender, EventArgs e)
         {
+            if (cbAssignOperatorName.Text.IsNullOrEmpty())
+            {
+                MessageBox.Show("请先设置好交接人信息", "设置");
+                return;
+            }
             if (_currentScanSamples.IsNullOrEmpty()) return;
             var assignSamples = _currentScanSamples.ToList();//new一个list不影响原来的数组
             preSampleAssigning(assignSamples);
@@ -975,5 +987,13 @@ namespace Kivii.Client.SampleInbounds
                 dgvRfidSamples.DataSource = _currentScanSamples;
             }));
         }
+
+        private void cbAssignOperatorName_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+
+            }
+        }
     }
 }

Src/Requests/RestfulRequests.cs

@@ -44,6 +44,8 @@ namespace Kivii.Samples.Transforms
     {
         public List<Guid> Kvids { get; set; }//要流转样品信息
         public Location Location { get; set; }//地点位置信息,只需要InternalCode
+        public Route Route { get; set; }//自定义路由信息,可不填写
+
     }
 
     [Route(Configs.RouteSamplePackaging)]