修改MSK BA识别

DAJYunPlat/DAJYun.Application/TaskManagePlatDomain/TaskBookingAmendmentParserService.cs

@@ -918,12 +918,34 @@ namespace DAJYun.Application.TaskManagePlatDomain
                                             {
                                                 if (string.IsNullOrWhiteSpace(model.Vessel))
                                                 {
-                                                    model.Vessel = Regex.Replace(Regex.Replace(rowList[i].Field<string>(vesselCol.Name), "\\n", " "), "\\s{2}", " ");
+                                                    string currStr = rowList[i].Field<string>(vesselCol.Name);
+
+                                                    if (Regex.IsMatch(currStr, "\\n"))
+                                                    {
+                                                        var currSArg = Regex.Replace(currStr, "\\n", "#").Split(new char[] { '#' });
+
+                                                        model.Vessel = Regex.Replace(Regex.Replace(currSArg[0], "\\n", " "), "\\s{2}", " ");
+                                                    }
+                                                    else
+                                                    {
+                                                        model.Vessel = Regex.Replace(Regex.Replace(currStr, "\\n", " "), "\\s{2}", " ");
+                                                    }
                                                 }
                                             }
                                             else
                                             {
-                                                model.SecondVessel = Regex.Replace(Regex.Replace(rowList[i].Field<string>(vesselCol.Name), "\\n", " "), "\\s{2}", " ");
+                                                string currStr = rowList[i].Field<string>(vesselCol.Name);
+
+                                                if (Regex.IsMatch(currStr, "\\n"))
+                                                {
+                                                    var currSArg = Regex.Replace(currStr, "\\n", "#").Split(new char[] { '#' });
+
+                                                    model.SecondVessel = Regex.Replace(Regex.Replace(currSArg[1], "\\n", " "), "\\s{2}", " ");
+                                                }
+                                                else
+                                                {
+                                                    model.SecondVessel = Regex.Replace(Regex.Replace(currStr, "\\n", " "), "\\s{2}", " ");
+                                                }
                                             }
                                         }
 
@@ -937,12 +959,36 @@ namespace DAJYun.Application.TaskManagePlatDomain
                                             {
                                                 if (string.IsNullOrWhiteSpace(model.VoyNo))
                                                 {
-                                                    model.VoyNo = Regex.Replace(Regex.Replace(rowList[i].Field<string>(voyageCol.Name), "\\n", " "), "\\s{2}", " ");
+                                                    string currStr = rowList[i].Field<string>(voyageCol.Name);
+
+                                                    if (Regex.IsMatch(currStr, "\\n"))
+                                                    {
+                                                        var currSArg = Regex.Replace(currStr, "\\n", "#").Split(new char[] { '#' });
+
+                                                        model.VoyNo = Regex.Replace(Regex.Replace(currSArg[0], "\\n", " "), "\\s{2}", " ");
+                                                    }
+                                                    else
+                                                    {
+                                                        model.VoyNo = Regex.Replace(Regex.Replace(rowList[i].Field<string>(voyageCol.Name), "\\n", " "), "\\s{2}", " ");
+                                                    }
+                                                    
                                                 }
                                             }
                                             else
                                             {
-                                                model.SecondVoyno = Regex.Replace(Regex.Replace(rowList[i].Field<string>(voyageCol.Name), "\\n", " "), "\\s{2}", " ");
+                                                string currStr = rowList[i].Field<string>(voyageCol.Name);
+
+                                                if (Regex.IsMatch(currStr, "\\n"))
+                                                {
+                                                    var currSArg = Regex.Replace(currStr, "\\n", "#").Split(new char[] { '#' });
+
+                                                    model.SecondVoyno = Regex.Replace(Regex.Replace(currSArg[1], "\\n", " "), "\\s{2}", " ");
+                                                }
+                                                else
+                                                {
+                                                    model.SecondVoyno = Regex.Replace(Regex.Replace(rowList[i].Field<string>(voyageCol.Name), "\\n", " "), "\\s{2}", " ");
+                                                }
+                                                    
                                             }
                                         }