Skip to content

K
Kivii.Client.SampleInbounds.V4.0
Commit 2c7ea1e5 by 任天宇
Options

优化

parent d20328e7
Showing with 145 additions and 132 deletions
Src/FrmMain.Designer.cs
...@@ -53,15 +53,6 @@ ...@@ -53,15 +53,6 @@
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.ckbSelectAll = new System.Windows.Forms.CheckBox();
this.lbScanSampleMoreCount = new System.Windows.Forms.Label(); this.lbScanSampleMoreCount = new System.Windows.Forms.Label();
...@@ -78,6 +69,7 @@ ...@@ -78,6 +69,7 @@
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.gbMainToolBar = new System.Windows.Forms.GroupBox(); this.gbMainToolBar = new System.Windows.Forms.GroupBox();
this.btnSetCurrentPackage = new System.Windows.Forms.Button();
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();
this.lbPackageSampleMiss = new System.Windows.Forms.Label(); this.lbPackageSampleMiss = new System.Windows.Forms.Label();
...@@ -86,16 +78,24 @@ ...@@ -86,16 +78,24 @@
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.btnSetCurrentPackage = new System.Windows.Forms.Button();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column3 = new System.Windows.Forms.DataGridViewButtonColumn(); this.Column3 = new System.Windows.Forms.DataGridViewButtonColumn();
this.SampleBizId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.SampleBizId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SamplePackageName = 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.SampleName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleOwnerName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleDealTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.SampleDealTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleDeadTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.SampleDeadTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleQuantityUnit = 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.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn3 = 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.plLeft.SuspendLayout(); this.plLeft.SuspendLayout();
this.gbInfo.SuspendLayout(); this.gbInfo.SuspendLayout();
this.gbLogin.SuspendLayout(); this.gbLogin.SuspendLayout();
...@@ -335,9 +335,9 @@ ...@@ -335,9 +335,9 @@
this.plRight.Controls.Add(this.gbRfid); this.plRight.Controls.Add(this.gbRfid);
this.plRight.Controls.Add(this.gbRightToolBar); this.plRight.Controls.Add(this.gbRightToolBar);
this.plRight.Dock = System.Windows.Forms.DockStyle.Right; this.plRight.Dock = System.Windows.Forms.DockStyle.Right;
this.plRight.Location = new System.Drawing.Point(640, 0); this.plRight.Location = new System.Drawing.Point(664, 0);
this.plRight.Name = "plRight"; this.plRight.Name = "plRight";
this.plRight.Size = new System.Drawing.Size(532, 648); this.plRight.Size = new System.Drawing.Size(508, 648);
this.plRight.TabIndex = 1; this.plRight.TabIndex = 1;
// //
// gbRfid // gbRfid
...@@ -346,7 +346,7 @@ ...@@ -346,7 +346,7 @@
this.gbRfid.Dock = System.Windows.Forms.DockStyle.Fill; this.gbRfid.Dock = System.Windows.Forms.DockStyle.Fill;
this.gbRfid.Location = new System.Drawing.Point(0, 125); this.gbRfid.Location = new System.Drawing.Point(0, 125);
this.gbRfid.Name = "gbRfid"; this.gbRfid.Name = "gbRfid";
this.gbRfid.Size = new System.Drawing.Size(532, 523); this.gbRfid.Size = new System.Drawing.Size(508, 523);
this.gbRfid.TabIndex = 2; this.gbRfid.TabIndex = 2;
this.gbRfid.TabStop = false; this.gbRfid.TabStop = false;
this.gbRfid.Text = "Rfid扫描结果"; this.gbRfid.Text = "Rfid扫描结果";
...@@ -361,8 +361,8 @@ ...@@ -361,8 +361,8 @@
this.ScanedIsSelected, this.ScanedIsSelected,
this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn1,
this.dataGridViewTextBoxColumn2, this.dataGridViewTextBoxColumn2,
this.dataGridViewTextBoxColumn3,
this.dataGridViewTextBoxColumn4, this.dataGridViewTextBoxColumn4,
this.dataGridViewTextBoxColumn3,
this.dataGridViewTextBoxColumn5, this.dataGridViewTextBoxColumn5,
this.dataGridViewTextBoxColumn6, this.dataGridViewTextBoxColumn6,
this.dataGridViewTextBoxColumn7}); this.dataGridViewTextBoxColumn7});
...@@ -370,80 +370,12 @@ ...@@ -370,80 +370,12 @@
this.dgvRfidSamples.Location = new System.Drawing.Point(3, 17); this.dgvRfidSamples.Location = new System.Drawing.Point(3, 17);
this.dgvRfidSamples.Name = "dgvRfidSamples"; this.dgvRfidSamples.Name = "dgvRfidSamples";
this.dgvRfidSamples.RowTemplate.Height = 23; this.dgvRfidSamples.RowTemplate.Height = 23;
this.dgvRfidSamples.Size = new System.Drawing.Size(526, 503); this.dgvRfidSamples.Size = new System.Drawing.Size(502, 503);
this.dgvRfidSamples.TabIndex = 0; this.dgvRfidSamples.TabIndex = 0;
this.dgvRfidSamples.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dgvRfidSamples_DataBindingComplete); this.dgvRfidSamples.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dgvRfidSamples_DataBindingComplete);
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);
...@@ -460,7 +392,7 @@ ...@@ -460,7 +392,7 @@
this.gbRightToolBar.Dock = System.Windows.Forms.DockStyle.Top; this.gbRightToolBar.Dock = System.Windows.Forms.DockStyle.Top;
this.gbRightToolBar.Location = new System.Drawing.Point(0, 0); this.gbRightToolBar.Location = new System.Drawing.Point(0, 0);
this.gbRightToolBar.Name = "gbRightToolBar"; this.gbRightToolBar.Name = "gbRightToolBar";
this.gbRightToolBar.Size = new System.Drawing.Size(532, 125); this.gbRightToolBar.Size = new System.Drawing.Size(508, 125);
this.gbRightToolBar.TabIndex = 1; this.gbRightToolBar.TabIndex = 1;
this.gbRightToolBar.TabStop = false; this.gbRightToolBar.TabStop = false;
this.gbRightToolBar.Text = "操作台"; this.gbRightToolBar.Text = "操作台";
...@@ -468,7 +400,7 @@ ...@@ -468,7 +400,7 @@
// ckbSelectAll // ckbSelectAll
// //
this.ckbSelectAll.AutoSize = true; this.ckbSelectAll.AutoSize = true;
this.ckbSelectAll.Location = new System.Drawing.Point(347, 25); this.ckbSelectAll.Location = new System.Drawing.Point(343, 25);
this.ckbSelectAll.Name = "ckbSelectAll"; this.ckbSelectAll.Name = "ckbSelectAll";
this.ckbSelectAll.Size = new System.Drawing.Size(48, 16); this.ckbSelectAll.Size = new System.Drawing.Size(48, 16);
this.ckbSelectAll.TabIndex = 90; this.ckbSelectAll.TabIndex = 90;
...@@ -532,7 +464,7 @@ ...@@ -532,7 +464,7 @@
this.btnSampleAssign.Dock = System.Windows.Forms.DockStyle.Right; this.btnSampleAssign.Dock = System.Windows.Forms.DockStyle.Right;
this.btnSampleAssign.Font = new System.Drawing.Font("宋体", 29F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); this.btnSampleAssign.Font = new System.Drawing.Font("宋体", 29F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))));
this.btnSampleAssign.ForeColor = System.Drawing.Color.DarkBlue; this.btnSampleAssign.ForeColor = System.Drawing.Color.DarkBlue;
this.btnSampleAssign.Location = new System.Drawing.Point(416, 17); this.btnSampleAssign.Location = new System.Drawing.Point(392, 17);
this.btnSampleAssign.Name = "btnSampleAssign"; this.btnSampleAssign.Name = "btnSampleAssign";
this.btnSampleAssign.Size = new System.Drawing.Size(113, 105); this.btnSampleAssign.Size = new System.Drawing.Size(113, 105);
this.btnSampleAssign.TabIndex = 84; this.btnSampleAssign.TabIndex = 84;
...@@ -591,7 +523,7 @@ ...@@ -591,7 +523,7 @@
this.plMain.Dock = System.Windows.Forms.DockStyle.Fill; this.plMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.plMain.Location = new System.Drawing.Point(211, 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(429, 648); this.plMain.Size = new System.Drawing.Size(453, 648);
this.plMain.TabIndex = 2; this.plMain.TabIndex = 2;
// //
// gbMain // gbMain
...@@ -600,7 +532,7 @@ ...@@ -600,7 +532,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(429, 523); this.gbMain.Size = new System.Drawing.Size(453, 523);
this.gbMain.TabIndex = 1; this.gbMain.TabIndex = 1;
this.gbMain.TabStop = false; this.gbMain.TabStop = false;
this.gbMain.Text = "箱内样品"; this.gbMain.Text = "箱内样品";
...@@ -615,8 +547,8 @@ ...@@ -615,8 +547,8 @@
this.Column3, this.Column3,
this.SampleBizId, this.SampleBizId,
this.SamplePackageName, this.SamplePackageName,
this.SampleOwnerName,
this.SampleName, this.SampleName,
this.SampleOwnerName,
this.SampleDealTime, this.SampleDealTime,
this.SampleDeadTime, this.SampleDeadTime,
this.SampleQuantityUnit}); this.SampleQuantityUnit});
...@@ -625,7 +557,7 @@ ...@@ -625,7 +557,7 @@
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(423, 503); this.dgvSamples.Size = new System.Drawing.Size(447, 503);
this.dgvSamples.TabIndex = 0; this.dgvSamples.TabIndex = 0;
this.dgvSamples.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSamples_CellContentClick); this.dgvSamples.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSamples_CellContentClick);
this.dgvSamples.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dgvSamples_DataBindingComplete); this.dgvSamples.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dgvSamples_DataBindingComplete);
...@@ -646,11 +578,21 @@ ...@@ -646,11 +578,21 @@
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(429, 125); this.gbMainToolBar.Size = new System.Drawing.Size(453, 125);
this.gbMainToolBar.TabIndex = 0; this.gbMainToolBar.TabIndex = 0;
this.gbMainToolBar.TabStop = false; this.gbMainToolBar.TabStop = false;
this.gbMainToolBar.Text = "操作台"; this.gbMainToolBar.Text = "操作台";
// //
// btnSetCurrentPackage
//
this.btnSetCurrentPackage.Location = new System.Drawing.Point(187, 18);
this.btnSetCurrentPackage.Name = "btnSetCurrentPackage";
this.btnSetCurrentPackage.Size = new System.Drawing.Size(46, 23);
this.btnSetCurrentPackage.TabIndex = 86;
this.btnSetCurrentPackage.Text = "查询";
this.btnSetCurrentPackage.UseVisualStyleBackColor = true;
this.btnSetCurrentPackage.Click += new System.EventHandler(this.btnSetCurrentPackage_Click);
//
// lbPackageSampleMissCount // lbPackageSampleMissCount
// //
this.lbPackageSampleMissCount.AutoSize = true; this.lbPackageSampleMissCount.AutoSize = true;
...@@ -703,12 +645,14 @@ ...@@ -703,12 +645,14 @@
// //
// btnClearCurrentPackage // btnClearCurrentPackage
// //
this.btnClearCurrentPackage.BackColor = System.Drawing.SystemColors.Control;
this.btnClearCurrentPackage.ForeColor = System.Drawing.SystemColors.WindowText;
this.btnClearCurrentPackage.Location = new System.Drawing.Point(135, 18); this.btnClearCurrentPackage.Location = new System.Drawing.Point(135, 18);
this.btnClearCurrentPackage.Name = "btnClearCurrentPackage"; this.btnClearCurrentPackage.Name = "btnClearCurrentPackage";
this.btnClearCurrentPackage.Size = new System.Drawing.Size(46, 23); this.btnClearCurrentPackage.Size = new System.Drawing.Size(46, 23);
this.btnClearCurrentPackage.TabIndex = 80; this.btnClearCurrentPackage.TabIndex = 80;
this.btnClearCurrentPackage.Text = "重设"; this.btnClearCurrentPackage.Text = "重设";
this.btnClearCurrentPackage.UseVisualStyleBackColor = true; this.btnClearCurrentPackage.UseVisualStyleBackColor = false;
this.btnClearCurrentPackage.Click += new System.EventHandler(this.btnClearCurrentPackage_Click); this.btnClearCurrentPackage.Click += new System.EventHandler(this.btnClearCurrentPackage_Click);
// //
// lbSetPackage // lbSetPackage
...@@ -731,16 +675,6 @@ ...@@ -731,16 +675,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);
// //
// btnSetCurrentPackage
//
this.btnSetCurrentPackage.Location = new System.Drawing.Point(187, 18);
this.btnSetCurrentPackage.Name = "btnSetCurrentPackage";
this.btnSetCurrentPackage.Size = new System.Drawing.Size(46, 23);
this.btnSetCurrentPackage.TabIndex = 86;
this.btnSetCurrentPackage.Text = "查询";
this.btnSetCurrentPackage.UseVisualStyleBackColor = true;
this.btnSetCurrentPackage.Click += new System.EventHandler(this.btnSetCurrentPackage_Click);
//
// Column1 // Column1
// //
this.Column1.Frozen = true; this.Column1.Frozen = true;
...@@ -753,26 +687,26 @@ ...@@ -753,26 +687,26 @@
// Column3 // Column3
// //
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.NullValue = "确认交接"; dataGridViewCellStyle1.NullValue = "交接";
this.Column3.DefaultCellStyle = dataGridViewCellStyle1; this.Column3.DefaultCellStyle = dataGridViewCellStyle1;
this.Column3.Frozen = true; this.Column3.Frozen = true;
this.Column3.HeaderText = "操作"; this.Column3.HeaderText = "*";
this.Column3.MinimumWidth = 80; this.Column3.MinimumWidth = 50;
this.Column3.Name = "Column3"; this.Column3.Name = "Column3";
this.Column3.ReadOnly = true; this.Column3.ReadOnly = true;
this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.Column3.Text = "确认交接"; this.Column3.Text = "确认交接";
this.Column3.Width = 80; this.Column3.Width = 50;
// //
// SampleBizId // SampleBizId
// //
this.SampleBizId.DataPropertyName = "BizId"; this.SampleBizId.DataPropertyName = "BizId";
this.SampleBizId.Frozen = true; this.SampleBizId.Frozen = true;
this.SampleBizId.HeaderText = "样品报告号"; this.SampleBizId.HeaderText = "样品报告号";
this.SampleBizId.MinimumWidth = 160; this.SampleBizId.MinimumWidth = 110;
this.SampleBizId.Name = "SampleBizId"; this.SampleBizId.Name = "SampleBizId";
this.SampleBizId.ReadOnly = true; this.SampleBizId.ReadOnly = true;
this.SampleBizId.Width = 160; this.SampleBizId.Width = 110;
// //
// SamplePackageName // SamplePackageName
// //
...@@ -782,23 +716,23 @@ ...@@ -782,23 +716,23 @@
this.SamplePackageName.Name = "SamplePackageName"; this.SamplePackageName.Name = "SamplePackageName";
this.SamplePackageName.ReadOnly = true; this.SamplePackageName.ReadOnly = true;
// //
// SampleName
//
this.SampleName.DataPropertyName = "Name";
this.SampleName.HeaderText = "样品名称";
this.SampleName.MinimumWidth = 150;
this.SampleName.Name = "SampleName";
this.SampleName.ReadOnly = true;
this.SampleName.Width = 150;
//
// SampleOwnerName // SampleOwnerName
// //
this.SampleOwnerName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.SampleOwnerName.DataPropertyName = "OwnerName"; this.SampleOwnerName.DataPropertyName = "OwnerName";
this.SampleOwnerName.HeaderText = "所属部门"; this.SampleOwnerName.HeaderText = "所属部门";
this.SampleOwnerName.MinimumWidth = 90; this.SampleOwnerName.MinimumWidth = 90;
this.SampleOwnerName.Name = "SampleOwnerName"; this.SampleOwnerName.Name = "SampleOwnerName";
this.SampleOwnerName.ReadOnly = true; 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 // SampleDealTime
// //
...@@ -824,6 +758,74 @@ ...@@ -824,6 +758,74 @@
this.SampleQuantityUnit.Name = "SampleQuantityUnit"; this.SampleQuantityUnit.Name = "SampleQuantityUnit";
this.SampleQuantityUnit.ReadOnly = true; 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";
//
// dataGridViewTextBoxColumn4
//
this.dataGridViewTextBoxColumn4.DataPropertyName = "Name";
this.dataGridViewTextBoxColumn4.HeaderText = "样品名称";
this.dataGridViewTextBoxColumn4.MinimumWidth = 150;
this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
this.dataGridViewTextBoxColumn4.Width = 150;
//
// dataGridViewTextBoxColumn3
//
this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.dataGridViewTextBoxColumn3.DataPropertyName = "OwnerName";
this.dataGridViewTextBoxColumn3.HeaderText = "所属部门";
this.dataGridViewTextBoxColumn3.MinimumWidth = 90;
this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
//
// 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";
//
// FrmMain // FrmMain
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
...@@ -900,25 +902,25 @@ ...@@ -900,25 +902,25 @@
private System.Windows.Forms.Label lbPackageSamplesCount; private System.Windows.Forms.Label lbPackageSamplesCount;
private System.Windows.Forms.Label lbPackageSampleMiss; private System.Windows.Forms.Label lbPackageSampleMiss;
private System.Windows.Forms.Label lbPackageSamples; private System.Windows.Forms.Label lbPackageSamples;
private System.Windows.Forms.CheckBox ckbSelectAll;
private System.Windows.Forms.Label lbAssignOperatorName;
private System.Windows.Forms.ComboBox cbAssignOperatorName;
private System.Windows.Forms.Button btnSetCurrentPackage;
private System.Windows.Forms.DataGridViewTextBoxColumn Column2; private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
private System.Windows.Forms.DataGridViewCheckBoxColumn ScanedIsSelected; private System.Windows.Forms.DataGridViewCheckBoxColumn ScanedIsSelected;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
private System.Windows.Forms.CheckBox ckbSelectAll;
private System.Windows.Forms.Label lbAssignOperatorName;
private System.Windows.Forms.ComboBox cbAssignOperatorName;
private System.Windows.Forms.Button btnSetCurrentPackage;
private System.Windows.Forms.DataGridViewTextBoxColumn Column1; private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
private System.Windows.Forms.DataGridViewButtonColumn Column3; private System.Windows.Forms.DataGridViewButtonColumn Column3;
private System.Windows.Forms.DataGridViewTextBoxColumn SampleBizId; private System.Windows.Forms.DataGridViewTextBoxColumn SampleBizId;
private System.Windows.Forms.DataGridViewTextBoxColumn SamplePackageName; private System.Windows.Forms.DataGridViewTextBoxColumn SamplePackageName;
private System.Windows.Forms.DataGridViewTextBoxColumn SampleOwnerName;
private System.Windows.Forms.DataGridViewTextBoxColumn SampleName; private System.Windows.Forms.DataGridViewTextBoxColumn SampleName;
private System.Windows.Forms.DataGridViewTextBoxColumn SampleOwnerName;
private System.Windows.Forms.DataGridViewTextBoxColumn SampleDealTime; private System.Windows.Forms.DataGridViewTextBoxColumn SampleDealTime;
private System.Windows.Forms.DataGridViewTextBoxColumn SampleDeadTime; private System.Windows.Forms.DataGridViewTextBoxColumn SampleDeadTime;
private System.Windows.Forms.DataGridViewTextBoxColumn SampleQuantityUnit; private System.Windows.Forms.DataGridViewTextBoxColumn SampleQuantityUnit;
......
Src/FrmMain.cs
...@@ -1004,7 +1004,14 @@ namespace Kivii.Client.SampleInbounds ...@@ -1004,7 +1004,14 @@ namespace Kivii.Client.SampleInbounds
//tbSetCurrentPackage.Enabled = !btnLogin.Enabled; //tbSetCurrentPackage.Enabled = !btnLogin.Enabled;
setDefault(tbxServiceUrl, tbxUserName, tbxPassword); setDefault(tbxServiceUrl, tbxUserName, tbxPassword);
outputMessage($"登录成功,登录人:{resp.DisplayName}", true); outputMessage($"登录成功,登录人:{resp.DisplayName}", true);
connectReader(); if (!isConnected || reader == null)
{
if (!connectReader())
{
MessageBox.Show("读写器未连接,请查看是否读写器设备!");
return;
}
}
}, true); }, true);
task.Error(err => task.Error(err =>
{ {
...@@ -1032,6 +1039,10 @@ namespace Kivii.Client.SampleInbounds ...@@ -1032,6 +1039,10 @@ namespace Kivii.Client.SampleInbounds
_client.Dispose(); _client.Dispose();
_client = null; _client = null;
initUserInfo(); initUserInfo();
if (isConnected && reader != null)
{
disConnectReader();
}
outputMessage($"退出成功"); outputMessage($"退出成功");
}); });
task.Error(err => task.Error(err =>
...@@ -1219,7 +1230,7 @@ namespace Kivii.Client.SampleInbounds ...@@ -1219,7 +1230,7 @@ namespace Kivii.Client.SampleInbounds
var item = dgvSamples.Rows[i].DataBoundItem as Sample; var item = dgvSamples.Rows[i].DataBoundItem as Sample;
if (!item.IsMatched) if (!item.IsMatched)
{ {
dgvSamples.Rows[i].DefaultCellStyle.BackColor = Color.PapayaWhip; dgvSamples.Rows[i].DefaultCellStyle.BackColor = Color.MediumPurple;
} }
} }
} }
...@@ -1230,7 +1241,7 @@ namespace Kivii.Client.SampleInbounds ...@@ -1230,7 +1241,7 @@ namespace Kivii.Client.SampleInbounds
var item = dgvRfidSamples.Rows[i].DataBoundItem as Sample; var item = dgvRfidSamples.Rows[i].DataBoundItem as Sample;
if (!item.IsMatched) if (!item.IsMatched)
{ {
dgvRfidSamples.Rows[i].DefaultCellStyle.BackColor = Color.PapayaWhip; dgvRfidSamples.Rows[i].DefaultCellStyle.BackColor = Color.DarkSalmon;
} }
} }
} }
......
Src/FrmMain.resx
...@@ -129,10 +129,10 @@ ...@@ -129,10 +129,10 @@
<metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
...@@ -156,10 +156,10 @@ ...@@ -156,10 +156,10 @@
<metadata name="SamplePackageName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="SamplePackageName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="SampleOwnerName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="SampleName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="SampleName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="SampleOwnerName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="SampleDealTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="SampleDealTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
......
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