Commit d42f2593 by 任天宇

优化

parent 28add6e8
......@@ -690,7 +690,7 @@
//
this.lbPackageSampleMissCount.AutoSize = true;
this.lbPackageSampleMissCount.Font = new System.Drawing.Font("宋体", 18F);
this.lbPackageSampleMissCount.Location = new System.Drawing.Point(227, 93);
this.lbPackageSampleMissCount.Location = new System.Drawing.Point(182, 98);
this.lbPackageSampleMissCount.Name = "lbPackageSampleMissCount";
this.lbPackageSampleMissCount.Size = new System.Drawing.Size(22, 24);
this.lbPackageSampleMissCount.TabIndex = 85;
......@@ -700,7 +700,7 @@
//
this.lbPackageSamplesCount.AutoSize = true;
this.lbPackageSamplesCount.Font = new System.Drawing.Font("宋体", 18F);
this.lbPackageSamplesCount.Location = new System.Drawing.Point(78, 93);
this.lbPackageSamplesCount.Location = new System.Drawing.Point(66, 98);
this.lbPackageSamplesCount.Name = "lbPackageSamplesCount";
this.lbPackageSamplesCount.Size = new System.Drawing.Size(22, 24);
this.lbPackageSamplesCount.TabIndex = 84;
......@@ -710,7 +710,7 @@
//
this.lbPackageSampleMiss.AutoSize = true;
this.lbPackageSampleMiss.Font = new System.Drawing.Font("宋体", 14F);
this.lbPackageSampleMiss.Location = new System.Drawing.Point(136, 98);
this.lbPackageSampleMiss.Location = new System.Drawing.Point(108, 103);
this.lbPackageSampleMiss.Name = "lbPackageSampleMiss";
this.lbPackageSampleMiss.Size = new System.Drawing.Size(85, 19);
this.lbPackageSampleMiss.TabIndex = 83;
......@@ -720,7 +720,7 @@
//
this.lbPackageSamples.AutoSize = true;
this.lbPackageSamples.Font = new System.Drawing.Font("宋体", 14F);
this.lbPackageSamples.Location = new System.Drawing.Point(6, 98);
this.lbPackageSamples.Location = new System.Drawing.Point(3, 103);
this.lbPackageSamples.Name = "lbPackageSamples";
this.lbPackageSamples.Size = new System.Drawing.Size(66, 19);
this.lbPackageSamples.TabIndex = 82;
......@@ -729,11 +729,11 @@
// lbCurrentPackageStatus
//
this.lbCurrentPackageStatus.AutoSize = true;
this.lbCurrentPackageStatus.Font = new System.Drawing.Font("宋体", 18F);
this.lbCurrentPackageStatus.Font = new System.Drawing.Font("宋体", 15F);
this.lbCurrentPackageStatus.ForeColor = System.Drawing.Color.Red;
this.lbCurrentPackageStatus.Location = new System.Drawing.Point(6, 82);
this.lbCurrentPackageStatus.Location = new System.Drawing.Point(3, 79);
this.lbCurrentPackageStatus.Name = "lbCurrentPackageStatus";
this.lbCurrentPackageStatus.Size = new System.Drawing.Size(0, 24);
this.lbCurrentPackageStatus.Size = new System.Drawing.Size(0, 20);
this.lbCurrentPackageStatus.TabIndex = 81;
//
// btnClearCurrentPackage
......
......@@ -147,7 +147,7 @@ namespace Kivii.Client.SampleInbounds
/// </summary>
/// <param name="message">消息内容</param>
/// <param name="clearMessage">是否清除消息</param>
private void outputMessage(string message, bool clearMessage = false)
private void outputMessage(string message, bool clearMessage = false, bool errMsg = false)
{
if (this.InvokeRequired)
{
......@@ -157,7 +157,16 @@ namespace Kivii.Client.SampleInbounds
if (clearMessage) rtbMessage.Clear();
if (rtbMessage.Lines.Count() > 500) rtbMessage.Clear();
var time = DateTime.Now.ToString("HH:mm:ss");
rtbMessage.AppendText($"[{time}]{message}{Environment.NewLine}");
var msg = $"[{time}]{message}{Environment.NewLine}";
if (errMsg)
{
rtbMessage.SelectionStart = rtbMessage.TextLength;
rtbMessage.SelectionLength = 0;
rtbMessage.SelectionColor = Color.Red;
rtbMessage.AppendText(msg);
rtbMessage.SelectionColor = rtbMessage.ForeColor;
}
else rtbMessage.AppendText(msg);
rtbMessage.ScrollToCaret();
}
#endregion
......@@ -187,7 +196,7 @@ namespace Kivii.Client.SampleInbounds
if (nRet != 0)
{
isConnected = false;
outputMessage("连接读写器失败,失败原因: " + exception);
outputMessage("连接读写器失败,失败原因: " + exception, false, true);
return false;
}
else
......@@ -319,7 +328,7 @@ namespace Kivii.Client.SampleInbounds
});
task.Error(err =>
{
outputMessage(err.GetResponseStatus().Message);
outputMessage(err.GetResponseStatus().Message, false, true);
});
}
private void initLocation()
......@@ -386,7 +395,7 @@ namespace Kivii.Client.SampleInbounds
if (_currentPackage.Status == (int)PackageStatus.Inbound)
{
lbCurrentPackageStatus.Text = "当前箱子已入库";
outputMessage($"当前箱子为已入库状态,无法继续操作!");
outputMessage($"当前箱子为已入库状态,无法继续操作!", false, true);
return;
}
Thread.Sleep(200);
......@@ -435,7 +444,7 @@ namespace Kivii.Client.SampleInbounds
btnScanRfid.Enabled = false;
tbScanSample.Enabled = false;
tbScanSample.Text = "";
outputMessage($"查询箱号错误!原因:{err.GetResponseStatus().Message}");
outputMessage($"查询箱号错误!原因:{err.GetResponseStatus().Message}", false, true);
});
}
......@@ -493,7 +502,7 @@ namespace Kivii.Client.SampleInbounds
});
task.Error(err =>
{
outputMessage($"查询样品错误!原因:{err.GetResponseStatus().Message}");
outputMessage($"查询样品错误!原因:{err.GetResponseStatus().Message}", false, true);
//MessageBox.Show(err.Message, "查询样品");
});
}
......@@ -516,7 +525,7 @@ namespace Kivii.Client.SampleInbounds
var ownerSelected = cbSetCurrentPackageOwner.SelectedItem as Organization;
if (ownerSelected == null)
{
outputMessage("请设置交接组部门信息!");
outputMessage("请设置交接组部门信息!", false, true);
return;
}
request.OwnerKvid = ownerSelected.Kvid;
......@@ -526,7 +535,7 @@ namespace Kivii.Client.SampleInbounds
if (resp.Results.Count <= 0)
{
//MessageBox.Show("未找到样品,当前组不包含此样品!", "交接查询");
outputMessage($"未找到样品:{epc},当前组不包含此样品!");
outputMessage($"未找到样品:{epc},当前组不包含此样品!", false, true);
return;
}
var record = resp.Results[0];
......@@ -580,7 +589,7 @@ namespace Kivii.Client.SampleInbounds
}
catch (Exception ex)
{
outputMessage($"交接查询错误,{ex.GetResponseStatus().Message}");
outputMessage($"交接查询错误,{ex.GetResponseStatus().Message}", false, true);
}
}
......@@ -620,7 +629,7 @@ namespace Kivii.Client.SampleInbounds
}
catch (Exception ex)
{
outputMessage($"入箱错误,原因:{ex.GetResponseStatus().Message}");
outputMessage($"入箱错误,原因:{ex.GetResponseStatus().Message}", false, true);
}
}
......@@ -658,7 +667,7 @@ namespace Kivii.Client.SampleInbounds
}
catch (Exception ex)
{
outputMessage($"交接错误,原因:{ex.GetResponseStatus().Message}");
outputMessage($"交接错误,原因:{ex.GetResponseStatus().Message}", false, true);
//MessageBox.Show(ex.GetResponseStatus().Message, "样品入箱");
}
}
......@@ -753,7 +762,7 @@ namespace Kivii.Client.SampleInbounds
initUserInfo();
_client.Dispose();
_client = null;
outputMessage($"登录失败,原因:{err.GetResponseStatus().Message}");
outputMessage($"登录失败,原因:{err.GetResponseStatus().Message}", false, true);
}, true);
}
......@@ -779,7 +788,7 @@ namespace Kivii.Client.SampleInbounds
{
btnLogout.Enabled = true;
MessageBox.Show(err.Message, "Logout Error");
outputMessage($"退出失败!原因:{err.GetResponseStatus().Message}");
outputMessage($"退出失败!原因:{err.GetResponseStatus().Message}", false, true);
});
}
......
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