Commit a61aed47 by 任天宇

优化

parent 05a35dbd
...@@ -474,6 +474,7 @@ ...@@ -474,6 +474,7 @@
this.ckbSelectAll.TabIndex = 90; this.ckbSelectAll.TabIndex = 90;
this.ckbSelectAll.Text = "全选"; this.ckbSelectAll.Text = "全选";
this.ckbSelectAll.UseVisualStyleBackColor = true; this.ckbSelectAll.UseVisualStyleBackColor = true;
this.ckbSelectAll.Visible = false;
this.ckbSelectAll.CheckedChanged += new System.EventHandler(this.ckbSelectAll_CheckedChanged); this.ckbSelectAll.CheckedChanged += new System.EventHandler(this.ckbSelectAll_CheckedChanged);
// //
// lbScanSampleMoreCount // lbScanSampleMoreCount
...@@ -525,6 +526,7 @@ ...@@ -525,6 +526,7 @@
this.ckbAutoPackage.TabIndex = 85; this.ckbAutoPackage.TabIndex = 85;
this.ckbAutoPackage.Text = "未入箱自动入箱"; this.ckbAutoPackage.Text = "未入箱自动入箱";
this.ckbAutoPackage.UseVisualStyleBackColor = true; this.ckbAutoPackage.UseVisualStyleBackColor = true;
this.ckbAutoPackage.Visible = false;
// //
// btnSampleAssign // btnSampleAssign
// //
...@@ -836,7 +838,7 @@ ...@@ -836,7 +838,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.1(23.7.7)"; this.Text = "样品入库交接客户端 1.2(23.7.6)";
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);
......
...@@ -310,7 +310,7 @@ namespace Kivii.Client.SampleInbounds ...@@ -310,7 +310,7 @@ namespace Kivii.Client.SampleInbounds
MessageBox.Show("读写器未连接,请查看是否读写器设备!"); MessageBox.Show("读写器未连接,请查看是否读写器设备!");
return; return;
} }
Thread.Sleep(500); Thread.Sleep(50);
} }
reader.ReadTag(currentSetting.btReadId, 0x02, Convert.ToByte(00), Convert.ToByte(6)); reader.ReadTag(currentSetting.btReadId, 0x02, Convert.ToByte(00), Convert.ToByte(6));
} }
...@@ -977,7 +977,14 @@ namespace Kivii.Client.SampleInbounds ...@@ -977,7 +977,14 @@ namespace Kivii.Client.SampleInbounds
} }
if (!unPackageKvids.IsNullOrEmpty()) if (!unPackageKvids.IsNullOrEmpty())
{ {
if (ckbAutoPackage.Checked) samplePackaging(unPackageKvids); //if (ckbAutoPackage.Checked) samplePackaging(unPackageKvids);
samplePackaging(unPackageKvids);
}
if (!notCurrentPackageKvids.IsNullOrEmpty())
{
outputMessage($"扫描到{notCurrentPackageKvids.Count}条已经入其他箱子的样品,无法交接到当前箱内,若想交接入当前箱内,请先撤销入箱后到此客户端重新扫描.",true);
MessageBox.Show($"扫描到{notCurrentPackageKvids.Count}条已经入其他箱子的样品,无法交接到当前箱内,若想交接入当前箱内,请先撤销入箱后到此客户端重新扫描.");
} }
} }
#endregion #endregion
......
...@@ -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.4.2023.7050")] [assembly: AssemblyVersion("5.4.2023.7060")]
[assembly: AssemblyFileVersion("5.4.2023.7050")] [assembly: AssemblyFileVersion("5.4.2023.7060")]
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