diff --git a/ds-wms-service/DS.WMS.Core/Map/Method/MappingIssueTypeService.cs b/ds-wms-service/DS.WMS.Core/Map/Method/MappingIssueTypeService.cs index 4d3eb821..28528c21 100644 --- a/ds-wms-service/DS.WMS.Core/Map/Method/MappingIssueTypeService.cs +++ b/ds-wms-service/DS.WMS.Core/Map/Method/MappingIssueTypeService.cs @@ -43,6 +43,7 @@ namespace DS.WMS.Core.Map.Method db = _serviceProvider.GetRequiredService(); user = _serviceProvider.GetRequiredService(); saasService = _serviceProvider.GetRequiredService(); + _sysCacheService = _serviceProvider.GetRequiredService(); } public DataResult BatchDelMappingIssueType(IdModel req) { diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs index 5a183e37..b3c06df5 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs @@ -1603,7 +1603,7 @@ namespace DS.WMS.Core.Op.Method ediModel.BSLIST.Add(primaryModel); - var result = await InnerSendBookingOrClosingEDI(req, ediModel, ediRouteEnum); + var result = await InnerSendBookingOrClosingEDI(req, ediModel, ediRouteEnum, order.CarrierId); _logger.Info("批次={no} 生成EDI文件完成 结果={result}", batchNo, JsonConvert.SerializeObject(result)); @@ -2148,7 +2148,7 @@ namespace DS.WMS.Core.Op.Method /// /// /// - private async Task InnerSendBookingOrClosingEDI(BookingOrClosingEDIOrderReq req, EDIBaseModel ediModel, EDIRouteEnum ediRouteEnum) + private async Task InnerSendBookingOrClosingEDI(BookingOrClosingEDIOrderReq req, EDIBaseModel ediModel, EDIRouteEnum ediRouteEnum,long carrierId) { var result = new EdiDataResult(); var tenantDb = saasService.GetBizDbScopeById(user.TenantId); @@ -2331,7 +2331,7 @@ namespace DS.WMS.Core.Op.Method { //这里INTTRA单独取了船公司 var ediSOSICfg = tenantDb.Queryable().First(t => t.Module.Equals(CONST_MAPPING_MODULE_INTTRA, StringComparison.OrdinalIgnoreCase) - && t.Code == ediModel.BSLIST.FirstOrDefault().CARRIERID); + && t.LinkId == carrierId); if (ediSOSICfg == null || string.IsNullOrWhiteSpace(ediSOSICfg.MapCode)) throw new Exception($"CARRIERID={ediModel.BSLIST.FirstOrDefault().CARRIERID} INTTRA EDI订舱和截单 的船公司EDI代码未找到");