Skip to content

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

优化

parent d20328e7
Showing with 18 additions and 7 deletions
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