Commit 3904d47e by 任天宇

优化

parent 3d731fa2
......@@ -602,7 +602,7 @@
this.Controls.Add(this.plLeft);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmMain";
this.Text = "样品入箱客户端 1.5(23.7.120 CP2101)";
this.Text = "样品入箱客户端 1.6(23.7.270 CP2101)";
this.Load += new System.EventHandler(this.FrmMain_Load);
this.plLeft.ResumeLayout(false);
this.gbInfo.ResumeLayout(false);
......
......@@ -273,11 +273,14 @@ namespace Kivii.Client.SamplePackages
return;
}
var record = resp.Results[0];
var bizid = record.BizId;
var lastindex = bizid.LastIndexOf('-');
if (lastindex != -1 && lastindex != 3) bizid = bizid.Substring(0, lastindex);
bool packageNameIsA = false;
bool sampleBizIdWithSuffix = false;
if (_currentPackage.Name.ToLower().StartsWithIgnoreCase("a")) packageNameIsA = true;
sampleBizIdWithSuffix = Regex.IsMatch(record.BizId.ToLower(), "[a-zA-Z]$", RegexOptions.IgnoreCase);
sampleBizIdWithSuffix = Regex.IsMatch(bizid.ToLower(), "[a-zA-Z]$", RegexOptions.IgnoreCase);
if (packageNameIsA)
{
if(sampleBizIdWithSuffix) samplePackaging(record);
......@@ -496,6 +499,7 @@ namespace Kivii.Client.SamplePackages
{
return;
}
//MessageBox.Show($"EPC:{epc}\nTID:{tid}");
samplePrepackaging(tid, epc);
}
catch (Exception ex)
......
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2023.7120")]
[assembly: AssemblyFileVersion("5.4.2023.7120")]
[assembly: AssemblyVersion("5.4.2023.7270")]
[assembly: AssemblyFileVersion("5.4.2023.7270")]
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