|
|
|
@ -596,7 +596,7 @@ namespace Myshipping.Application
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//检索EDI扩展
|
|
|
|
|
var ediExtEntity = await _bookingEDIExt.FirstOrDefaultAsync(u => u.BookingId == Id);
|
|
|
|
|
var ediExtEntity = await _bookingEDIExt.AsQueryable().Filter(null, true).FirstAsync(u => u.BookingId == Id);
|
|
|
|
|
|
|
|
|
|
if (ediExtEntity != null)
|
|
|
|
|
{
|
|
|
|
@ -1160,7 +1160,7 @@ namespace Myshipping.Application
|
|
|
|
|
throw Oops.Bah(BookingErrorCode.BOOK001);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var printTemplate = _repPrintTemplate.FirstOrDefault(x => x.TenantId == order.TenantId && x.TypeCode == typeCode);
|
|
|
|
|
var printTemplate = await _repPrintTemplate.AsQueryable().Filter(null, true).FirstAsync(x => x.TenantId == order.TenantId && x.TypeCode == typeCode);
|
|
|
|
|
if (printTemplate == null)
|
|
|
|
|
{
|
|
|
|
|
throw Oops.Bah(BookingErrorCode.BOOK115);
|
|
|
|
@ -1221,10 +1221,11 @@ namespace Myshipping.Application
|
|
|
|
|
//var result = new FileContentResult(bs, "application/octet-stream") { FileDownloadName = fileName };
|
|
|
|
|
var opt = App.GetOptions<TempFileOptions>().Path;
|
|
|
|
|
var serverpath = Path.Combine(App.WebHostEnvironment.WebRootPath, opt);//服务器路径
|
|
|
|
|
if (!Directory.Exists(serverpath)) {
|
|
|
|
|
if (!Directory.Exists(serverpath))
|
|
|
|
|
{
|
|
|
|
|
Directory.CreateDirectory(serverpath);
|
|
|
|
|
}
|
|
|
|
|
await File.WriteAllBytesAsync(Path.Combine(serverpath, fileName),bs);
|
|
|
|
|
await File.WriteAllBytesAsync(Path.Combine(serverpath, fileName), bs);
|
|
|
|
|
return fileName;
|
|
|
|
|
}
|
|
|
|
|
/// <summary>
|
|
|
|
|