修改CMA的BC

DAJYunPlat/DAJYun.Application/TaskManagePlatDomain/TaskBCCMAParserService.cs

@@ -1134,7 +1134,7 @@ namespace DAJYun.Application.TaskManagePlatDomain
                             {
                                 string name = Regex.Match(originText, "Customer\\s+Ref:", RegexOptions.IgnoreCase).Value;
 
-                                model.OriginalBookingNo = Regex.Match(originText, "(?<=" + name.RegexFormat() + ")\\s+\\w+(?=\\s)").Value?.Trim();
+                                model.OriginalBookingNo = Regex.Match(originText, "(?<=" + name.RegexFormat() + ")\\s+(\\w|\\-)+(?=\\s)").Value?.Trim();
                             }
                         }
 
@@ -1330,6 +1330,31 @@ namespace DAJYun.Application.TaskManagePlatDomain
                                     }
 
                                 }
+                                else if(Regex.IsMatch(originText, "Place\\s+Of\\s+Reciept:"))
+                                {
+                                    string name2 = Regex.Match(originText, "Place\\s+Of\\s+Reciept:").Value;
+
+                                    string voynoStr = Regex.Match(Regex.Replace(originText,"\\r\\n"," "), "(?<=" + name + ").*(?="+ name2 + ")").Value;
+
+                                    if(!string.IsNullOrWhiteSpace(voynoStr))
+                                    {
+                                        voynoStr = Regex.Replace(voynoStr, "\\s{2,}", " ");
+
+                                    }
+                                    var currSplitArg = voynoStr.Split(new char[] { '/' });
+
+                                    model.Vessel = currSplitArg[0]?.Trim();
+
+                                    if (currSplitArg.Length == 3)
+                                    {
+                                        model.CarrierVoyNo = currSplitArg[1]?.Trim();
+                                        model.VoyNo = currSplitArg[2]?.Trim();
+                                    }
+                                    else
+                                    {
+                                        model.CarrierVoyNo = currSplitArg[1]?.Trim();
+                                    }
+                                }
                                 else
                                 {
                                     var currSplitArg = currS.Split(new char[] { '/' });