|
|
|
@ -496,11 +496,11 @@ namespace DAJYun.Application.TaskManagePlatDomain
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//取消的BC没有详细的船舶信息
|
|
|
|
|
if (model.UpdateFlag.IndexOf("CANCELLATION") < 0 && model.UpdateFlag.IndexOf("REJECTION") < 0)
|
|
|
|
|
{
|
|
|
|
|
////取消的BC没有详细的船舶信息
|
|
|
|
|
//if (model.UpdateFlag.IndexOf("CANCELLATION") < 0 && model.UpdateFlag.IndexOf("REJECTION") < 0)
|
|
|
|
|
//{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
#region 读取船期明细
|
|
|
|
|
//起点 终点 运输方式 预计开船时间 预计到达时间
|
|
|
|
@ -514,6 +514,7 @@ namespace DAJYun.Application.TaskManagePlatDomain
|
|
|
|
|
|
|
|
|
|
bool endFlag = false;
|
|
|
|
|
|
|
|
|
|
int iRecord = 0;
|
|
|
|
|
int maxLens = 0;
|
|
|
|
|
if (Regex.IsMatch(originText, "起点\\s{0,}终点\\s{0,}运输方式\\s{0,}预计开船时间\\s{0,}预计到达时间"))
|
|
|
|
|
{
|
|
|
|
@ -533,6 +534,12 @@ namespace DAJYun.Application.TaskManagePlatDomain
|
|
|
|
|
|
|
|
|
|
while (true)
|
|
|
|
|
{
|
|
|
|
|
if (iRecord >= 100)
|
|
|
|
|
{
|
|
|
|
|
_logger.LogInformation($"MBLNo={model.MBLNo} 处理【船期】异常,大于最大处理次数跳出");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
string regex = "(?<=" + name1.RegexSymbolFormat() + ").*(\\r\\n)";
|
|
|
|
|
var currLine = Regex.Match(originText, regex).Value;
|
|
|
|
|
|
|
|
|
@ -604,6 +611,8 @@ namespace DAJYun.Application.TaskManagePlatDomain
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
iRecord++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -726,6 +735,7 @@ namespace DAJYun.Application.TaskManagePlatDomain
|
|
|
|
|
|
|
|
|
|
#region 截止时间
|
|
|
|
|
|
|
|
|
|
iRecord = 0;
|
|
|
|
|
int cutIndx = 1;
|
|
|
|
|
//涉及项目 地点 截止日期/时间(当地) 具体要求
|
|
|
|
|
Dictionary<int, List<Tuple<int, string>>> readCutDict = new Dictionary<int, List<Tuple<int, string>>>();
|
|
|
|
@ -736,6 +746,13 @@ namespace DAJYun.Application.TaskManagePlatDomain
|
|
|
|
|
|
|
|
|
|
while (true)
|
|
|
|
|
{
|
|
|
|
|
if (iRecord >= 100)
|
|
|
|
|
{
|
|
|
|
|
_logger.LogInformation($"MBLNo={model.MBLNo} 处理【截止时间】异常,大于最大处理次数跳出");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
string regex = "(?<=" + name1.RegexSymbolFormat() + ").*(\\r\\n)";
|
|
|
|
|
var currLine = Regex.Match(originText, regex).Value;
|
|
|
|
|
|
|
|
|
@ -770,6 +787,7 @@ namespace DAJYun.Application.TaskManagePlatDomain
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cutIndx++;
|
|
|
|
|
iRecord++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -809,6 +827,7 @@ namespace DAJYun.Application.TaskManagePlatDomain
|
|
|
|
|
int maxCtnLine = Regex.Matches(originText, "[0-9]{2}'\\s{0,}X\\s{0,}[0-9]{1,}'\\s{0,}X\\s{0,}[0-9]{1,}'\\s{0,}").Count;
|
|
|
|
|
|
|
|
|
|
int ctnIndx = 1;
|
|
|
|
|
iRecord = 0;
|
|
|
|
|
|
|
|
|
|
List<int> noList = new List<int>();
|
|
|
|
|
|
|
|
|
@ -820,6 +839,12 @@ namespace DAJYun.Application.TaskManagePlatDomain
|
|
|
|
|
|
|
|
|
|
while (true)
|
|
|
|
|
{
|
|
|
|
|
if (iRecord >= 100)
|
|
|
|
|
{
|
|
|
|
|
_logger.LogInformation($"MBLNo={model.MBLNo} 处理【集装箱】异常,大于最大处理次数跳出");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
string regex = "(?<=" + name1.RegexSymbolFormat() + ").*(\\r\\n)";
|
|
|
|
|
|
|
|
|
|
var queryList = Regex.Matches(originText, regex);
|
|
|
|
@ -889,6 +914,7 @@ namespace DAJYun.Application.TaskManagePlatDomain
|
|
|
|
|
name1 = currLine;
|
|
|
|
|
|
|
|
|
|
ctnIndx++;
|
|
|
|
|
iRecord++;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|