Commit fff2ee6f by Neo Turing

C箱验证

parent d9aa22e8
...@@ -274,14 +274,26 @@ namespace Kivii.Client.SamplePackages ...@@ -274,14 +274,26 @@ namespace Kivii.Client.SamplePackages
} }
var record = resp.Results[0]; var record = resp.Results[0];
var bizid = record.BizId; var bizid = record.BizId;
string typeEx = record.Metadata.ContainsKey("TypeEx") ? record.Metadata["TypeEx"] : string.Empty;
var lastindex = bizid.LastIndexOf('-'); var lastindex = bizid.LastIndexOf('-');
if (lastindex != -1 && lastindex != 3) bizid = bizid.Substring(0, lastindex); if (lastindex != -1 && lastindex != 3) bizid = bizid.Substring(0, lastindex);
bool typeJ = false;
bool packageNameIsA = false; bool packageNameIsA = false;
bool sampleBizIdWithSuffix = false; bool sampleBizIdWithSuffix = false;
if (typeEx.ToLower() == "j") typeJ = true;
if (_currentPackage.Name.ToLower().StartsWithIgnoreCase("a")) packageNameIsA = true; if (_currentPackage.Name.ToLower().StartsWithIgnoreCase("a")) packageNameIsA = true;
sampleBizIdWithSuffix = Regex.IsMatch(bizid.ToLower(), "[a-zA-Z]$", RegexOptions.IgnoreCase); sampleBizIdWithSuffix = Regex.IsMatch(bizid.ToLower(), "[a-zA-Z]$", RegexOptions.IgnoreCase);
if (packageNameIsA) if (typeJ)
{
if (_currentPackage.Name.ToLower().StartsWithIgnoreCase("c")) samplePackaging(record);
else
{
MessageBox.Show("此报告号为监督样,只能入C箱!", "样品入箱");
return;
}
}
else if (packageNameIsA)
{ {
if(sampleBizIdWithSuffix) samplePackaging(record); if(sampleBizIdWithSuffix) samplePackaging(record);
else else
......
...@@ -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.8070")] [assembly: AssemblyVersion("5.4.2025.1030")]
[assembly: AssemblyFileVersion("5.4.2023.8070")] [assembly: AssemblyFileVersion("5.4.2025.1030")]
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