Skip to content

K
Kivii.Client.SamplePackages.V4.0
Commit 0142679c by 任天宇
Options

优化

parent 36800b3c
Showing with 155 additions and 52 deletions
Src/FrmMain.Designer.cs
......@@ -73,6 +73,7 @@
this.SampleDeadTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SampleQuantityUnit = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SamplePackageName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.btnInstallDriver = new System.Windows.Forms.Button();
this.plLeft.SuspendLayout();
this.gbInfo.SuspendLayout();
this.gbLogin.SuspendLayout();
......@@ -117,7 +118,7 @@
this.lbCurrentPackageNode.Font = new System.Drawing.Font("宋体", 12F);
this.lbCurrentPackageNode.Location = new System.Drawing.Point(16, 180);
this.lbCurrentPackageNode.Name = "lbCurrentPackageNode";
this.lbCurrentPackageNode.Size = new System.Drawing.Size(79, 16);
this.lbCurrentPackageNode.Size = new System.Drawing.Size(80, 16);
this.lbCurrentPackageNode.TabIndex = 7;
this.lbCurrentPackageNode.Text = "当前袋子:";
//
......@@ -127,7 +128,7 @@
this.lbCurrentPackage.Font = new System.Drawing.Font("宋体", 12F);
this.lbCurrentPackage.Location = new System.Drawing.Point(16, 127);
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.Text = "当前箱号:";
//
......@@ -137,7 +138,7 @@
this.lbCurrentLocation.Font = new System.Drawing.Font("宋体", 12F);
this.lbCurrentLocation.Location = new System.Drawing.Point(16, 74);
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.Text = "当前位置:";
//
......@@ -147,7 +148,7 @@
this.lbCurrentDepartment.Font = new System.Drawing.Font("宋体", 12F);
this.lbCurrentDepartment.Location = new System.Drawing.Point(16, 21);
this.lbCurrentDepartment.Name = "lbCurrentDepartment";
this.lbCurrentDepartment.Size = new System.Drawing.Size(79, 16);
this.lbCurrentDepartment.Size = new System.Drawing.Size(80, 16);
this.lbCurrentDepartment.TabIndex = 4;
this.lbCurrentDepartment.Text = "当前部门:";
//
......@@ -315,6 +316,7 @@
//
// gbTools
//
this.gbTools.Controls.Add(this.btnInstallDriver);
this.gbTools.Controls.Add(this.ckbAutoCreatePackage);
this.gbTools.Controls.Add(this.lbTips);
this.gbTools.Controls.Add(this.lbScanSample);
......@@ -567,6 +569,18 @@
this.SamplePackageName.ReadOnly = true;
this.SamplePackageName.Width = 120;
//
// btnInstallDriver
//
this.btnInstallDriver.Dock = System.Windows.Forms.DockStyle.Bottom;
this.btnInstallDriver.Location = new System.Drawing.Point(3, 99);
this.btnInstallDriver.Name = "btnInstallDriver";
this.btnInstallDriver.Size = new System.Drawing.Size(780, 23);
this.btnInstallDriver.TabIndex = 82;
this.btnInstallDriver.Text = "驱动安装";
this.btnInstallDriver.UseVisualStyleBackColor = true;
this.btnInstallDriver.Visible = false;
this.btnInstallDriver.Click += new System.EventHandler(this.btnInstallDriver_Click);
//
// FrmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......@@ -639,6 +653,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn SampleDeadTime;
private System.Windows.Forms.DataGridViewTextBoxColumn SampleQuantityUnit;
private System.Windows.Forms.DataGridViewTextBoxColumn SamplePackageName;
private System.Windows.Forms.Button btnInstallDriver;
}
}
Src/FrmMain.cs
......@@ -207,19 +207,47 @@ namespace Kivii.Client.SamplePackages
}));
var request = new SampleQuery2();
request.PackageKvid = _currentPackage.Kvid;
var task = _client.PostAsync(request);
task.Success(resp =>
try
{
_currentSamples = resp.Results.ToList();
this.Invoke(new Action(delegate
var resp = _client.Post(request);
if (!resp.Results.IsNullOrEmpty())
{
dgvSamples.DataSource = _currentSamples;
}));
});
task.Error(err =>
_currentSamples = resp.Results.ToList();
this.Invoke(new Action(delegate
{
dgvSamples.DataSource = _currentSamples;
}));
}
}
catch (Exception ex)
{
MessageBox.Show(err.Message, "查询样品");
});
MessageBox.Show(ex.GetResponseStatus().Message, "查询样品" + ex.Message);
}
//task.Success(resp =>
//{
// _currentSamples = resp.Results.ToList();
// this.Invoke(new Action(delegate
// {
// dgvSamples.DataSource = _currentSamples;
// }));
//});
//task.Error(err =>
//{
// MessageBox.Show(err.Message, "查询样品");
//});
//var task = _client.PostAsync(request);
//task.Success(resp =>
//{
// _currentSamples = resp.Results.ToList();
// this.Invoke(new Action(delegate
// {
// dgvSamples.DataSource = _currentSamples;
// }));
//});
//task.Error(err =>
//{
// MessageBox.Show(err.Message, "查询样品");
//});
}
private void samplePrepackaging(string tid, string epc = null, string bizId = null)
......@@ -366,9 +394,9 @@ namespace Kivii.Client.SamplePackages
var request = new SampleQuery();
request.Name = tbSetCurrentPackage.Text;
request.Type = SampleType.Package;
var task = _client.PostAsync(request);
task.Success(resp =>
try
{
var resp = _client.Post(request);
if (resp.Results.Count <= 0)
{
if (!ckbAutoCreatePackage.Checked)
......@@ -379,15 +407,15 @@ namespace Kivii.Client.SamplePackages
}
else
{
var requestCreate=new PackageCreate();
var requestCreate = new PackageCreate();
requestCreate.Item = new Sample();
requestCreate.Item.Name = tbSetCurrentPackage.Text;
requestCreate.Item.Type = SampleType.Package;
requestCreate.Item.OperateTime = DateTime.Now;
var createTask = _client.PostAsync(requestCreate);
createTask.Success(res =>
try
{
if(res.Results.Count <= 0)
var res = _client.Post(requestCreate);
if (res.Results.Count <= 0)
{
_currentPackage = null;
MessageBox.Show("创建箱号失败!", "箱号设置");
......@@ -396,41 +424,39 @@ namespace Kivii.Client.SamplePackages
var createPackage = res.Results.FirstOrDefault();
setCurrentPackage(createPackage);
return;
});
createTask.Error(ex =>
}
catch (Exception ex)
{
_currentPackage = null;
MessageBox.Show("创建箱号失败!", "箱号设置");
MessageBox.Show(ex.GetResponseStatus().Message, "创建箱号失败");
return;
});
return;
}
//var createTask = _client.PostAsync(requestCreate);
//createTask.Success(res =>
//{
// if (res.Results.Count <= 0)
// {
// _currentPackage = null;
// MessageBox.Show("创建箱号失败!", "箱号设置");
// return;
// }
// var createPackage = res.Results.FirstOrDefault();
// setCurrentPackage(createPackage);
// return;
//});
//createTask.Error(ex =>
//{
// _currentPackage = null;
// MessageBox.Show("创建箱号失败!", "箱号设置");
// return;
//});
//return;
}
}
var package = resp.Results.FirstOrDefault();
setCurrentPackage(package);
//_currentPackage = new Sample();
//_currentPackage.PopulateWith(package);
//tbSetCurrentPackage.Enabled = _currentPackage == null;
//tbCurrentPackage.Text = _currentPackage.Name + (_currentPackage.PackageName.IsNullOrEmpty() ? "" : $"({_currentPackage.PackageName})");
//btnClearCurrentPackage.Enabled = _currentPackage != null;
//cbSetCurrentPackageNode.Enabled = _currentPackage.Status == (int)PackageStatus.Empty || _currentPackage.Status == (int)PackageStatus.Full;
//btnScanRfid.Enabled = _currentPackage.Status == (int)PackageStatus.Empty || _currentPackage.Status == (int)PackageStatus.Full;
//tbScanSample.Enabled = _currentPackage.Status == (int)PackageStatus.Empty || _currentPackage.Status == (int)PackageStatus.Full;
//tbScanSample.Text = "";
//if (_currentPackage.Status == (int)PackageStatus.Full || _currentPackage.Status == (int)PackageStatus.Inbound)
//{
// querySampleInPackaged();
//}
//if (_currentPackage.Status == (int)PackageStatus.Inbound)
//{
// MessageBox.Show("当前箱子已入库,无法继续操作!", "箱号设置");
// return;
//}
//cbSetCurrentPackageNode.SelectedIndex = 0;
//Thread.Sleep(200);
//btnScanRfid_Click(null, null);
});
task.Error(err =>
}
catch (Exception ex)
{
_currentPackage = null;
tbSetCurrentPackage.Enabled = true;
......@@ -442,8 +468,9 @@ namespace Kivii.Client.SamplePackages
tbScanSample.Enabled = false;
tbScanSample.Text = "";
MessageBox.Show(err.Message, "箱号设置");
});
MessageBox.Show(ex.GetResponseStatus().Message, "箱号设置");
}
//var task = _client.PostAsync(request);
}
private void reader_ConnectionLost(object sender, ConnectionChangedEventArgs e)
......@@ -461,7 +488,7 @@ namespace Kivii.Client.SamplePackages
private void reader_Connected(object sender, ConnectionChangedEventArgs e)
{
//在这启动定时器
_tmr = new System.Timers.Timer(1000);
_tmr = new System.Timers.Timer(800);
_tmr.Elapsed += new System.Timers.ElapsedEventHandler(tmr_Elapsed);
_tmr.Start();
}
......@@ -544,6 +571,14 @@ namespace Kivii.Client.SamplePackages
_client.Dispose();
_client = null;
initUserInfo();
if (ReaderInstance != null && ReaderInstance.State == ApplicationConnectionState.Connected)
{
ReaderInstance.CloseSpecComPort();
ReaderInstance = null;
btnScanRfid.Text = "开始扫描";
btnScanRfid.BackColor = Color.PapayaWhip;
btnScanRfid.ForeColor = Color.Chocolate;
}
});
task.Error(err =>
{
......@@ -654,7 +689,8 @@ namespace Kivii.Client.SamplePackages
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "连接读卡器失败");
MessageBox.Show("连接读卡器失败,可能是未安装驱动，请先安装驱动", ex.Message);
btnInstallDriver.Visible = true;
ReaderInstance = null;
return;
}
......@@ -705,5 +741,10 @@ namespace Kivii.Client.SamplePackages
samplePrepackaging(null, null, tbScanSample.Text);
}
}
private void btnInstallDriver_Click(object sender, EventArgs e)
{
Reader.InstallDriver();
}
}
}
Src/Kivii.Client.SamplePackages.V4.0.csproj
......@@ -105,6 +105,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Content\UHFReader18CSharp.dll" />
<EmbeddedResource Include="Content\Cp2101_Setup.exe" />
<Content Include="F.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Src/Reader.cs
using ReaderB;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Windows.Forms;
......@@ -13,6 +14,19 @@ namespace Kivii.Client.SamplePackages
public event EventHandler<ConnectionChangedEventArgs> ConnectionLost;
public ApplicationConnectionState State { get; private set; }
private static string _temporaryDirectory = string.Empty;
public static string TemporaryDirectory
{
get
{
if (_temporaryDirectory != string.Empty) return _temporaryDirectory;
_temporaryDirectory = Path.Combine(Path.GetTempPath(), "Kivii.Com");
_temporaryDirectory = _temporaryDirectory.ToLower();//全小写，适应Linux
if (!Directory.Exists(_temporaryDirectory)) Directory.CreateDirectory(_temporaryDirectory);
return _temporaryDirectory;
}
}
private byte fComAdr = 0xff; //当前操作的ComAdr
private byte fBaud;
private double fdminfre;
......@@ -227,6 +241,38 @@ namespace Kivii.Client.SamplePackages
epc = ByteArrayToHexString(EPC);
return true;
}
public static void InstallDriver()
{
var savePath = Path.Combine(TemporaryDirectory, "Cp2101_Driver");
if (!Directory.Exists(savePath)) Directory.CreateDirectory(savePath);
var assembly = typeof(Reader).Assembly;
var fileNames = assembly.GetManifestResourceNames();
if (fileNames == null || fileNames.Length == 0) return;
var localFileName = string.Empty;
foreach (var fileName in fileNames)
{
if (!fileName.ToLower().Contains(".cp2101_setup.exe")) continue;
localFileName = Path.Combine(savePath, "setup.exe");
var stream = assembly.GetManifestResourceStream(fileName);
using (var fileStream = new FileStream(localFileName, FileMode.Create))
{
stream.CopyTo(fileStream);
}
stream.Dispose();
break;
}
if (string.IsNullOrEmpty(localFileName)) return;
System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo();
//设置运行文件
startInfo.FileName = localFileName;
//设置启动参数
//设置启动动作,确保以管理员身份运行
startInfo.Verb = "runas";
//如果不是管理员，则启动UAC
System.Diagnostics.Process.Start(startInfo);
}
}
public class ConnectionChangedEventArgs : EventArgs
......
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