优化

Src/FrmMain.Designer.cs

@@ -60,6 +60,9 @@
             this.plMain = new System.Windows.Forms.Panel();
             this.gbMain = new System.Windows.Forms.GroupBox();
             this.dgvSamples = new System.Windows.Forms.DataGridView();
+            this.tbScanSample = new System.Windows.Forms.TextBox();
+            this.lbScanSample = new System.Windows.Forms.Label();
+            this.lbTips = new System.Windows.Forms.Label();
             this.SampleAction = new System.Windows.Forms.DataGridViewButtonColumn();
             this.SampleBizId = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.SampleOwnerName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -85,7 +88,7 @@
             this.plLeft.Dock = System.Windows.Forms.DockStyle.Left;
             this.plLeft.Location = new System.Drawing.Point(0, 0);
             this.plLeft.Name = "plLeft";
-            this.plLeft.Size = new System.Drawing.Size(265, 594);
+            this.plLeft.Size = new System.Drawing.Size(265, 659);
             this.plLeft.TabIndex = 0;
             // 
             // gbInfo
@@ -101,7 +104,7 @@
             this.gbInfo.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbInfo.Location = new System.Drawing.Point(0, 316);
             this.gbInfo.Name = "gbInfo";
-            this.gbInfo.Size = new System.Drawing.Size(265, 278);
+            this.gbInfo.Size = new System.Drawing.Size(265, 343);
             this.gbInfo.TabIndex = 1;
             this.gbInfo.TabStop = false;
             this.gbInfo.Text = "信息";
@@ -293,11 +296,14 @@
             this.plToolBar.Dock = System.Windows.Forms.DockStyle.Top;
             this.plToolBar.Location = new System.Drawing.Point(265, 0);
             this.plToolBar.Name = "plToolBar";
-            this.plToolBar.Size = new System.Drawing.Size(793, 125);
+            this.plToolBar.Size = new System.Drawing.Size(912, 125);
             this.plToolBar.TabIndex = 1;
             // 
             // gbTools
             // 
+            this.gbTools.Controls.Add(this.lbTips);
+            this.gbTools.Controls.Add(this.lbScanSample);
+            this.gbTools.Controls.Add(this.tbScanSample);
             this.gbTools.Controls.Add(this.btnClearCurrentPackage);
             this.gbTools.Controls.Add(this.btnScanRfid);
             this.gbTools.Controls.Add(this.cbSetCurrentPackageNode);
@@ -307,7 +313,7 @@
             this.gbTools.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbTools.Location = new System.Drawing.Point(0, 0);
             this.gbTools.Name = "gbTools";
-            this.gbTools.Size = new System.Drawing.Size(793, 125);
+            this.gbTools.Size = new System.Drawing.Size(912, 125);
             this.gbTools.TabIndex = 0;
             this.gbTools.TabStop = false;
             this.gbTools.Text = "操作台";
@@ -328,7 +334,7 @@
             this.btnScanRfid.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnScanRfid.Font = new System.Drawing.Font("宋体", 25F, System.Drawing.FontStyle.Bold);
             this.btnScanRfid.ForeColor = System.Drawing.Color.Chocolate;
-            this.btnScanRfid.Location = new System.Drawing.Point(664, 17);
+            this.btnScanRfid.Location = new System.Drawing.Point(783, 17);
             this.btnScanRfid.Name = "btnScanRfid";
             this.btnScanRfid.Size = new System.Drawing.Size(126, 105);
             this.btnScanRfid.TabIndex = 76;
@@ -389,7 +395,7 @@
             this.plMain.Dock = System.Windows.Forms.DockStyle.Fill;
             this.plMain.Location = new System.Drawing.Point(265, 125);
             this.plMain.Name = "plMain";
-            this.plMain.Size = new System.Drawing.Size(793, 469);
+            this.plMain.Size = new System.Drawing.Size(912, 534);
             this.plMain.TabIndex = 2;
             // 
             // gbMain
