From d2ed5de9471029bda91c9b2164a2b8b3a3332726 Mon Sep 17 00:00:00 2001 From: wanghaomei Date: Thu, 13 Jul 2023 10:40:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A5=E8=B4=A7=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E5=BC=95=E5=85=A5=E6=9F=A5=E8=AF=A2=E5=88=AB?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E6=8D=AE=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 11e0d730..c95341d7 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -2510,6 +2510,7 @@ namespace Myshipping.Application { var list = await _repLetterYard.AsQueryable() .InnerJoin((ly, ord) => ly.BookingId == ord.Id) + .Where(ly => ly.CreatedUserId == UserManager.UserId) .WhereIF(!string.IsNullOrEmpty(input.MBLNO), (ly, ord) => ord.MBLNO.Contains(input.MBLNO)) .WhereIF(!string.IsNullOrEmpty(input.HBLNO), (ly, ord) => ord.HBLNO.Contains(input.HBLNO)) .WhereIF(!string.IsNullOrEmpty(input.BOOKINGNO), (ly, ord) => ord.BOOKINGNO.Contains(input.BOOKINGNO)) @@ -8056,7 +8057,8 @@ namespace Myshipping.Application { await _rep.AsUpdateable(order).IgnoreColumns().ExecuteCommandAsync(); await SendBookingOrder(new long[] { Id }); - if (!string.IsNullOrEmpty(order.VESSEL)&&!string.IsNullOrEmpty(order.VOYNO)) { + if (!string.IsNullOrEmpty(order.VESSEL) && !string.IsNullOrEmpty(order.VOYNO)) + { var orderlist = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.TenantId == UserManager.TENANT_ID && x.CARRIERID == order.CARRIERID && x.VESSEL == order.VESSEL && x.VOYNO == order.VOYNO && x.Id != order.Id) .WhereIF(!string.IsNullOrEmpty(order.VOYNOINNER), x => x.VOYNOINNER == order.VOYNOINNER).ToListAsync(); foreach (var i in orderlist) From 9e40c48ba02ef6c1d63a659f104f9ca76d2125f2 Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Thu, 13 Jul 2023 12:47:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=88=AA=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/DataSync/Dto/BookingOrderDto.cs | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs b/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs index 5262fd1e..3c187588 100644 --- a/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs +++ b/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs @@ -1,6 +1,7 @@ using Myshipping.Application.Entity; using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -803,8 +804,17 @@ namespace Myshipping.Application.Service.DataSync.Dto /// public BookingEDIExtDto BookingEDIExt { get; set; } + /// + /// 航线管理 + /// + [Description("航线管理")] + public string LineManage { get; set; } + + /// + /// 航线管理ID + /// + public string LineManageID { get; set; } - public List childrens { get; set; } @@ -1586,6 +1596,16 @@ namespace Myshipping.Application.Service.DataSync.Dto /// 三方付费Code /// public string ThirdPayCode { get; set; } + /// + /// 航线管理 + /// + [Description("航线管理")] + public string LineManage { get; set; } + + /// + /// 航线管理ID + /// + public string LineManageID { get; set; } }