diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs index ec117c82..712641d3 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs @@ -141,7 +141,7 @@ namespace FineUIPro.Web.HJGL.DataIn fileName = row["text"].ToString(); } } - outputPath = $"{outputPath}/" + fileName + DateTime.Now.ToString("yyyyMMddHHmm") + ".pdf"; + outputPath = $"{outputPath}/" + fileName + DateTime.Now.ToString("yyyyMMddHHmm")+(i + 1) + ".pdf"; } } @@ -241,8 +241,17 @@ namespace FineUIPro.Web.HJGL.DataIn //} Funs.DB.SubmitChanges(); //保存文件到附件 + var attatch = AttachFileService.GetAttachFileByToKeyId(isoInfo.PipelineId); + if (attatch != null) + { + UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(outputPath.Replace(rootPath, ""), 10, attatch.AttachSource), attatch.AttachUrl+","+ outputPath.Replace(rootPath, ""), Const.HJGL_PipelineMenuId, isoInfo.PipelineId); - UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(outputPath.Replace(rootPath, ""), 10, null), outputPath.Replace(rootPath, ""), Const.HJGL_PipelineMenuId, isoInfo.PipelineId); + } + else + { + UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(outputPath.Replace(rootPath, ""), 10, null), outputPath.Replace(rootPath, ""), Const.HJGL_PipelineMenuId, isoInfo.PipelineId); + + } } } }