@@ -398,7 +404,7 @@
             this.gbMain.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbMain.Location = new System.Drawing.Point(0, 0);
             this.gbMain.Name = "gbMain";
-            this.gbMain.Size = new System.Drawing.Size(793, 469);
+            this.gbMain.Size = new System.Drawing.Size(912, 534);
             this.gbMain.TabIndex = 0;
             this.gbMain.TabStop = false;
             this.gbMain.Text = "入箱列表";
@@ -422,11 +428,42 @@
             this.dgvSamples.Name = "dgvSamples";
             this.dgvSamples.ReadOnly = true;
             this.dgvSamples.RowTemplate.Height = 23;
-            this.dgvSamples.Size = new System.Drawing.Size(787, 449);
+            this.dgvSamples.Size = new System.Drawing.Size(906, 514);
             this.dgvSamples.TabIndex = 0;
             this.dgvSamples.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSamples_CellContentClick);
             this.dgvSamples.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvSamples_RowPostPaint);
             // 
+            // tbScanSample
+            // 
+            this.tbScanSample.BackColor = System.Drawing.SystemColors.Window;
+            this.tbScanSample.Font = new System.Drawing.Font("宋体", 18F);
+            this.tbScanSample.Location = new System.Drawing.Point(425, 63);
+            this.tbScanSample.Name = "tbScanSample";
+            this.tbScanSample.Size = new System.Drawing.Size(249, 35);
+            this.tbScanSample.TabIndex = 78;
+            this.tbScanSample.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbScanSample_KeyDown);
+            // 
+            // lbScanSample
+            // 
+            this.lbScanSample.AutoSize = true;
+            this.lbScanSample.Font = new System.Drawing.Font("宋体", 18F);
+            this.lbScanSample.Location = new System.Drawing.Point(421, 36);
+            this.lbScanSample.Name = "lbScanSample";
+            this.lbScanSample.Size = new System.Drawing.Size(118, 24);
+            this.lbScanSample.TabIndex = 79;
+            this.lbScanSample.Text = "手动入箱:";
+            // 
+            // lbTips
+            // 
+            this.lbTips.AutoSize = true;
+            this.lbTips.Font = new System.Drawing.Font("宋体", 10F);
+            this.lbTips.ForeColor = System.Drawing.SystemColors.ButtonShadow;
+            this.lbTips.Location = new System.Drawing.Point(529, 46);
+            this.lbTips.Name = "lbTips";
+            this.lbTips.Size = new System.Drawing.Size(119, 14);
+            this.lbTips.TabIndex = 80;
+            this.lbTips.Text = "(输入完成报告号)";
+            // 
             // SampleAction
             // 
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
@@ -434,37 +471,39 @@
             this.SampleAction.DefaultCellStyle = dataGridViewCellStyle1;
             this.SampleAction.Frozen = true;
             this.SampleAction.HeaderText = "操作";
-            this.SampleAction.MinimumWidth = 100;
+            this.SampleAction.MinimumWidth = 80;
             this.SampleAction.Name = "SampleAction";
             this.SampleAction.ReadOnly = true;
             this.SampleAction.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.SampleAction.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             this.SampleAction.Text = "撤销入箱";
+            this.SampleAction.Width = 80;
             // 
             // SampleBizId
             // 
             this.SampleBizId.DataPropertyName = "BizId";
             this.SampleBizId.Frozen = true;
             this.SampleBizId.HeaderText = "样品报告号";
-            this.SampleBizId.MinimumWidth = 150;
+            this.SampleBizId.MinimumWidth = 160;
             this.SampleBizId.Name = "SampleBizId";
             this.SampleBizId.ReadOnly = true;
-            this.SampleBizId.Width = 150;
+            this.SampleBizId.Width = 160;
             // 
             // SampleOwnerName
             // 
             this.SampleOwnerName.DataPropertyName = "OwnerName";
             this.SampleOwnerName.HeaderText = "所属部门";
