meswork/WC-CZGKJ
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加码块订货号解析顺序配置项

Browse Source
This commit is contained in:
XingCheng3
2026-05-16 13:48:12 +08:00
parent bb307f01db
commit e11c727114
3 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
SCADA/Funtion/MIS_Funtion.cs
View File

@@ -180,14 +180,15 @@ namespace MesWork
}
/// <summary>
/// 码块数据转换：将产品编号统一转大写，并拆分出订货号与产品编号
/// 支持格式：
/// 0/DHN2.5Q0219-36/D426E016767
/// DHH02K0014-400/B726E00584555
/// </summary>
private bool TryConvertCodeBlockData(string codeBlock, out string orderNo, out string productNo)
{
/// <summary>
/// 码块数据转换：将产品编号统一转大写，并拆分出订货号与产品编号
/// 支持格式：
/// 0/DHN2.5Q0219-36/D426E016767
/// DHH02K0014-400/B726E00584555
/// CodeBlockOrderNoReverse=0：订货号/流水号；CodeBlockOrderNoReverse=1：流水号/订货号
/// </summary>
private bool TryConvertCodeBlockData(string codeBlock, out string orderNo, out string productNo)
{
orderNo = "";
productNo = "";
if (string.IsNullOrWhiteSpace(codeBlock))
@@ -196,14 +197,22 @@ namespace MesWork
}
string normalizedCode = codeBlock.Trim().ToUpperInvariant();
string[] parts = normalizedCode.Split('/');
if (parts.Length >= 2)
{
orderNo = parts[parts.Length - 2].Trim();
productNo = parts[parts.Length - 1].Trim();
}
else
{
string[] parts = normalizedCode.Split('/');
if (parts.Length >= 2)
{
if (CodeBlockOrderNoReverse == 1)
{
productNo = parts[parts.Length - 2].Trim();
orderNo = parts[parts.Length - 1].Trim();
}
else
{
orderNo = parts[parts.Length - 2].Trim();
productNo = parts[parts.Length - 1].Trim();
}
}
else
{
productNo = normalizedCode;
}