Commit dd4794fa by 任天宇

升级箱号设置,交接到仓库的箱子无法设置

parent dba0054d
...@@ -593,7 +593,7 @@ ...@@ -593,7 +593,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.2(23.7.41 CP2101)"; this.Text = "样品入箱客户端 1.2(23.7.50 CP2101)";
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);
......
...@@ -361,6 +361,12 @@ namespace Kivii.Client.SamplePackages ...@@ -361,6 +361,12 @@ namespace Kivii.Client.SamplePackages
} }
private void setCurrentPackage(Sample package) private void setCurrentPackage(Sample package)
{ {
if(package.CurrentLocation.InternalCode== "Location.Warehouse101")
{
MessageBox.Show("当前箱子已经交接至仓库,无法设置", "箱号设置失败");
return;
}
_currentPackage = new Sample(); _currentPackage = new Sample();
_currentPackage.PopulateWith(package); _currentPackage.PopulateWith(package);
tbSetCurrentPackage.Enabled = _currentPackage == null; tbSetCurrentPackage.Enabled = _currentPackage == null;
...@@ -438,26 +444,6 @@ namespace Kivii.Client.SamplePackages ...@@ -438,26 +444,6 @@ namespace Kivii.Client.SamplePackages
MessageBox.Show(ex.GetResponseStatus().Message, "创建箱号失败"); 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(); var package = resp.Results.FirstOrDefault();
......
...@@ -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.7040")] [assembly: AssemblyVersion("5.4.2023.7050")]
[assembly: AssemblyFileVersion("5.4.2023.7040")] [assembly: AssemblyFileVersion("5.4.2023.7050")]
...@@ -18,6 +18,7 @@ namespace Kivii.Samples.Transforms ...@@ -18,6 +18,7 @@ namespace Kivii.Samples.Transforms
{ {
public string Name { get; set; } public string Name { get; set; }
public SampleType Type { get; set; } public SampleType Type { get; set; }
public bool IncludeLocation { get; set; } = true;
//public Guid PackageKvid { get; set; } //public Guid PackageKvid { get; set; }
} }
......
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