ccto

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -7982,6 +7982,7 @@ namespace Myshipping.Application
                                     SendTo = dto.SendTo,
                                     Title = dto.Title,
                                     Body = dto.Body,
+                                    CCTo= dto.CCTo,
                                     SmtpConfig = "",
                                     Account=userMail.MailAccount,
                                     Password=userMail.Password,
@@ -10405,7 +10406,7 @@ namespace Myshipping.Application
                     }
 
                     //提箱返场
-                    var statusloglist = _repStatuslog.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id && x.IsDeleted == false).ToList();
+                    var statusloglist = _repStatuslog.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id && x.IsDeleted == false && x.Category == "yunzong").ToList();
                     var statuslogId = statusloglist.Select(x => x.Id).ToList();
                     //运踪状态详情
                     var statuslogdetaillist = _statuslogdetail.AsQueryable().Where(x => statuslogId.Contains(x.PId)).ToList();
@@ -11606,7 +11607,7 @@ namespace Myshipping.Application
 
             _logger.LogInformation("批次={no}提取订单信息完成", batchNo);
 
-            if (!order.CARRIERID.Equals("VOL", StringComparison.OrdinalIgnoreCase) && !order.CARRIERID.Equals("FCS", StringComparison.OrdinalIgnoreCase) 
+            if (!order.CARRIERID.Equals("VOL", StringComparison.OrdinalIgnoreCase) && !order.CARRIERID.Equals("FCS", StringComparison.OrdinalIgnoreCase)
                 && !order.CARRIERID.Equals("SLS", StringComparison.OrdinalIgnoreCase))
             {
                 throw Oops.Bah("当前订单的船公司不是VOL(沃尔塔航运)不能发送VOLTA截单EDI");
@@ -11682,9 +11683,9 @@ namespace Myshipping.Application
 
                         if (!string.IsNullOrWhiteSpace(order.BLFRT))
                         {
-                            var currFrtInfo = ediFrtList.FirstOrDefault(t => t.Code.Equals(baseFrtInfo.Code, StringComparison.OrdinalIgnoreCase));  
+                            var currFrtInfo = ediFrtList.FirstOrDefault(t => t.Code.Equals(baseFrtInfo.Code, StringComparison.OrdinalIgnoreCase));
 
-                            if(currFrtInfo != null)
+                            if (currFrtInfo != null)
                             {
                                 voltaModel.BLFRT = currFrtInfo.MapCode?.Trim();
                             }
@@ -11723,7 +11724,7 @@ namespace Myshipping.Application
                         {
                             s2 = voltaModel.HSCode.Substring(4, 2);
                         }
-                            
+
                         if (voltaModel.HSCode.Length >= 8)
                         {
                             s3 = voltaModel.HSCode.Substring(6, 2);
@@ -11744,7 +11745,7 @@ namespace Myshipping.Application
                 }
             }
 
-            
+
             //还需要翻译箱明细的包装
             if (voltaModel.ContaList != null && voltaModel.ContaList.Count > 0)
             {
@@ -11798,7 +11799,7 @@ namespace Myshipping.Application
                                 x.EdiPkgs = ediPkgs.MapCode?.Trim();
                             }
 
-                            if(!string.IsNullOrWhiteSpace(x.CtnType))
+                            if (!string.IsNullOrWhiteSpace(x.CtnType))
                             {
                                 var ediCtn = seaLeadediCTNList.FirstOrDefault(t => t.Code.Equals(x.CtnType, StringComparison.OrdinalIgnoreCase));
 
@@ -11808,7 +11809,7 @@ namespace Myshipping.Application
 
                                     x.CtnType = string.Empty;
                                 }
-                                   
+
 
                                 if (ediCtn != null)
                                 {
@@ -11820,7 +11821,7 @@ namespace Myshipping.Application
                                 pkgsBuilder.AppendLine($"集装箱型未填写");
 
                                 x.CtnType = string.Empty;
-                            } 
+                            }
 
                             x.WTUnit = "KG";
                         }
@@ -11841,7 +11842,7 @@ namespace Myshipping.Application
                     if (string.IsNullOrWhiteSpace(x.EdiPkgs))
                         x.EdiPkgs = string.Empty;
 
-                    
+
 
                     startNo++;
                 });