jianghaiqing 2 weeks ago
commit 554d4cdcbf

@ -202,7 +202,7 @@ namespace Myshipping.Application.EDI
_ => throw Oops.Oh("暂不支持的货物类型") _ => throw Oops.Oh("暂不支持的货物类型")
}, },
boxSize = mapCtn.MapCode, boxSize = mapCtn.MapCode,
quantity = ctn.KGS.Value, quantity = ctn.CTNNUM.Value,
}; };
postModel.boxInfos.Add(apiBox); postModel.boxInfos.Add(apiBox);
} }

@ -5506,8 +5506,7 @@ namespace Myshipping.Application
ChuanMing = order.VESSEL, ChuanMing = order.VESSEL,
HangCi = order.VOYNO, HangCi = order.VOYNO,
BeiZhu = order.CZRemark, BeiZhu = order.CZRemark,
ZhuangHuoGang = order.PORTLOAD,
ZhuangHuoGangDaiMa = order.PORTLOADID,
YARD = mappingYard, YARD = mappingYard,
ORDERNO = order.CUSTNO, ORDERNO = order.CUSTNO,
VGMCLOSETIME = order.CLOSEVGMDATE, VGMCLOSETIME = order.CLOSEVGMDATE,
@ -5527,6 +5526,22 @@ namespace Myshipping.Application
SendFlag = true SendFlag = true
}).ToList() }).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)}"); _logger.LogInformation($"调用VGM平台的发送接口{urlConfig.Value},参数:{JsonConvert.SerializeObject(sendObj)}");
@ -10908,7 +10923,7 @@ namespace Myshipping.Application
/// <param name="syncTypeEnum"></param> /// <param name="syncTypeEnum"></param>
/// <returns></returns> /// <returns></returns>
[NonAction] [NonAction]
public async Task<dynamic> SendBookingOrder(long[] ids, BookingOrderSyncTypeEnum? syncTypeEnum = null,string oddCode = "") public async Task<dynamic> SendBookingOrder(long[] ids, BookingOrderSyncTypeEnum? syncTypeEnum = null, string oddCode = "")
{ {
if (App.Configuration["RunType"] is CommonConst.RUN_TYPE_DJY) if (App.Configuration["RunType"] is CommonConst.RUN_TYPE_DJY)
{ {
@ -11039,7 +11054,7 @@ namespace Myshipping.Application
{ {
List<BookingOrder> allOrderList = new List<BookingOrder>(); List<BookingOrder> allOrderList = new List<BookingOrder>();
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 allOrderList = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.Id
&& x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToListAsync(); && x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToListAsync();

Loading…
Cancel
Save