Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -4906,7 +4906,7 @@ namespace Myshipping.Application
                     if (!string.IsNullOrEmpty(yardid))
                     {
                         ICell cell = row.GetCell(5);
-                        var yard = _cache.GetAllMappingYard().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == yardid).Select(x => x.MapCode).First();
+                        var yard = _cache.GetAllMappingYard().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == yardid).Select(x => x.MapCode).FirstOrDefault();
                         if (cell != null)
                         {
                             row.Cells[5].SetCellValue(yard);
@@ -5028,11 +5028,11 @@ namespace Myshipping.Application
                     ICell cell5 = row.GetCell(5);
                     if (cell5 != null)
                     {
-                        row.Cells[5].SetCellValue(_cache.GetAllMappingService().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == service).Select(x => x.MapCode).First());
+                        row.Cells[5].SetCellValue(_cache.GetAllMappingService().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == service).Select(x => x.MapCode).FirstOrDefault());
                     }
                     else
                     {
-                        row.CreateCell(5).SetCellValue(_cache.GetAllMappingService().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == service).Select(x => x.MapCode).First());
+                        row.CreateCell(5).SetCellValue(_cache.GetAllMappingService().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == service).Select(x => x.MapCode).FirstOrDefault());
                     }
 
 
@@ -5221,11 +5221,11 @@ namespace Myshipping.Application
                 {
                     //运费支付方式
 
-                    var BLFRTCode = _cache.GetAllCodeFrt().Result.Where(x => x.EnName == order.BLFRT).Select(x => x.Code).First();
+                    var BLFRTCode = _cache.GetAllCodeFrt().Result.Where(x => x.EnName == order.BLFRT).Select(x => x.Code).FirstOrDefault();
                     var bl = string.Empty;
                     if (!string.IsNullOrEmpty(BLFRTCode))
                     {
-                        bl = _cache.GetAllMappingFrt().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == BLFRTCode).Select(x => x.MapCode).First();
+                        bl = _cache.GetAllMappingFrt().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == BLFRTCode).Select(x => x.MapCode).FirstOrDefault();
                     }
                     ICell cell = row.GetCell(0);
                     if (cell != null)
@@ -5252,11 +5252,11 @@ namespace Myshipping.Application
                 }
                 if (i == 44)
                 {
-                    var BLFRTCode = _cache.GetAllCodeFrt().Result.Where(x => x.EnName == order.BLFRT).Select(x => x.Code).First();
+                    var BLFRTCode = _cache.GetAllCodeFrt().Result.Where(x => x.EnName == order.BLFRT).Select(x => x.Code).FirstOrDefault();
                     var bl = string.Empty;
                     if (!string.IsNullOrEmpty(BLFRTCode))
                     {
-                        bl = _cache.GetAllMappingFrt().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == BLFRTCode).Select(x => x.MapCode).First();
+                        bl = _cache.GetAllMappingFrt().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == BLFRTCode).Select(x => x.MapCode).FirstOrDefault();
                     }
                     if (bl == "预付")
                     {
@@ -5322,11 +5322,11 @@ namespace Myshipping.Application
                     ICell cell2 = row.GetCell(2);
                     if (cell2 != null)
                     {
-                        row.Cells[2].SetCellValue(order.TEMPSET);
+                        row.Cells[2].SetCellValue(order.REEFERF);
                     }
                     else
                     {
-                        row.CreateCell(2).SetCellValue(order.TEMPSET);
+                        row.CreateCell(2).SetCellValue(order.REEFERF);
                     }
 
 

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -2177,7 +2177,7 @@ namespace Myshipping.Application
         private async Task SyncVesselExcepAtOp(List<DjyVesselExceptDto> dto)
         {
             var tenantId = UserManager.TENANT_ID;
-            SpareTime.DoOnce(1000, (tmr, l) =>
+            SpareTime.DoOnce(60000, (tmr, l) =>
             {
                 try
                 {
@@ -2228,7 +2228,7 @@ namespace Myshipping.Application
                                 {
                                     var content = string.Join("\r\n", dic[k]);
                                     _logger.LogInformation($"准备发送船期通知给 {k}，内容：\r\n{content}");
-                                    //DingTalkGroupHelper.SendDingTalkGroupMessage("", "船期提醒", content, false, new string[] { k }, null);
+                                    DingTalkGroupHelper.SendDingTalkGroupMessage("hechuanVesselAtOpNotify", "船期提醒", content, false, new string[] { k }, null);
                                 }
                             });
                         }
@@ -2239,7 +2239,7 @@ namespace Myshipping.Application
                         {
                             var content = string.Join("\r\n", item.Value);
                             _logger.LogInformation($"准备发送船期通知给 {item.Key}，内容：\r\n{content}");
-                            //DingTalkGroupHelper.SendDingTalkGroupMessage("", "船期提醒", content, false, new string[] { item.Key }, null);
+                            DingTalkGroupHelper.SendDingTalkGroupMessage("hechuanVesselAtOpNotify", "船期提醒", content, false, new string[] { item.Key }, null);
                         }
                     }
                 }