From 5fb5b518fb764e7a39793dc517badba37f10d4ec Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Fri, 25 Nov 2022 09:28:56 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Myshipping.Core/Job/LogJobWorker.cs | 2 +- Myshipping.Core/Myshipping.Core.xml | 2 +- Myshipping.Core/Service/Timer/SysTimerService.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Myshipping.Core/Job/LogJobWorker.cs b/Myshipping.Core/Job/LogJobWorker.cs index 2e07f3a7..fb62262c 100644 --- a/Myshipping.Core/Job/LogJobWorker.cs +++ b/Myshipping.Core/Job/LogJobWorker.cs @@ -261,7 +261,7 @@ public class LogJobWorker : ISpareTimeWorker, IDynamicApiController, ITransient /// [SpareTime(120000, "TemporaryDocuments", Description = "后台批量删除临时文件，配置项参数：{\"quantity\": 2}，不填默认为2", DoOnce = false, StartNow = true, ExecuteType = SpareTimeExecuteTypes.Serial)] - public void TemporaryDocuments() + public void TemporaryDocuments(SpareTimer timer, long count) { var opt = App.GetOptions(); var dirAbs = opt.Path; diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index 574f5cf6..c20350fd 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -5231,7 +5231,7 @@ - + 后台批量删除临时文件 diff --git a/Myshipping.Core/Service/Timer/SysTimerService.cs b/Myshipping.Core/Service/Timer/SysTimerService.cs index e3ad64bc..b80344ca 100644 --- a/Myshipping.Core/Service/Timer/SysTimerService.cs +++ b/Myshipping.Core/Service/Timer/SysTimerService.cs @@ -297,7 +297,7 @@ public class SysTimerService : ISysTimerService, IDynamicApiController, IScoped if (taskMethods != null) return taskMethods; // 获取所有本地任务方法，必须有spareTimeAttribute特性 - taskMethods = App.EffectiveTypes + taskMethods = App.EffectiveTypes .Where(u => u.IsClass && !u.IsInterface && !u.IsAbstract && typeof(ISpareTimeWorker).IsAssignableFrom(u)) .SelectMany(u => u.GetMethods(BindingFlags.Public | BindingFlags.Instance) .Where(m => m.IsDefined(typeof(SpareTimeAttribute), false) && From 86c5157abe4f178e4286addfcb570d89f208db25 Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Fri, 25 Nov 2022 10:09:04 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=BA=93=E5=8E=BB?= =?UTF-8?q?=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/CommonDB/CommonDBService.cs | 128 +++++++++++++++++- 1 file changed, 127 insertions(+), 1 deletion(-) diff --git a/Myshipping.Core/Service/CommonDB/CommonDBService.cs b/Myshipping.Core/Service/CommonDB/CommonDBService.cs index bf8b567d..450ad907 100644 --- a/Myshipping.Core/Service/CommonDB/CommonDBService.cs +++ b/Myshipping.Core/Service/CommonDB/CommonDBService.cs @@ -20,7 +20,7 @@ namespace Myshipping.Core.Service; [ApiDescriptionSettings(Name = "CommonDB", Order = 1000)] public class CommonDBService : ICommonDBService, IDynamicApiController, ITransient { - + #region private readonly SqlSugarRepository _codeCarrierRep; private readonly SqlSugarRepository _mappingCarrierRep; private readonly SqlSugarRepository _codeVesselRep; @@ -94,6 +94,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie } + #endregion #region 船公司 /// @@ -117,6 +118,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addcarrier")] public async Task AddCarrier([FromBody] CodeCarrierDto dto) { + var list = await _sysCacheService.GetAllCodeCarrier(); + var count = list.Where(x => x.Code == dto.Code).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); entity.CreateTime = DateTime.Now; @@ -153,6 +160,11 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addorupdatemappingcarrier")] public async Task AddOrUpdateMappingCarrier([FromBody] MappingCarrierDto dto) { + var list = await _sysCacheService.GetAllMappingCarrier(); + var count = list.Where(x => x.Module == dto.Module && x.Code == dto.Code ).Count(); + if (count>0) { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { @@ -200,6 +212,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addvessel")] public async Task AddVessel([FromBody] CodeVesselDto dto) { + var list = await _sysCacheService.GetAllCodeVessel(); + var count = list.Where(x => x.Name.Trim() == dto.Name.Trim()).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); entity.CreateTime = DateTime.Now; @@ -235,6 +253,16 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addorupdatevessel")] public async Task AddOrUpdateMappingVessel([FromBody] MappingVesselDto dto) { + + + var list = await _sysCacheService.GetAllMappingVessel(); + var count = list.Where(x => x.Name.Trim() == dto.Name.Trim()&&x.Module==dto.Module).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } + + var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { @@ -276,6 +304,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addforwarder")] public async Task AddForwarder([FromBody] CodeForwarderDto dto) { + var list = await _sysCacheService.GetAllCodeForwarder(); + var count = list.Where(x => x.Code == dto.Code).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); entity.CreateTime = DateTime.Now; @@ -306,6 +340,13 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addyard")] public async Task AddYard([FromBody] CodeYardDto dto) { + + var list = await _sysCacheService.GetAllCodeYard(); + var count = list.Where(x => x.Code == dto.Code).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); entity.CreateTime = DateTime.Now; @@ -344,6 +385,13 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addorupdatemappingyard")] public async Task AddOrUpdateMappingYard([FromBody] MappingYardDto dto) { + + var list = await _sysCacheService.GetAllMappingYard(); + var count = list.Where(x => x.Code == dto.Code&&x.Module==dto.Module).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { @@ -388,6 +436,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addportload")] public async Task AddPortload([FromBody] CodePortLoadDto dto) { + var list = await _sysCacheService.GetAllCodePortLoad(); + var count = list.Where(x => x.Code == dto.Code ).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); entity.CreateTime = DateTime.Now; @@ -427,6 +481,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addorupdatemappingportload")] public async Task AddOrUpdatePortload([FromBody] MappingPortLoadDto dto) { + var list = await _sysCacheService.GetAllMappingPortLoad(); + var count = list.Where(x => x.Code == dto.Code&&x.Module==dto.Module).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { @@ -472,6 +532,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addport")] public async Task AddPort([FromBody] CodePortDto dto) { + var list = await _sysCacheService.GetAllCodePort(); + var count = list.Where(x => x.Code == dto.Code ).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); entity.CreateTime = DateTime.Now; @@ -510,6 +576,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addorupdatemappingport")] public async Task AddOrUpdatePort([FromBody] MappingPortDto dto) { + var list = await _sysCacheService.GetAllMappingPort(); + var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { @@ -550,6 +622,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addpackage")] public async Task AddPackage([FromBody] CodePackageDto dto) { + var list = await _sysCacheService.GetAllCodePackage(); + var count = list.Where(x => x.Code == dto.Code ).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); await _codePackageRep.InsertAsync(entity); @@ -588,6 +666,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addorupdatemappingpackage")] public async Task AddOrUpdateMappingPackage([FromBody] MappingPackageDto dto) { + var list = await _sysCacheService.GetAllMappingPackage(); + var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { @@ -629,6 +713,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addservice")] public async Task AddService([FromBody] CodeServiceDto dto) { + var list = await _sysCacheService.GetAllCodeService(); + var count = list.Where(x => x.Code == dto.Code ).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); entity.CreateTime = DateTime.Now; @@ -668,6 +758,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addorupdatemappingservice")] public async Task AddOrUpdateMappingService([FromBody] MappingServiceDto dto) { + var list = await _sysCacheService.GetAllMappingService(); + var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { @@ -711,6 +807,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addctn")] public async Task AddCtn([FromBody] CodeCtnDto dto) { + var list = await _sysCacheService.GetAllCodeCtn(); + var count = list.Where(x => x.Code == dto.Code ).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); entity.CreateTime = DateTime.Now; entity.CreateUser = UserManager.DjyUserId; @@ -750,6 +852,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addmappingctn")] public async Task AddOrUpdateMappingCtn([FromBody] MappingCtnDto dto) { + var list = await _sysCacheService.GetAllMappingCtn(); + var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { @@ -795,6 +903,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addfrt")] public async Task AddFrt([FromBody] CodeFrtDto dto) { + var list = await _sysCacheService.GetAllCodeFrt(); + var count = list.Where(x => x.Code == dto.Code ).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); entity.CreateTime = DateTime.Now; @@ -830,6 +944,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addmappingfrt")] public async Task AddOrUpdateMappingFrt([FromBody] MappingFrtDto dto) { + var list = await _sysCacheService.GetAllMappingFrt(); + var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { @@ -871,6 +991,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie [HttpPost("/commondb/addcodeissuetype")] public async Task AddCodeIssueType([FromBody] CodeIssueTypeDto dto) { + var list = await _sysCacheService.GetAllCodeIssueType(); + var count = list.Where(x => x.Code == dto.Code ).Count(); + if (count > 0) + { + throw Oops.Bah(ErrorCode.D1006); + } var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); entity.CreateTime = DateTime.Now; From a1851f53a10c88811c003740835061f3eb35718a Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Fri, 25 Nov 2022 10:15:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=BA=93=E5=8E=BB?= =?UTF-8?q?=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/CommonDB/CommonDBService.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Myshipping.Core/Service/CommonDB/CommonDBService.cs b/Myshipping.Core/Service/CommonDB/CommonDBService.cs index 450ad907..2091b784 100644 --- a/Myshipping.Core/Service/CommonDB/CommonDBService.cs +++ b/Myshipping.Core/Service/CommonDB/CommonDBService.cs @@ -161,7 +161,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie public async Task AddOrUpdateMappingCarrier([FromBody] MappingCarrierDto dto) { var list = await _sysCacheService.GetAllMappingCarrier(); - var count = list.Where(x => x.Module == dto.Module && x.Code == dto.Code ).Count(); + var count = list.Where(x => x.Module == dto.Module && x.Code == dto.Code && x.GID != dto.GID).Count(); if (count>0) { throw Oops.Bah(ErrorCode.D1006); } @@ -256,7 +256,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie var list = await _sysCacheService.GetAllMappingVessel(); - var count = list.Where(x => x.Name.Trim() == dto.Name.Trim()&&x.Module==dto.Module).Count(); + var count = list.Where(x => x.Name.Trim() == dto.Name.Trim()&&x.Module==dto.Module && x.GID != dto.GID).Count(); if (count > 0) { throw Oops.Bah(ErrorCode.D1006); @@ -387,7 +387,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie { var list = await _sysCacheService.GetAllMappingYard(); - var count = list.Where(x => x.Code == dto.Code&&x.Module==dto.Module).Count(); + var count = list.Where(x => x.Code == dto.Code&&x.Module==dto.Module && x.GID != dto.GID).Count(); if (count > 0) { throw Oops.Bah(ErrorCode.D1006); @@ -482,7 +482,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie public async Task AddOrUpdatePortload([FromBody] MappingPortLoadDto dto) { var list = await _sysCacheService.GetAllMappingPortLoad(); - var count = list.Where(x => x.Code == dto.Code&&x.Module==dto.Module).Count(); + var count = list.Where(x => x.Code == dto.Code&&x.Module==dto.Module && x.GID != dto.GID).Count(); if (count > 0) { throw Oops.Bah(ErrorCode.D1006); @@ -577,7 +577,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie public async Task AddOrUpdatePort([FromBody] MappingPortDto dto) { var list = await _sysCacheService.GetAllMappingPort(); - var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count(); + var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module && x.GID != dto.GID).Count(); if (count > 0) { throw Oops.Bah(ErrorCode.D1006); @@ -667,7 +667,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie public async Task AddOrUpdateMappingPackage([FromBody] MappingPackageDto dto) { var list = await _sysCacheService.GetAllMappingPackage(); - var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count(); + var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module && x.GID != dto.GID).Count(); if (count > 0) { throw Oops.Bah(ErrorCode.D1006); @@ -759,7 +759,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie public async Task AddOrUpdateMappingService([FromBody] MappingServiceDto dto) { var list = await _sysCacheService.GetAllMappingService(); - var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count(); + var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module && x.GID != dto.GID).Count(); if (count > 0) { throw Oops.Bah(ErrorCode.D1006); @@ -853,7 +853,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie public async Task AddOrUpdateMappingCtn([FromBody] MappingCtnDto dto) { var list = await _sysCacheService.GetAllMappingCtn(); - var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count(); + var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module && x.GID != dto.GID).Count(); if (count > 0) { throw Oops.Bah(ErrorCode.D1006); @@ -945,7 +945,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie public async Task AddOrUpdateMappingFrt([FromBody] MappingFrtDto dto) { var list = await _sysCacheService.GetAllMappingFrt(); - var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count(); + var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module&&x.GID!=dto.GID).Count(); if (count > 0) { throw Oops.Bah(ErrorCode.D1006); From 4d0e48e3eee396fb1095daa08ca9f3345106703e Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 25 Nov 2022 10:31:22 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9EDI=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Myshipping.Application/Entity/BookingEDIExt.cs | 4 ++-- Myshipping.Application/Myshipping.Application.xml | 8 ++++---- .../Service/BookingOrder/Dto/BookingEDIExtDto.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Myshipping.Application/Entity/BookingEDIExt.cs b/Myshipping.Application/Entity/BookingEDIExt.cs index b19ed11b..ccdc178d 100644 --- a/Myshipping.Application/Entity/BookingEDIExt.cs +++ b/Myshipping.Application/Entity/BookingEDIExt.cs @@ -103,11 +103,11 @@ namespace Myshipping.Application.Entity public string OpEmail { get; set; } /// - /// ACI HBL O(加拿大) + /// ACI HBL /// public string ACIHBL { get; set; } /// - /// S0C C0C O(加拿大) + /// S0C C0C /// public string S0CC0C { get; set; } diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml index f98b88b1..49cb31f3 100644 --- a/Myshipping.Application/Myshipping.Application.xml +++ b/Myshipping.Application/Myshipping.Application.xml @@ -2342,12 +2342,12 @@ - ACI HBL O(加拿大) + ACI HBL - S0C C0C O(加拿大) + S0C C0C @@ -5145,12 +5145,12 @@ - ACI HBL O(加拿大) + ACI HBL - S0C C0C O(加拿大) + S0C C0C diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIExtDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIExtDto.cs index fe1c6347..6be4a2cc 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIExtDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIExtDto.cs @@ -97,11 +97,11 @@ namespace Myshipping.Application public string OpEmail { get; set; } /// - /// ACI HBL O(加拿大) + /// ACI HBL /// public string ACIHBL { get; set; } /// - /// S0C C0C O(加拿大) + /// S0C C0C /// public string S0CC0C { get; set; } From c100369d0867b57cfbe0cd1cf3dd0433dcff4626 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 25 Nov 2022 11:19:34 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9EDI=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=9B=B4=E6=96=B0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 1a9b7fc7..2af0b05b 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -460,7 +460,7 @@ namespace Myshipping.Application if (input.BookingEDIExt != null) { //检索EDI扩展 - var ediExtEntity = await _bookingEDIExt.FirstOrDefaultAsync(u => u.BookingId == input.Id); + var ediExtEntity = _bookingEDIExt.FirstOrDefault(u => u.BookingId == input.Id); if (ediExtEntity == null) { From 08c2eea3be4f4517071ee26000f04b2061238e32 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 25 Nov 2022 11:56:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E8=88=B1EDI?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E6=9B=B4=E6=96=B0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 2af0b05b..4d0e6490 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -480,7 +480,11 @@ namespace Myshipping.Application await _bookingEDIExt.AsUpdateable(currEdiExtEntity).IgnoreColumns(it => new { - it.BookingId + it.BookingId, + it.TenantId, + it.CreatedTime, + it.CreatedUserId, + it.CreatedUserName }).ExecuteCommandAsync(); } } @@ -596,7 +600,7 @@ namespace Myshipping.Application } //检索EDI扩展 - var ediExtEntity = await _bookingEDIExt.FirstOrDefaultAsync(u => u.BookingId == Id); + var ediExtEntity = _bookingEDIExt.FirstOrDefault(u => u.BookingId == Id); if (ediExtEntity != null) {