|
|
|
@ -627,6 +627,12 @@ namespace Myshipping.Application
|
|
|
|
|
//附件暂存
|
|
|
|
|
var fileFullName = await FileAttachHelper.TempSaveWebFile(model.Head.GID, file, batchNo, CONST_DRAFT_FILE_CODE);
|
|
|
|
|
|
|
|
|
|
string fileAttchedFullName = string.Empty;
|
|
|
|
|
|
|
|
|
|
if(fileAttach != null)
|
|
|
|
|
{
|
|
|
|
|
fileAttchedFullName = await FileAttachHelper.TempSaveWebFile(model.Head.GID, fileAttach, batchNo, CONST_DRAFT_FILE_CODE);
|
|
|
|
|
}
|
|
|
|
|
//Draft文件解析
|
|
|
|
|
NameValueCollection par = new NameValueCollection();
|
|
|
|
|
par.Add("jsonMessage", JSON.Serialize(readFileMessageInfo));
|
|
|
|
@ -784,6 +790,15 @@ namespace Myshipping.Application
|
|
|
|
|
await SaveEDIFile(bookingOrder.Id, bookFilePath, new System.IO.FileInfo(fileFullName).Name, entity.TenantId.Value,
|
|
|
|
|
CONST_DRAFT_FILE_CODE, CONST_DRAFT_FILE_NAME);
|
|
|
|
|
|
|
|
|
|
if(!string.IsNullOrWhiteSpace(fileAttchedFullName))
|
|
|
|
|
{
|
|
|
|
|
var currBookFilePath = await FileAttachHelper.MoveFile(bookingOrder.Id.ToString(), fileAttchedFullName, batchNo);
|
|
|
|
|
|
|
|
|
|
//将格式单附件写入订舱的附件
|
|
|
|
|
await SaveEDIFile(bookingOrder.Id, currBookFilePath, new System.IO.FileInfo(fileAttchedFullName).Name, entity.TenantId.Value,
|
|
|
|
|
CONST_DRAFT_FILE_CODE, CONST_DRAFT_FILE_NAME);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result = compareResult;
|
|
|
|
|
}
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|