-            this.SampleOwnerName.MinimumWidth = 100;
+            this.SampleOwnerName.MinimumWidth = 90;
             this.SampleOwnerName.Name = "SampleOwnerName";
             this.SampleOwnerName.ReadOnly = true;
+            this.SampleOwnerName.Width = 90;
             // 
             // SampleName
             // 
             this.SampleName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.SampleName.DataPropertyName = "Name";
             this.SampleName.HeaderText = "样品名称";
-            this.SampleName.MinimumWidth = 120;
+            this.SampleName.MinimumWidth = 100;
             this.SampleName.Name = "SampleName";
             this.SampleName.ReadOnly = true;
             // 
@@ -472,19 +511,17 @@
             // 
             this.SampleDealTime.DataPropertyName = "DealTime";
             this.SampleDealTime.HeaderText = "委托日期";
-            this.SampleDealTime.MinimumWidth = 120;
+            this.SampleDealTime.MinimumWidth = 100;
             this.SampleDealTime.Name = "SampleDealTime";
             this.SampleDealTime.ReadOnly = true;
-            this.SampleDealTime.Width = 120;
             // 
             // SampleDeadTime
             // 
             this.SampleDeadTime.DataPropertyName = "DeadTime";
             this.SampleDeadTime.HeaderText = "完成日期";
-            this.SampleDeadTime.MinimumWidth = 120;
+            this.SampleDeadTime.MinimumWidth = 100;
             this.SampleDeadTime.Name = "SampleDeadTime";
             this.SampleDeadTime.ReadOnly = true;
-            this.SampleDeadTime.Width = 120;
             // 
             // SampleQuantityUnit
             // 
@@ -507,7 +544,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1058, 594);
+            this.ClientSize = new System.Drawing.Size(1177, 659);
             this.Controls.Add(this.plMain);
             this.Controls.Add(this.plToolBar);
             this.Controls.Add(this.plLeft);
@@ -562,6 +599,9 @@
         private System.Windows.Forms.Button btnScanRfid;
         private System.Windows.Forms.DataGridView dgvSamples;
         private System.Windows.Forms.Button btnClearCurrentPackage;
+        private System.Windows.Forms.TextBox tbScanSample;
+        private System.Windows.Forms.Label lbScanSample;
+        private System.Windows.Forms.Label lbTips;
         private System.Windows.Forms.DataGridViewButtonColumn SampleAction;
         private System.Windows.Forms.DataGridViewTextBoxColumn SampleBizId;
         private System.Windows.Forms.DataGridViewTextBoxColumn SampleOwnerName;

Src/FrmMain.cs

@@ -9,6 +9,7 @@ using System.ComponentModel;
 using System.Data;
 using System.Drawing;
 using System.Linq;
+using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Timers;
@@ -62,6 +63,8 @@ namespace Kivii.Client.SamplePackages
             btnLogin.Enabled = true;
             btnLogout.Enabled = false;
             btnScanRfid.Enabled = false;
+            tbScanSample.Enabled = false;
+            tbScanSample.Text = "";
             btnClearCurrentPackage.Enabled = false;
             tbCurrentLocation.Text = "";
             tbCurrentDepartment.Text = "";
@@ -162,7 +165,7 @@ namespace Kivii.Client.SamplePackages
             request.OwnerKvid = _userInfo.DepartmentKvid;
             //request.OwnerKvid = Guid.Parse("D4CE47D2-5FC8-479D-A0CA-BACDF1A891BF");//色牢度组
             //request.OwnerKvid = Guid.Parse("9D026818-6E78-40F8-A715-2887F96F34DC");//纤检组
-            //request.OwnerKvid = Guid.Parse("208C24FB-1443-4B9E-9886-02ED3B9A8F45");//安全组
+            request.OwnerKvid = Guid.Parse("208C24FB-1443-4B9E-9886-02ED3B9A8F45");//安全组
             //request.OwnerKvid = Guid.Parse("7CF9CF7B-19F5-4A1A-A94C-5BC21EA8ED76");//纤维含量组
             //request.OwnerKvid = Guid.Parse("BB355D5A-9D4E-4337-B577-7BB7A1625F68");//羽绒组
             var task = _client.PostAsync(request);
