From 104bd8efb85168468e89e094b19f1657efb11ca8 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 25 Apr 2023 17:25:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E5=8D=95?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingTruck/BookingTruckService.cs | 2 +- Myshipping.Core/Myshipping.Core.xml | 10 ++++++++++ .../Service/CommonDB/Dto/CodeIssueTypeDto.cs | 10 ++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs b/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs index cec9e7ce..18b83180 100644 --- a/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs +++ b/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs @@ -1751,7 +1751,7 @@ namespace Myshipping.Application try { var ftpSpiderUrl = _cache.GetAllDictData().GetAwaiter().GetResult() - .FirstOrDefault(x => x.TypeCode == "url_set" && x.Code == "booking_truck_sync_mq_server")?.Value; + .FirstOrDefault(x => x.TypeCode == "url_set" && x.Code == "BookingOrderMQUri")?.Value; if (ftpSpiderUrl == null) throw Oops.Bah("字典未配置 url_set->booking_edi_ftp_server 请联系管理员"); diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index a66e5950..70753cc8 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -8297,6 +8297,16 @@ 排序 + + + 船司代码 + + + + + 映射代码 + + 航线 diff --git a/Myshipping.Core/Service/CommonDB/Dto/CodeIssueTypeDto.cs b/Myshipping.Core/Service/CommonDB/Dto/CodeIssueTypeDto.cs index 056615ba..ca094a5a 100644 --- a/Myshipping.Core/Service/CommonDB/Dto/CodeIssueTypeDto.cs +++ b/Myshipping.Core/Service/CommonDB/Dto/CodeIssueTypeDto.cs @@ -71,5 +71,15 @@ namespace Myshipping.Core.Service.CommonDB.Dto /// 排序 /// public int Sort { get; set; } + + /// + /// 船司代码 + /// + public string CarrierCode { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } } } From 139a771d89048f2bef49727466286c4221c4881a Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 25 Apr 2023 17:49:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E8=88=B1EDI?= =?UTF-8?q?=E7=9A=84=E7=AD=BE=E5=8D=95=E6=96=B9=E5=BC=8F=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index d7f5a52b..8d93c3f9 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -3986,7 +3986,7 @@ namespace Myshipping.Application if (baseServiceInfo == null) throw Oops.Bah($"运输条款{order.SERVICE}的基础代码未找到"); - //付费方式映射 + //运输条款映射 var ediServiceList = _cache.GetAllMappingService().GetAwaiter().GetResult() .Where(t => t.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase) && !string.IsNullOrWhiteSpace(t.CarrierCode) && t.CarrierCode.Equals(order.CARRIERID, StringComparison.OrdinalIgnoreCase) @@ -4008,10 +4008,10 @@ namespace Myshipping.Application var baseIssueTypeInfo = baseIssueTypeList.FirstOrDefault(t => t.EnName.Equals(order.ISSUETYPE, StringComparison.OrdinalIgnoreCase)); - if (baseServiceInfo == null) + if (baseIssueTypeInfo == null) throw Oops.Bah($"签单方式{order.ISSUETYPE}的基础代码未找到"); - //付费方式映射 + //签单方式映射 var ediIssueTypeList = _cache.GetAllMappingIssueType().GetAwaiter().GetResult() .Where(t => t.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase) ).ToList(); @@ -4020,18 +4020,18 @@ namespace Myshipping.Application { var currIssueTypeInfo = ediIssueTypeList.FirstOrDefault(t => !string.IsNullOrWhiteSpace(t.CarrierCode) && t.CarrierCode.Equals(order.CARRIERID, StringComparison.OrdinalIgnoreCase) - && t.Code.Equals(baseServiceInfo.Code, StringComparison.OrdinalIgnoreCase)); + && t.Code.Equals(baseIssueTypeInfo.Code, StringComparison.OrdinalIgnoreCase)); if (currIssueTypeInfo == null) { //如果没有对应的船司记录，则取默认的第一个代码对应的记录 - currIssueTypeInfo = ediIssueTypeList.FirstOrDefault(t => t.Code.Equals(baseServiceInfo.Code, StringComparison.OrdinalIgnoreCase)); + currIssueTypeInfo = ediIssueTypeList.FirstOrDefault(t => t.Code.Equals(baseIssueTypeInfo.Code, StringComparison.OrdinalIgnoreCase)); } if (currIssueTypeInfo == null) throw Oops.Bah($"签单方式{order.ISSUETYPE}的EDI代码未找到"); - primaryModel.ISSUETYPE = currIssueTypeInfo.MapCode?.Trim(); + primaryModel.ISSUETYPE = currIssueTypeInfo.MapCode?.Trim().ToUpper(); } primaryModel.CARRIEREDICODE = ediSOSICfg.MapCode;