|
|
|
@ -1618,20 +1618,21 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
return t;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
List<long> tslist = new List<long>();
|
|
|
|
|
tslist.Add((long)input.BookingId);
|
|
|
|
|
var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault();
|
|
|
|
|
if (!string.IsNullOrEmpty(itemcode))
|
|
|
|
|
{
|
|
|
|
|
if (itemcode == "true")
|
|
|
|
|
await SendBookingOrder(tslist.ToArray());
|
|
|
|
|
_logger.LogInformation(input.BookingId + "货物状态推送成功!");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<long> tslist = new List<long>();
|
|
|
|
|
tslist.Add((long)input.BookingId);
|
|
|
|
|
var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault();
|
|
|
|
|
if (!string.IsNullOrEmpty(itemcode))
|
|
|
|
|
{
|
|
|
|
|
if (itemcode == "true")
|
|
|
|
|
await SendBookingOrder(tslist.ToArray());
|
|
|
|
|
_logger.LogInformation(input.BookingId + "货物状态推送成功!");
|
|
|
|
|
}
|
|
|
|
|
return t;
|
|
|
|
|
}
|
|
|
|
|
return null;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -2705,7 +2706,7 @@ namespace Myshipping.Application
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (name.Split('.')[0].ToLower() == "order" && name.Split('.')[1].ToLower() == "_pkgs" && _name== "pkgs")
|
|
|
|
|
if (name.Split('.')[0].ToLower() == "order" && name.Split('.')[1].ToLower() == "_pkgs" && _name == "pkgs")
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
ICell cell = row.GetCell(_cellNum - 1);
|
|
|
|
@ -4292,7 +4293,7 @@ namespace Myshipping.Application
|
|
|
|
|
//这里除了TSL,订舱编号默认都对应到业务编号(订舱保存时自动生成)
|
|
|
|
|
if (ediRouteEnum == EDIRouteEnum.TSL)
|
|
|
|
|
{
|
|
|
|
|
if(string.IsNullOrWhiteSpace(order.CUSTNO))
|
|
|
|
|
if (string.IsNullOrWhiteSpace(order.CUSTNO))
|
|
|
|
|
throw Oops.Bah($"船公司是{order.CARRIERID} 订舱编号不能为空");
|
|
|
|
|
|
|
|
|
|
primaryModel.ORDERNO = order.CUSTNO;
|
|
|
|
|