|
|
|
@ -997,10 +997,12 @@ namespace DS.WMS.Core.Op.Method
|
|
|
|
|
{
|
|
|
|
|
return DataResult<string>.Failed(check.Message);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var carrCode = seaComService.GetCarrierCode(order.CarrierId, tenantDb);
|
|
|
|
|
|
|
|
|
|
var carrMap = tenantDb.Queryable<MappingCarrier>().Where(t => t.Module.Equals("BOOK_OR_CLOSING_RT", StringComparison.OrdinalIgnoreCase)
|
|
|
|
|
&& t.LinkId == order.CarrierId)
|
|
|
|
|
&& t.Code == carrCode)
|
|
|
|
|
.First();
|
|
|
|
|
var carrCode = seaComService.GetCarrierCode(order.CarrierId, tenantDb);
|
|
|
|
|
EDIRouteEnum ediRouteEnum = GetEDIRoute(carrCode, carrMap);
|
|
|
|
|
|
|
|
|
|
if (ediRouteEnum == EDIRouteEnum.YT)
|
|
|
|
@ -1042,7 +1044,7 @@ namespace DS.WMS.Core.Op.Method
|
|
|
|
|
|
|
|
|
|
//EDI SO\SI代码
|
|
|
|
|
var ediSOSICfg = tenantDb.Queryable<MappingCarrier>().First(t => t.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase)
|
|
|
|
|
&& t.LinkId == order.CarrierId);
|
|
|
|
|
&& t.Code == carrCode);
|
|
|
|
|
|
|
|
|
|
if (ediSOSICfg == null || string.IsNullOrWhiteSpace(ediSOSICfg.MapCode))
|
|
|
|
|
return DataResult<string>.Failed($"CARRIERID={carrCode} 发送SO(SI)的船公司EDI代码未找到");
|
|
|
|
|