diff --git a/Myshipping.Application/EDI/BookingHelper/ONESoApiHelper.cs b/Myshipping.Application/EDI/BookingHelper/ONESoApiHelper.cs index fc0dbb5f..a54e9e8f 100644 --- a/Myshipping.Application/EDI/BookingHelper/ONESoApiHelper.cs +++ b/Myshipping.Application/EDI/BookingHelper/ONESoApiHelper.cs @@ -202,7 +202,7 @@ namespace Myshipping.Application.EDI _ => throw Oops.Oh("暂不支持的货物类型") }, boxSize = mapCtn.MapCode, - quantity = ctn.KGS.Value, + quantity = ctn.CTNNUM.Value, }; postModel.boxInfos.Add(apiBox); } diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index c7e9a24d..5e6551da 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -5506,8 +5506,7 @@ namespace Myshipping.Application ChuanMing = order.VESSEL, HangCi = order.VOYNO, BeiZhu = order.CZRemark, - ZhuangHuoGang = order.PORTLOAD, - ZhuangHuoGangDaiMa = order.PORTLOADID, + YARD = mappingYard, ORDERNO = order.CUSTNO, VGMCLOSETIME = order.CLOSEVGMDATE, @@ -5527,6 +5526,22 @@ namespace Myshipping.Application SendFlag = true }).ToList() }; + string[] supportPortPassageArr = null; + var vgmSupportPortPassages = sysconfig.FirstOrDefault(x => x.GroupCode == "DJY_CONST" && x.Code == "VgmSupportPortPassages"); + if (!string.IsNullOrEmpty(vgmSupportPortPassages?.Value)) + { + supportPortPassageArr = vgmSupportPortPassages.Value.Split(','); + } + if (supportPortPassageArr != null && supportPortPassageArr.Length > 0 && supportPortPassageArr.Contains(order.PORTLOADID)) + { + sendObj.ZhuangHuoGang = order.PORTLOAD; + sendObj.ZhuangHuoGangDaiMa = order.PORTLOADID; + } + else + { + sendObj.ZhuangHuoGang = "OTHER"; + sendObj.ZhuangHuoGangDaiMa = "OTHER"; + } _logger.LogInformation($"调用VGM平台的发送接口:{urlConfig.Value},参数:{JsonConvert.SerializeObject(sendObj)}"); @@ -10908,7 +10923,7 @@ namespace Myshipping.Application /// /// [NonAction] - public async Task SendBookingOrder(long[] ids, BookingOrderSyncTypeEnum? syncTypeEnum = null,string oddCode = "") + public async Task SendBookingOrder(long[] ids, BookingOrderSyncTypeEnum? syncTypeEnum = null, string oddCode = "") { if (App.Configuration["RunType"] is CommonConst.RUN_TYPE_DJY) { @@ -11039,7 +11054,7 @@ namespace Myshipping.Application { List allOrderList = new List(); - if(!string.IsNullOrWhiteSpace(oddCode) && oddCode.Equals("SIReceipt",StringComparison.OrdinalIgnoreCase)) + if (!string.IsNullOrWhiteSpace(oddCode) && oddCode.Equals("SIReceipt", StringComparison.OrdinalIgnoreCase)) { allOrderList = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.Id && x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToListAsync();