|
|
|
@ -290,6 +290,23 @@ namespace DAJYun.Application
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
//这里不知道为什么取不到表格信息了,改用文本获取
|
|
|
|
|
string currTxt = doc.Pages[pageIndex].ExtractText();
|
|
|
|
|
|
|
|
|
|
string noTableCtnRegex = "(\\bNumber\\b)\\s+\\w+\\s+(\\bPackages\\b)\\s+\\w+\\s+(Cargo\\s+Weight)\\s+(\\w|\\s)+(\\bVolume\\b)\\s+(\\w|\\s)+(\\bVGM\\b)\\s+(\\w|\\s)+(VGM\\s+Method)\\s+(\\w|\\s|')+(Carrier\\s+seal)\\s+\\w+";
|
|
|
|
|
|
|
|
|
|
if (Regex.IsMatch(currTxt, noTableCtnRegex, RegexOptions.IgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
var currMatches = Regex.Matches(currTxt, noTableCtnRegex, RegexOptions.IgnoreCase);
|
|
|
|
|
|
|
|
|
|
foreach(var cMatch in currMatches)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pdfText = txtBuilder.ToString();
|
|
|
|
|