Skip to content

K
Kivii.Client.SampleInbounds.V4.0
Commit 28add6e8 by 任天宇
Options

优化

parent 8450641d
Showing with 202 additions and 195 deletions
Src/FrmMain.Designer.cs
...@@ -50,7 +50,17 @@ ...@@ -50,7 +50,17 @@
this.plRight = new System.Windows.Forms.Panel(); this.plRight = new System.Windows.Forms.Panel();
this.gbRfid = new System.Windows.Forms.GroupBox(); this.gbRfid = new System.Windows.Forms.GroupBox();
this.dgvRfidSamples = new System.Windows.Forms.DataGridView(); this.dgvRfidSamples = new System.Windows.Forms.DataGridView();
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ScanedIsSelected = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.gbRightToolBar = new System.Windows.Forms.GroupBox(); this.gbRightToolBar = new System.Windows.Forms.GroupBox();
this.ckbSelectAll = new System.Windows.Forms.CheckBox();
this.lbScanSampleMoreCount = new System.Windows.Forms.Label(); this.lbScanSampleMoreCount = new System.Windows.Forms.Label();
this.lbScanSamplesCount = new System.Windows.Forms.Label(); this.lbScanSamplesCount = new System.Windows.Forms.Label();
this.lbScanSampleMore = new System.Windows.Forms.Label(); this.lbScanSampleMore = new System.Windows.Forms.Label();
...@@ -64,6 +74,14 @@ ...@@ -64,6 +74,14 @@
this.plMain = new System.Windows.Forms.Panel(); this.plMain = new System.Windows.Forms.Panel();
this.gbMain = new System.Windows.Forms.GroupBox(); this.gbMain = new System.Windows.Forms.GroupBox();
this.dgvSamples = new System.Windows.Forms.DataGridView(); this.dgvSamples = new System.Windows.Forms.DataGridView();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleBizId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SamplePackageName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleOwnerName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleDealTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleDeadTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleQuantityUnit = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.gbMainToolBar = new System.Windows.Forms.GroupBox(); this.gbMainToolBar = new System.Windows.Forms.GroupBox();
this.lbPackageSampleMissCount = new System.Windows.Forms.Label(); this.lbPackageSampleMissCount = new System.Windows.Forms.Label();
this.lbPackageSamplesCount = new System.Windows.Forms.Label(); this.lbPackageSamplesCount = new System.Windows.Forms.Label();
...@@ -73,24 +91,6 @@ ...@@ -73,24 +91,6 @@
this.btnClearCurrentPackage = new System.Windows.Forms.Button(); this.btnClearCurrentPackage = new System.Windows.Forms.Button();
this.lbSetPackage = new System.Windows.Forms.Label(); this.lbSetPackage = new System.Windows.Forms.Label();
this.tbSetCurrentPackage = new System.Windows.Forms.TextBox(); this.tbSetCurrentPackage = new System.Windows.Forms.TextBox();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleBizId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SamplePackageName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleOwnerName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleDealTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleDeadTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleQuantityUnit = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ScanedIsSelected = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ckbSelectAll = new System.Windows.Forms.CheckBox();
this.plLeft.SuspendLayout(); this.plLeft.SuspendLayout();
this.gbInfo.SuspendLayout(); this.gbInfo.SuspendLayout();
this.gbLogin.SuspendLayout(); this.gbLogin.SuspendLayout();
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
this.plLeft.Dock = System.Windows.Forms.DockStyle.Left; this.plLeft.Dock = System.Windows.Forms.DockStyle.Left;
this.plLeft.Location = new System.Drawing.Point(0, 0); this.plLeft.Location = new System.Drawing.Point(0, 0);
this.plLeft.Name = "plLeft"; this.plLeft.Name = "plLeft";
this.plLeft.Size = new System.Drawing.Size(252, 648); this.plLeft.Size = new System.Drawing.Size(211, 648);
this.plLeft.TabIndex = 0; this.plLeft.TabIndex = 0;
// //
// gbInfo // gbInfo
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
this.gbInfo.Dock = System.Windows.Forms.DockStyle.Fill; this.gbInfo.Dock = System.Windows.Forms.DockStyle.Fill;
this.gbInfo.Location = new System.Drawing.Point(0, 447); this.gbInfo.Location = new System.Drawing.Point(0, 447);
this.gbInfo.Name = "gbInfo"; this.gbInfo.Name = "gbInfo";
this.gbInfo.Size = new System.Drawing.Size(252, 201); this.gbInfo.Size = new System.Drawing.Size(211, 201);
this.gbInfo.TabIndex = 2; this.gbInfo.TabIndex = 2;
this.gbInfo.TabStop = false; this.gbInfo.TabStop = false;
this.gbInfo.Text = "信息"; this.gbInfo.Text = "信息";
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
this.rtbMessage.Dock = System.Windows.Forms.DockStyle.Fill; this.rtbMessage.Dock = System.Windows.Forms.DockStyle.Fill;
this.rtbMessage.Location = new System.Drawing.Point(3, 17); this.rtbMessage.Location = new System.Drawing.Point(3, 17);
this.rtbMessage.Name = "rtbMessage"; this.rtbMessage.Name = "rtbMessage";
this.rtbMessage.Size = new System.Drawing.Size(246, 181); this.rtbMessage.Size = new System.Drawing.Size(205, 181);
this.rtbMessage.TabIndex = 0; this.rtbMessage.TabIndex = 0;
this.rtbMessage.Text = ""; this.rtbMessage.Text = "";
// //
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
this.gbLogin.Dock = System.Windows.Forms.DockStyle.Top; this.gbLogin.Dock = System.Windows.Forms.DockStyle.Top;
this.gbLogin.Location = new System.Drawing.Point(0, 0); this.gbLogin.Location = new System.Drawing.Point(0, 0);
this.gbLogin.Name = "gbLogin"; this.gbLogin.Name = "gbLogin";
this.gbLogin.Size = new System.Drawing.Size(252, 447); this.gbLogin.Size = new System.Drawing.Size(211, 447);
this.gbLogin.TabIndex = 1; this.gbLogin.TabIndex = 1;
this.gbLogin.TabStop = false; this.gbLogin.TabStop = false;
this.gbLogin.Text = "登录"; this.gbLogin.Text = "登录";
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
this.cbSetCurrentPackageOwner.FormattingEnabled = true; this.cbSetCurrentPackageOwner.FormattingEnabled = true;
this.cbSetCurrentPackageOwner.Location = new System.Drawing.Point(12, 389); this.cbSetCurrentPackageOwner.Location = new System.Drawing.Point(12, 389);
this.cbSetCurrentPackageOwner.Name = "cbSetCurrentPackageOwner"; this.cbSetCurrentPackageOwner.Name = "cbSetCurrentPackageOwner";
this.cbSetCurrentPackageOwner.Size = new System.Drawing.Size(222, 35); this.cbSetCurrentPackageOwner.Size = new System.Drawing.Size(187, 35);
this.cbSetCurrentPackageOwner.TabIndex = 31; this.cbSetCurrentPackageOwner.TabIndex = 31;
this.cbSetCurrentPackageOwner.SelectedValueChanged += new System.EventHandler(this.cbSetCurrentPackageOwner_SelectedValueChanged); this.cbSetCurrentPackageOwner.SelectedValueChanged += new System.EventHandler(this.cbSetCurrentPackageOwner_SelectedValueChanged);
// //
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
this.tbCurrentPackage.Location = new System.Drawing.Point(12, 332); this.tbCurrentPackage.Location = new System.Drawing.Point(12, 332);
this.tbCurrentPackage.Name = "tbCurrentPackage"; this.tbCurrentPackage.Name = "tbCurrentPackage";
this.tbCurrentPackage.ReadOnly = true; this.tbCurrentPackage.ReadOnly = true;
this.tbCurrentPackage.Size = new System.Drawing.Size(222, 35); this.tbCurrentPackage.Size = new System.Drawing.Size(187, 35);
this.tbCurrentPackage.TabIndex = 2; this.tbCurrentPackage.TabIndex = 2;
// //
// lbCurrentPackage // lbCurrentPackage
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
this.lbCurrentPackage.Font = new System.Drawing.Font("宋体", 12F); this.lbCurrentPackage.Font = new System.Drawing.Font("宋体", 12F);
this.lbCurrentPackage.Location = new System.Drawing.Point(9, 313); this.lbCurrentPackage.Location = new System.Drawing.Point(9, 313);
this.lbCurrentPackage.Name = "lbCurrentPackage"; this.lbCurrentPackage.Name = "lbCurrentPackage";
this.lbCurrentPackage.Size = new System.Drawing.Size(79, 16); this.lbCurrentPackage.Size = new System.Drawing.Size(80, 16);
this.lbCurrentPackage.TabIndex = 6; this.lbCurrentPackage.TabIndex = 6;
this.lbCurrentPackage.Text = "当前箱号:"; this.lbCurrentPackage.Text = "当前箱号:";
// //
...@@ -194,9 +194,9 @@ ...@@ -194,9 +194,9 @@
this.btnLogout.BackColor = System.Drawing.Color.LavenderBlush; this.btnLogout.BackColor = System.Drawing.Color.LavenderBlush;
this.btnLogout.Font = new System.Drawing.Font("宋体", 15F); this.btnLogout.Font = new System.Drawing.Font("宋体", 15F);
this.btnLogout.ForeColor = System.Drawing.Color.Crimson; this.btnLogout.ForeColor = System.Drawing.Color.Crimson;
this.btnLogout.Location = new System.Drawing.Point(131, 213); this.btnLogout.Location = new System.Drawing.Point(109, 213);
this.btnLogout.Name = "btnLogout"; this.btnLogout.Name = "btnLogout";
this.btnLogout.Size = new System.Drawing.Size(107, 43); this.btnLogout.Size = new System.Drawing.Size(90, 40);
this.btnLogout.TabIndex = 28; this.btnLogout.TabIndex = 28;
this.btnLogout.Text = "退 出"; this.btnLogout.Text = "退 出";
this.btnLogout.UseVisualStyleBackColor = false; this.btnLogout.UseVisualStyleBackColor = false;
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
this.lbCurrentLocation.Font = new System.Drawing.Font("宋体", 12F); this.lbCurrentLocation.Font = new System.Drawing.Font("宋体", 12F);
this.lbCurrentLocation.Location = new System.Drawing.Point(12, 256); this.lbCurrentLocation.Location = new System.Drawing.Point(12, 256);
this.lbCurrentLocation.Name = "lbCurrentLocation"; this.lbCurrentLocation.Name = "lbCurrentLocation";
this.lbCurrentLocation.Size = new System.Drawing.Size(79, 16); this.lbCurrentLocation.Size = new System.Drawing.Size(80, 16);
this.lbCurrentLocation.TabIndex = 5; this.lbCurrentLocation.TabIndex = 5;
this.lbCurrentLocation.Text = "当前位置:"; this.lbCurrentLocation.Text = "当前位置:";
// //
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
this.btnLogin.ForeColor = System.Drawing.Color.DarkGreen; this.btnLogin.ForeColor = System.Drawing.Color.DarkGreen;
this.btnLogin.Location = new System.Drawing.Point(12, 213); this.btnLogin.Location = new System.Drawing.Point(12, 213);
this.btnLogin.Name = "btnLogin"; this.btnLogin.Name = "btnLogin";
this.btnLogin.Size = new System.Drawing.Size(107, 43); this.btnLogin.Size = new System.Drawing.Size(90, 40);
this.btnLogin.TabIndex = 27; this.btnLogin.TabIndex = 27;
this.btnLogin.Text = "登 录"; this.btnLogin.Text = "登 录";
this.btnLogin.UseVisualStyleBackColor = false; this.btnLogin.UseVisualStyleBackColor = false;
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
this.lbPackageDepartment.Font = new System.Drawing.Font("宋体", 12F); this.lbPackageDepartment.Font = new System.Drawing.Font("宋体", 12F);
this.lbPackageDepartment.Location = new System.Drawing.Point(9, 370); this.lbPackageDepartment.Location = new System.Drawing.Point(9, 370);
this.lbPackageDepartment.Name = "lbPackageDepartment"; this.lbPackageDepartment.Name = "lbPackageDepartment";
this.lbPackageDepartment.Size = new System.Drawing.Size(111, 16); this.lbPackageDepartment.Size = new System.Drawing.Size(112, 16);
this.lbPackageDepartment.TabIndex = 4; this.lbPackageDepartment.TabIndex = 4;
this.lbPackageDepartment.Text = "样品所属部门:"; this.lbPackageDepartment.Text = "样品所属部门:";
// //
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
this.tbCurrentLocation.Location = new System.Drawing.Point(12, 275); this.tbCurrentLocation.Location = new System.Drawing.Point(12, 275);
this.tbCurrentLocation.Name = "tbCurrentLocation"; this.tbCurrentLocation.Name = "tbCurrentLocation";
this.tbCurrentLocation.ReadOnly = true; this.tbCurrentLocation.ReadOnly = true;
this.tbCurrentLocation.Size = new System.Drawing.Size(222, 35); this.tbCurrentLocation.Size = new System.Drawing.Size(187, 35);
this.tbCurrentLocation.TabIndex = 1; this.tbCurrentLocation.TabIndex = 1;
// //
// lblUrl // lblUrl
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
this.tbxPassword.Location = new System.Drawing.Point(12, 172); this.tbxPassword.Location = new System.Drawing.Point(12, 172);
this.tbxPassword.Name = "tbxPassword"; this.tbxPassword.Name = "tbxPassword";
this.tbxPassword.PasswordChar = '*'; this.tbxPassword.PasswordChar = '*';
this.tbxPassword.Size = new System.Drawing.Size(226, 35); this.tbxPassword.Size = new System.Drawing.Size(187, 35);
this.tbxPassword.TabIndex = 26; this.tbxPassword.TabIndex = 26;
this.tbxPassword.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbxPassword_KeyDown); this.tbxPassword.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbxPassword_KeyDown);
// //
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
this.tbxServiceUrl.Font = new System.Drawing.Font("宋体", 18F); this.tbxServiceUrl.Font = new System.Drawing.Font("宋体", 18F);
this.tbxServiceUrl.Location = new System.Drawing.Point(12, 42); this.tbxServiceUrl.Location = new System.Drawing.Point(12, 42);
this.tbxServiceUrl.Name = "tbxServiceUrl"; this.tbxServiceUrl.Name = "tbxServiceUrl";
this.tbxServiceUrl.Size = new System.Drawing.Size(226, 35); this.tbxServiceUrl.Size = new System.Drawing.Size(187, 35);
this.tbxServiceUrl.TabIndex = 24; this.tbxServiceUrl.TabIndex = 24;
// //
// tbxUserName // tbxUserName
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
this.tbxUserName.Font = new System.Drawing.Font("宋体", 18F); this.tbxUserName.Font = new System.Drawing.Font("宋体", 18F);
this.tbxUserName.Location = new System.Drawing.Point(12, 107); this.tbxUserName.Location = new System.Drawing.Point(12, 107);
this.tbxUserName.Name = "tbxUserName"; this.tbxUserName.Name = "tbxUserName";
this.tbxUserName.Size = new System.Drawing.Size(226, 35); this.tbxUserName.Size = new System.Drawing.Size(187, 35);
this.tbxUserName.TabIndex = 25; this.tbxUserName.TabIndex = 25;
// //
// plRight // plRight
...@@ -347,6 +347,74 @@ ...@@ -347,6 +347,74 @@
this.dgvRfidSamples.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvRfidSamples_RowPostPaint); this.dgvRfidSamples.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvRfidSamples_RowPostPaint);
this.dgvRfidSamples.RowStateChanged += new System.Windows.Forms.DataGridViewRowStateChangedEventHandler(this.dgvRfidSamples_RowStateChanged); this.dgvRfidSamples.RowStateChanged += new System.Windows.Forms.DataGridViewRowStateChangedEventHandler(this.dgvRfidSamples_RowStateChanged);
// //
// Column2
//
this.Column2.HeaderText = "Column2";
this.Column2.MinimumWidth = 2;
this.Column2.Name = "Column2";
this.Column2.Width = 2;
//
// ScanedIsSelected
//
this.ScanedIsSelected.DataPropertyName = "IsSelected";
this.ScanedIsSelected.HeaderText = "选中";
this.ScanedIsSelected.MinimumWidth = 50;
this.ScanedIsSelected.Name = "ScanedIsSelected";
this.ScanedIsSelected.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.ScanedIsSelected.Width = 50;
//
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.DataPropertyName = "BizId";
this.dataGridViewTextBoxColumn1.HeaderText = "样品报告号";
this.dataGridViewTextBoxColumn1.MinimumWidth = 160;
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
this.dataGridViewTextBoxColumn1.Width = 160;
//
// dataGridViewTextBoxColumn2
//
this.dataGridViewTextBoxColumn2.DataPropertyName = "PackageName";
this.dataGridViewTextBoxColumn2.HeaderText = "箱号";
this.dataGridViewTextBoxColumn2.MinimumWidth = 100;
this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
//
// dataGridViewTextBoxColumn3
//
this.dataGridViewTextBoxColumn3.DataPropertyName = "OwnerName";
this.dataGridViewTextBoxColumn3.HeaderText = "所属部门";
this.dataGridViewTextBoxColumn3.MinimumWidth = 90;
this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
this.dataGridViewTextBoxColumn3.Width = 90;
//
// dataGridViewTextBoxColumn4
//
this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.dataGridViewTextBoxColumn4.DataPropertyName = "Name";
this.dataGridViewTextBoxColumn4.HeaderText = "样品名称";
this.dataGridViewTextBoxColumn4.MinimumWidth = 100;
this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
//
// dataGridViewTextBoxColumn5
//
this.dataGridViewTextBoxColumn5.DataPropertyName = "DealTime";
this.dataGridViewTextBoxColumn5.HeaderText = "委托日期";
this.dataGridViewTextBoxColumn5.MinimumWidth = 100;
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
//
// dataGridViewTextBoxColumn6
//
this.dataGridViewTextBoxColumn6.DataPropertyName = "DeadTime";
this.dataGridViewTextBoxColumn6.HeaderText = "完成日期";
this.dataGridViewTextBoxColumn6.MinimumWidth = 100;
this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
//
// dataGridViewTextBoxColumn7
//
this.dataGridViewTextBoxColumn7.DataPropertyName = "QuantityUnit";
this.dataGridViewTextBoxColumn7.HeaderText = "数量/单位";
this.dataGridViewTextBoxColumn7.MinimumWidth = 100;
this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
//
// gbRightToolBar // gbRightToolBar
// //
this.gbRightToolBar.Controls.Add(this.ckbSelectAll); this.gbRightToolBar.Controls.Add(this.ckbSelectAll);
...@@ -368,6 +436,17 @@ ...@@ -368,6 +436,17 @@
this.gbRightToolBar.TabStop = false; this.gbRightToolBar.TabStop = false;
this.gbRightToolBar.Text = "操作台"; this.gbRightToolBar.Text = "操作台";
// //
// ckbSelectAll
//
this.ckbSelectAll.AutoSize = true;
this.ckbSelectAll.Location = new System.Drawing.Point(347, 25);
this.ckbSelectAll.Name = "ckbSelectAll";
this.ckbSelectAll.Size = new System.Drawing.Size(48, 16);
this.ckbSelectAll.TabIndex = 90;
this.ckbSelectAll.Text = "全选";
this.ckbSelectAll.UseVisualStyleBackColor = true;
this.ckbSelectAll.CheckedChanged += new System.EventHandler(this.ckbSelectAll_CheckedChanged);
//
// lbScanSampleMoreCount // lbScanSampleMoreCount
// //
this.lbScanSampleMoreCount.AutoSize = true; this.lbScanSampleMoreCount.AutoSize = true;
...@@ -413,9 +492,9 @@ ...@@ -413,9 +492,9 @@
this.ckbAutoPackage.AutoSize = true; this.ckbAutoPackage.AutoSize = true;
this.ckbAutoPackage.Location = new System.Drawing.Point(237, 25); this.ckbAutoPackage.Location = new System.Drawing.Point(237, 25);
this.ckbAutoPackage.Name = "ckbAutoPackage"; this.ckbAutoPackage.Name = "ckbAutoPackage";
this.ckbAutoPackage.Size = new System.Drawing.Size(72, 16); this.ckbAutoPackage.Size = new System.Drawing.Size(108, 16);
this.ckbAutoPackage.TabIndex = 85; this.ckbAutoPackage.TabIndex = 85;
this.ckbAutoPackage.Text = "自动入箱"; this.ckbAutoPackage.Text = "未入箱自动入箱";
this.ckbAutoPackage.UseVisualStyleBackColor = true; this.ckbAutoPackage.UseVisualStyleBackColor = true;
// //
// btnSampleAssign // btnSampleAssign
...@@ -481,9 +560,9 @@ ...@@ -481,9 +560,9 @@
this.plMain.Controls.Add(this.gbMain); this.plMain.Controls.Add(this.gbMain);
this.plMain.Controls.Add(this.gbMainToolBar); this.plMain.Controls.Add(this.gbMainToolBar);
this.plMain.Dock = System.Windows.Forms.DockStyle.Fill; this.plMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.plMain.Location = new System.Drawing.Point(252, 0); this.plMain.Location = new System.Drawing.Point(211, 0);
this.plMain.Name = "plMain"; this.plMain.Name = "plMain";
this.plMain.Size = new System.Drawing.Size(388, 648); this.plMain.Size = new System.Drawing.Size(429, 648);
this.plMain.TabIndex = 2; this.plMain.TabIndex = 2;
// //
// gbMain // gbMain
...@@ -492,7 +571,7 @@ ...@@ -492,7 +571,7 @@
this.gbMain.Dock = System.Windows.Forms.DockStyle.Fill; this.gbMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.gbMain.Location = new System.Drawing.Point(0, 125); this.gbMain.Location = new System.Drawing.Point(0, 125);
this.gbMain.Name = "gbMain"; this.gbMain.Name = "gbMain";
this.gbMain.Size = new System.Drawing.Size(388, 523); this.gbMain.Size = new System.Drawing.Size(429, 523);
this.gbMain.TabIndex = 1; this.gbMain.TabIndex = 1;
this.gbMain.TabStop = false; this.gbMain.TabStop = false;
this.gbMain.Text = "箱内样品"; this.gbMain.Text = "箱内样品";
...@@ -516,12 +595,79 @@ ...@@ -516,12 +595,79 @@
this.dgvSamples.Name = "dgvSamples"; this.dgvSamples.Name = "dgvSamples";
this.dgvSamples.ReadOnly = true; this.dgvSamples.ReadOnly = true;
this.dgvSamples.RowTemplate.Height = 23; this.dgvSamples.RowTemplate.Height = 23;
this.dgvSamples.Size = new System.Drawing.Size(382, 503); this.dgvSamples.Size = new System.Drawing.Size(423, 503);
this.dgvSamples.TabIndex = 0; this.dgvSamples.TabIndex = 0;
this.dgvSamples.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dgvSamples_DataBindingComplete); this.dgvSamples.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dgvSamples_DataBindingComplete);
this.dgvSamples.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvSamples_RowPostPaint); this.dgvSamples.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvSamples_RowPostPaint);
this.dgvSamples.RowStateChanged += new System.Windows.Forms.DataGridViewRowStateChangedEventHandler(this.dgvSamples_RowStateChanged); this.dgvSamples.RowStateChanged += new System.Windows.Forms.DataGridViewRowStateChangedEventHandler(this.dgvSamples_RowStateChanged);
// //
// Column1
//
this.Column1.HeaderText = "Column1";
this.Column1.MinimumWidth = 2;
this.Column1.Name = "Column1";
this.Column1.ReadOnly = true;
this.Column1.Width = 2;
//
// SampleBizId
//
this.SampleBizId.DataPropertyName = "BizId";
this.SampleBizId.HeaderText = "样品报告号";
this.SampleBizId.MinimumWidth = 160;
this.SampleBizId.Name = "SampleBizId";
this.SampleBizId.ReadOnly = true;
this.SampleBizId.Width = 160;
//
// SamplePackageName
//
this.SamplePackageName.DataPropertyName = "PackageName";
this.SamplePackageName.HeaderText = "箱号";
this.SamplePackageName.MinimumWidth = 100;
this.SamplePackageName.Name = "SamplePackageName";
this.SamplePackageName.ReadOnly = true;
//
// SampleOwnerName
//
this.SampleOwnerName.DataPropertyName = "OwnerName";
this.SampleOwnerName.HeaderText = "所属部门";
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 = 100;
this.SampleName.Name = "SampleName";
this.SampleName.ReadOnly = true;
//
// SampleDealTime
//
this.SampleDealTime.DataPropertyName = "DealTime";
this.SampleDealTime.HeaderText = "委托日期";
this.SampleDealTime.MinimumWidth = 100;
this.SampleDealTime.Name = "SampleDealTime";
this.SampleDealTime.ReadOnly = true;
//
// SampleDeadTime
//
this.SampleDeadTime.DataPropertyName = "DeadTime";
this.SampleDeadTime.HeaderText = "完成日期";
this.SampleDeadTime.MinimumWidth = 100;
this.SampleDeadTime.Name = "SampleDeadTime";
this.SampleDeadTime.ReadOnly = true;
//
// SampleQuantityUnit
//
this.SampleQuantityUnit.DataPropertyName = "QuantityUnit";
this.SampleQuantityUnit.HeaderText = "数量/单位";
this.SampleQuantityUnit.MinimumWidth = 100;
this.SampleQuantityUnit.Name = "SampleQuantityUnit";
this.SampleQuantityUnit.ReadOnly = true;
//
// gbMainToolBar // gbMainToolBar
// //
this.gbMainToolBar.Controls.Add(this.lbPackageSampleMissCount); this.gbMainToolBar.Controls.Add(this.lbPackageSampleMissCount);
...@@ -535,7 +681,7 @@ ...@@ -535,7 +681,7 @@
this.gbMainToolBar.Dock = System.Windows.Forms.DockStyle.Top; this.gbMainToolBar.Dock = System.Windows.Forms.DockStyle.Top;
this.gbMainToolBar.Location = new System.Drawing.Point(0, 0); this.gbMainToolBar.Location = new System.Drawing.Point(0, 0);
this.gbMainToolBar.Name = "gbMainToolBar"; this.gbMainToolBar.Name = "gbMainToolBar";
this.gbMainToolBar.Size = new System.Drawing.Size(388, 125); this.gbMainToolBar.Size = new System.Drawing.Size(429, 125);
this.gbMainToolBar.TabIndex = 0; this.gbMainToolBar.TabIndex = 0;
this.gbMainToolBar.TabStop = false; this.gbMainToolBar.TabStop = false;
this.gbMainToolBar.Text = "操作台"; this.gbMainToolBar.Text = "操作台";
...@@ -544,7 +690,7 @@ ...@@ -544,7 +690,7 @@
// //
this.lbPackageSampleMissCount.AutoSize = true; this.lbPackageSampleMissCount.AutoSize = true;
this.lbPackageSampleMissCount.Font = new System.Drawing.Font("宋体", 18F); this.lbPackageSampleMissCount.Font = new System.Drawing.Font("宋体", 18F);
this.lbPackageSampleMissCount.Location = new System.Drawing.Point(279, 93); this.lbPackageSampleMissCount.Location = new System.Drawing.Point(227, 93);
this.lbPackageSampleMissCount.Name = "lbPackageSampleMissCount"; this.lbPackageSampleMissCount.Name = "lbPackageSampleMissCount";
this.lbPackageSampleMissCount.Size = new System.Drawing.Size(22, 24); this.lbPackageSampleMissCount.Size = new System.Drawing.Size(22, 24);
this.lbPackageSampleMissCount.TabIndex = 85; this.lbPackageSampleMissCount.TabIndex = 85;
...@@ -564,7 +710,7 @@ ...@@ -564,7 +710,7 @@
// //
this.lbPackageSampleMiss.AutoSize = true; this.lbPackageSampleMiss.AutoSize = true;
this.lbPackageSampleMiss.Font = new System.Drawing.Font("宋体", 14F); this.lbPackageSampleMiss.Font = new System.Drawing.Font("宋体", 14F);
this.lbPackageSampleMiss.Location = new System.Drawing.Point(188, 98); this.lbPackageSampleMiss.Location = new System.Drawing.Point(136, 98);
this.lbPackageSampleMiss.Name = "lbPackageSampleMiss"; this.lbPackageSampleMiss.Name = "lbPackageSampleMiss";
this.lbPackageSampleMiss.Size = new System.Drawing.Size(85, 19); this.lbPackageSampleMiss.Size = new System.Drawing.Size(85, 19);
this.lbPackageSampleMiss.TabIndex = 83; this.lbPackageSampleMiss.TabIndex = 83;
...@@ -620,152 +766,6 @@ ...@@ -620,152 +766,6 @@
this.tbSetCurrentPackage.TabIndex = 78; this.tbSetCurrentPackage.TabIndex = 78;
this.tbSetCurrentPackage.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSetCurrentPackage_KeyDown); this.tbSetCurrentPackage.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSetCurrentPackage_KeyDown);
// //
// Column1
//
this.Column1.HeaderText = "Column1";
this.Column1.MinimumWidth = 2;
this.Column1.Name = "Column1";
this.Column1.ReadOnly = true;
this.Column1.Width = 2;
//
// SampleBizId
//
this.SampleBizId.DataPropertyName = "BizId";
this.SampleBizId.HeaderText = "样品报告号";
this.SampleBizId.MinimumWidth = 160;
this.SampleBizId.Name = "SampleBizId";
this.SampleBizId.ReadOnly = true;
this.SampleBizId.Width = 160;
//
// SamplePackageName
//
this.SamplePackageName.DataPropertyName = "PackageName";
this.SamplePackageName.HeaderText = "箱号";
this.SamplePackageName.MinimumWidth = 100;
this.SamplePackageName.Name = "SamplePackageName";
this.SamplePackageName.ReadOnly = true;
//
// SampleOwnerName
//
this.SampleOwnerName.DataPropertyName = "OwnerName";
this.SampleOwnerName.HeaderText = "所属部门";
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 = 100;
this.SampleName.Name = "SampleName";
this.SampleName.ReadOnly = true;
//
// SampleDealTime
//
this.SampleDealTime.DataPropertyName = "DealTime";
this.SampleDealTime.HeaderText = "委托日期";
this.SampleDealTime.MinimumWidth = 100;
this.SampleDealTime.Name = "SampleDealTime";
this.SampleDealTime.ReadOnly = true;
//
// SampleDeadTime
//
this.SampleDeadTime.DataPropertyName = "DeadTime";
this.SampleDeadTime.HeaderText = "完成日期";
this.SampleDeadTime.MinimumWidth = 100;
this.SampleDeadTime.Name = "SampleDeadTime";
this.SampleDeadTime.ReadOnly = true;
//
// SampleQuantityUnit
//
this.SampleQuantityUnit.DataPropertyName = "QuantityUnit";
this.SampleQuantityUnit.HeaderText = "数量/单位";
this.SampleQuantityUnit.MinimumWidth = 100;
this.SampleQuantityUnit.Name = "SampleQuantityUnit";
this.SampleQuantityUnit.ReadOnly = true;
//
// Column2
//
this.Column2.HeaderText = "Column2";
this.Column2.MinimumWidth = 2;
this.Column2.Name = "Column2";
this.Column2.Width = 2;
//
// ScanedIsSelected
//
this.ScanedIsSelected.DataPropertyName = "IsSelected";
this.ScanedIsSelected.HeaderText = "选中";
this.ScanedIsSelected.MinimumWidth = 50;
this.ScanedIsSelected.Name = "ScanedIsSelected";
this.ScanedIsSelected.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.ScanedIsSelected.Width = 50;
//
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.DataPropertyName = "BizId";
this.dataGridViewTextBoxColumn1.HeaderText = "样品报告号";
this.dataGridViewTextBoxColumn1.MinimumWidth = 160;
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
this.dataGridViewTextBoxColumn1.Width = 160;
//
// dataGridViewTextBoxColumn2
//
this.dataGridViewTextBoxColumn2.DataPropertyName = "PackageName";
this.dataGridViewTextBoxColumn2.HeaderText = "箱号";
this.dataGridViewTextBoxColumn2.MinimumWidth = 100;
this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
//
// dataGridViewTextBoxColumn3
//
this.dataGridViewTextBoxColumn3.DataPropertyName = "OwnerName";
this.dataGridViewTextBoxColumn3.HeaderText = "所属部门";
this.dataGridViewTextBoxColumn3.MinimumWidth = 90;
this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
this.dataGridViewTextBoxColumn3.Width = 90;
//
// dataGridViewTextBoxColumn4
//
this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.dataGridViewTextBoxColumn4.DataPropertyName = "Name";
this.dataGridViewTextBoxColumn4.HeaderText = "样品名称";
this.dataGridViewTextBoxColumn4.MinimumWidth = 100;
this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
//
// dataGridViewTextBoxColumn5
//
this.dataGridViewTextBoxColumn5.DataPropertyName = "DealTime";
this.dataGridViewTextBoxColumn5.HeaderText = "委托日期";
this.dataGridViewTextBoxColumn5.MinimumWidth = 100;
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
//
// dataGridViewTextBoxColumn6
//
this.dataGridViewTextBoxColumn6.DataPropertyName = "DeadTime";
this.dataGridViewTextBoxColumn6.HeaderText = "完成日期";
this.dataGridViewTextBoxColumn6.MinimumWidth = 100;
this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
//
// dataGridViewTextBoxColumn7
//
this.dataGridViewTextBoxColumn7.DataPropertyName = "QuantityUnit";
this.dataGridViewTextBoxColumn7.HeaderText = "数量/单位";
this.dataGridViewTextBoxColumn7.MinimumWidth = 100;
this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
//
// ckbSelectAll
//
this.ckbSelectAll.AutoSize = true;
this.ckbSelectAll.Location = new System.Drawing.Point(315, 25);
this.ckbSelectAll.Name = "ckbSelectAll";
this.ckbSelectAll.Size = new System.Drawing.Size(48, 16);
this.ckbSelectAll.TabIndex = 90;
this.ckbSelectAll.Text = "全选";
this.ckbSelectAll.UseVisualStyleBackColor = true;
this.ckbSelectAll.CheckedChanged += new System.EventHandler(this.ckbSelectAll_CheckedChanged);
//
// FrmMain // FrmMain
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
...@@ -776,7 +776,7 @@ ...@@ -776,7 +776,7 @@
this.Controls.Add(this.plLeft); this.Controls.Add(this.plLeft);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmMain"; this.Name = "FrmMain";
this.Text = "样品入库交接客户端 1.0(23.5.26)"; this.Text = "样品入库交接客户端 1.0(23.6.05)";
this.Load += new System.EventHandler(this.FrmMain_Load); this.Load += new System.EventHandler(this.FrmMain_Load);
this.plLeft.ResumeLayout(false); this.plLeft.ResumeLayout(false);
this.gbInfo.ResumeLayout(false); this.gbInfo.ResumeLayout(false);
......
Src/FrmMain.cs
...@@ -48,6 +48,7 @@ namespace Kivii.Client.SampleInbounds ...@@ -48,6 +48,7 @@ namespace Kivii.Client.SampleInbounds
private void FrmMain_Load(object sender, EventArgs e) private void FrmMain_Load(object sender, EventArgs e)
{ {
WindowState = FormWindowState.Maximized;
initControls(); initControls();
loadDefault(tbxServiceUrl, tbxUserName, tbxPassword); loadDefault(tbxServiceUrl, tbxUserName, tbxPassword);
} }
...@@ -263,6 +264,7 @@ namespace Kivii.Client.SampleInbounds ...@@ -263,6 +264,7 @@ namespace Kivii.Client.SampleInbounds
btnScanRfid.BackColor = Color.PapayaWhip; btnScanRfid.BackColor = Color.PapayaWhip;
btnScanRfid.ForeColor = Color.Chocolate; btnScanRfid.ForeColor = Color.Chocolate;
})); }));
disConnectReader();
outputMessage("停止扫描"); outputMessage("停止扫描");
return; return;
} }
...@@ -502,7 +504,12 @@ namespace Kivii.Client.SampleInbounds ...@@ -502,7 +504,12 @@ namespace Kivii.Client.SampleInbounds
var request = new SamplePrePackaging(); var request = new SamplePrePackaging();
if (!tid.IsNullOrEmpty()) request.Tid = tid; if (!tid.IsNullOrEmpty()) request.Tid = tid;
if (!bizId.IsNullOrEmpty()) request.BizId = bizId; if (!bizId.IsNullOrEmpty()) request.BizId = bizId;
if(Guid.TryParse(epc, out var epcKvid)) if(!Guid.TryParse(epc, out var epcKvid))
{
return;
//request.BizKvid = epcKvid;
}
else
{ {
request.BizKvid = epcKvid; request.BizKvid = epcKvid;
} }
...@@ -518,8 +525,8 @@ namespace Kivii.Client.SampleInbounds ...@@ -518,8 +525,8 @@ namespace Kivii.Client.SampleInbounds
var resp = _client.Post(request); var resp = _client.Post(request);
if (resp.Results.Count <= 0) if (resp.Results.Count <= 0)
{ {
MessageBox.Show("未找到样品,当前组不包含此样品!", "交接查询"); //MessageBox.Show("未找到样品,当前组不包含此样品!", "交接查询");
outputMessage("未找到样品,当前组不包含此样品!"); outputMessage($"未找到样品:{epc},当前组不包含此样品!");
return; return;
} }
var record = resp.Results[0]; var record = resp.Results[0];
......
Src/Properties/AssemblyInfo.cs
...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices; ...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.6.2023.5300")] [assembly: AssemblyVersion("5.6.2023.6050")]
[assembly: AssemblyFileVersion("5.6.2023.5300")] [assembly: AssemblyFileVersion("5.6.2023.6050")]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment