jianghaiqing
/
DAJYunPlat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改BC识别

Browse Source
master
jianghaiqing 5 months ago
parent a5e8ff0a68
commit 4373187bc8
3 changed files with 70 additions and 5 deletions
Show Stats Download Patch File Download Diff File

30
DAJYunPlat/DAJYun.Application/TaskManagePlatDomain/TaskBCParserService.cs
Unescape Escape View File

@ -774,7 +774,20 @@ namespace DAJYun.Application.TaskManagePlatDomain
{
if (!model.ETD.HasValue)
{
model.ETD = DateTime.Parse(Regex.Replace(Regex.Replace(rowList[i].Field<string>(etdCol.Name), "\\n", " "), "\\s{2}", " "));
string s2 = Regex.Replace(Regex.Replace(rowList[i].Field<string>(etdCol.Name), "\\n", " "), "\\s{2}", " ");
if (Regex.Matches(s2, "[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}").Count > 1)
{
string s3 = Regex.Matches(s2, "[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}").LastOrDefault().Value;
model.ETD = DateTime.Parse(s3);
}
else
{
model.ETD = DateTime.Parse(s2);
}
//model.ETD = DateTime.Parse(Regex.Replace(Regex.Replace(rowList[i].Field<string>(etdCol.Name), "\\n", " "), "\\s{2}", " "));
}
}
else if (i == 1)
@ -792,7 +805,20 @@ namespace DAJYun.Application.TaskManagePlatDomain
{
if (!model.ETA.HasValue)
{
model.ETA = DateTime.Parse(Regex.Replace(Regex.Replace(rowList[i].Field<string>(etaCol.Name), "\\n", " "), "\\s{2}", " "));
string s2 = Regex.Replace(Regex.Replace(rowList[i].Field<string>(etaCol.Name), "\\n", " "), "\\s{2}", " ");
if (Regex.Matches(s2, "[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}").Count > 1)
{
string s3 = Regex.Matches(s2, "[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}").LastOrDefault().Value;
model.ETA = DateTime.Parse(s3);
}
else
{
model.ETA = DateTime.Parse(s2);
}
//model.ETA = DateTime.Parse(Regex.Replace(Regex.Replace(rowList[i].Field<string>(etaCol.Name), "\\n", " "), "\\s{2}", " "));
}
}
else

11
DAJYunPlat/DAJYun.Application/TaskManagePlatDomain/TaskBookingAmendmentParserService.cs
Unescape Escape View File

@ -278,6 +278,17 @@ namespace DAJYun.Application.TaskManagePlatDomain
VoyNo = bcInfo.Voyage
};
if (string.IsNullOrWhiteSpace(model.MBLNo))
{
if (Regex.IsMatch(originText, "Booking\\s+No\\.\\:\\s+\\w+"))
{
string s = Regex.Match(originText, "(?<=Booking\\sNo\\.\\:)\\s+\\w+").Value;
if (!string.IsNullOrWhiteSpace(s))
model.MBLNo = s.Trim();
}
}
if (!string.IsNullOrWhiteSpace(model.Vessel))
{
if (Regex.IsMatch(model.Vessel, "\\(s?\\)"))

34
DAJYunPlat/DAJYun.Application/TaskManagePlatDomain/TaskBookingCancellationParserService.cs
Unescape Escape View File

@ -417,9 +417,15 @@ namespace DAJYun.Application.TaskManagePlatDomain
{
s = Regex.Match(orgText, "(?<=合约号\\:)(\\w|\\s)+(?=Customer\\sCommodity)").Value?.Trim();
}
if (string.IsNullOrWhiteSpace(s))
{
s = Regex.Match(orgText, "(?<=Service\\sContract\\:)(\\w|\\s)+(?=Customer\\sCommodity)").Value?.Trim();
}
if (string.IsNullOrWhiteSpace(s))
{
s = Regex.Match(orgText, "(?<=Service\\s+Contract\\:)(\\w|\\s)+(?=Customer\\sCommodity)").Value?.Trim();
s = Regex.Match(orgText, "(?<=Service\\sContract\\:)(\\w|\\s)+(?=Cargo\\sDetails)").Value?.Trim();
}
if (!string.IsNullOrWhiteSpace(s))
@ -697,7 +703,18 @@ namespace DAJYun.Application.TaskManagePlatDomain
{
if (!model.ETD.HasValue)
{
model.ETD = DateTime.Parse(Regex.Replace(Regex.Replace(rowList[i].Field<string>(etdCol.Name), "\\n", " "), "\\s{2}", " "));
string s2 = Regex.Replace(Regex.Replace(rowList[i].Field<string>(etdCol.Name), "\\n", " "), "\\s{2}", " ");
if (Regex.Matches(s2, "[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}").Count > 1)
{
string s3 = Regex.Matches(s2, "[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}").LastOrDefault().Value;
model.ETD = DateTime.Parse(s3);
}
else
{
model.ETD = DateTime.Parse(s2);
}
}
}
else
@ -716,7 +733,18 @@ namespace DAJYun.Application.TaskManagePlatDomain
{
if (!model.ETA.HasValue)
{
model.ETA = DateTime.Parse(Regex.Replace(Regex.Replace(rowList[i].Field<string>(etaCol.Name), "\\n", " "), "\\s{2}", " "));
string s2 = Regex.Replace(Regex.Replace(rowList[i].Field<string>(etaCol.Name), "\\n", " "), "\\s{2}", " ");
if (Regex.Matches(s2, "[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}").Count > 1)
{
string s3 = Regex.Matches(s2, "[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}").LastOrDefault().Value;
model.ETA = DateTime.Parse(s3);
}
else
{
model.ETA = DateTime.Parse(s2);
}
}
}
else

Write Preview
Loading…
Cancel
Save