From dd13dfc06e63730f1403eb4912b8d25ed047b70e Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Tue, 4 Jul 2023 08:55:48 +0800 Subject: [PATCH] 1 --- .../Service/BookingOrder/BookingOrderService.cs | 2 +- .../Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index c209a130..0deddb7a 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -2705,7 +2705,7 @@ namespace Myshipping.Application #region 入港时间 if (item.Status == "入港") { - var order = _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.BookingId).ToList().FirstOrDefault(); + var order = _rep.AsQueryable().Filter(null, true).First(x => x.Id == item.BookingId); var goodconfig = _goodsStatusConfig.AsQueryable().Filter(null, true).Where(x => x.CreatedUserId == order.CreatedUserId && x.SystemCode == "YRG").ToList().FirstOrDefault(); if (goodconfig == null) { diff --git a/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs b/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs index 051cfd44..1337b9a7 100644 --- a/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs +++ b/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs @@ -160,6 +160,7 @@ namespace Myshipping.Application { entity.CARRIER = _cache.GetAllCodeCarrier().Result.Where(x => x.Code == entity.CARRIERID).Select(x => x.EdiCode).FirstOrDefault(); } + if (entity.CARGOID != "D") {