From e3e1b2a93709fb16eb676ac6d4d902fee34e1b58 Mon Sep 17 00:00:00 2001 From: wanghaomei Date: Wed, 7 Jun 2023 16:12:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=92=89=E9=92=89@=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Myshipping.Application/Service/DataSync/DataSyncService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Service/DataSync/DataSyncService.cs b/Myshipping.Application/Service/DataSync/DataSyncService.cs index 8da51341..ad27b372 100644 --- a/Myshipping.Application/Service/DataSync/DataSyncService.cs +++ b/Myshipping.Application/Service/DataSync/DataSyncService.cs @@ -2177,7 +2177,7 @@ namespace Myshipping.Application private async Task SyncVesselExcepAtOp(List 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); } } } From f82e34f06b064c2fbba9f8c299709379b9e5ffd5 Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Wed, 7 Jun 2023 17:36:17 +0800 Subject: [PATCH 2/3] 1 --- .../Service/BookingOrder/BookingOrderService.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 97d56293..33374a53 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/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 == "预付") { From 5612b8237dee9ab450a2dd697d2ae9e0e9aaeca6 Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Wed, 7 Jun 2023 17:51:33 +0800 Subject: [PATCH 3/3] 1 --- .../Service/BookingOrder/BookingOrderService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 33374a53..6b789997 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -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); }