@@ -220,11 +223,12 @@ namespace Kivii.Client.SamplePackages
             });
         }
 
-        private void samplePrepackaging(string tid)
+        private void samplePrepackaging(string tid, string bizId = null)
         {
-            if (tid.IsNullOrEmpty()) return;
+            if (tid.IsNullOrEmpty() && bizId.IsNullOrEmpty()) return;
             var request = new SamplePrePackaging();
-            request.Tid = tid;
+            if(!tid.IsNullOrEmpty())request.Tid = tid;
+            if(!bizId.IsNullOrEmpty())request.BizId = bizId;
             request.OwnerKvid = _currentLocation.OwnerKvid;
             try
             {
@@ -350,6 +354,8 @@ namespace Kivii.Client.SamplePackages
                 btnClearCurrentPackage.Enabled = _currentPackage != null;
                 cbSetCurrentPackageNode.Enabled = _currentPackage.Status == (int)PackageStatus.Empty || _currentPackage.Status == (int)PackageStatus.Full;
                 btnScanRfid.Enabled = _currentPackage.Status == (int)PackageStatus.Empty || _currentPackage.Status == (int)PackageStatus.Full;
+                tbScanSample.Enabled = _currentPackage.Status == (int)PackageStatus.Empty || _currentPackage.Status == (int)PackageStatus.Full;
+                tbScanSample.Text = "";
                 if (_currentPackage.Status == (int)PackageStatus.Full || _currentPackage.Status == (int)PackageStatus.Inbound)
                 {
                     querySampleInPackaged();
@@ -360,6 +366,7 @@ namespace Kivii.Client.SamplePackages
                     return;
                 }
                 cbSetCurrentPackageNode.SelectedIndex = 0;
+                Thread.Sleep(200);
                 btnScanRfid_Click(null, null);
             });
             task.Error(err =>
@@ -371,6 +378,9 @@ namespace Kivii.Client.SamplePackages
                 cbSetCurrentPackageNode.SelectedItem = null;
                 cbSetCurrentPackageNode.Enabled = false;
                 btnScanRfid.Enabled = false;
+                tbScanSample.Enabled = false;
+                tbScanSample.Text = "";
+
                 MessageBox.Show(err.Message, "箱号设置");
             });
         }
@@ -507,6 +517,9 @@ namespace Kivii.Client.SamplePackages
             cbSetCurrentPackageNode.SelectedItem = null;
             cbSetCurrentPackageNode.Enabled = false;
             btnScanRfid.Enabled = false;
+            tbScanSample.Enabled = false;
+            tbScanSample.Text = "";
+
             dgvSamples.DataSource = null;
         }
 
@@ -621,5 +634,33 @@ namespace Kivii.Client.SamplePackages
             if (currentRowSample == null) return;
             sampleUnpackaging(currentRowSample);
         }
+
+        private void tbScanSample_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (_client == null)
+                {
+                    MessageBox.Show("请先登录.");
+                    return;
+                }
+                if (_currentLocation == null)
+                {
+                    MessageBox.Show("未获取当前位置.");
+                    return;
+                }
+                if (_currentPackage == null)
+                {
+                    MessageBox.Show("未获取当前箱号.");
+                    return;
+                }
+                if (_currentPackage.Status == (int)PackageStatus.Inbound)
+                {
+                    MessageBox.Show("当前箱子已入库,无法继续操作!");
+                    return;
+                }
+                samplePrepackaging(null, tbScanSample.Text);
+            }
+        }
     }
 }

Src/Requests/RestfulRequests.cs

@@ -32,6 +32,7 @@ namespace Kivii.Samples.Transforms
     public class SamplePrePackaging:IReturn<RestfulExecutionResponse<Sample>>
     {
         public string Tid { get; set; }
+        public string BizId { get; set; }
         public Guid OwnerKvid { get; set; }//要打包的样品的所属信息
     }