111

HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs

@@ -239,9 +239,10 @@ namespace FineUIPro.Web.HJGL.DataIn
                                 }
 
 
-                            } Funs.DB.SubmitChanges();
+                            } 
-                                //保存文件到附件
+                            Funs.DB.SubmitChanges();
                                
+                            //保存文件到附件
                             UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(outputPath.Replace(rootPath, ""), 10, null), outputPath.Replace(rootPath, ""), Const.HJGL_PipelineManageMenuId, isoInfo.ISO_ID);
                         }
                     }

HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs

@@ -190,7 +190,7 @@ namespace FineUIPro.Web.HJGL.DataIn
                         Console.WriteLine(csvContent);
 
                         // 3. 上传到服务器
-                        string uploadUrl = "http://localhost:8000/api/table/clean"; // 替换为实际上传地址
+                        string uploadUrl = "http://47.104.102.122:8000/api/table/clean"; // 替换为实际上传地址
                         string fileName = $"data_{DateTime.Now:yyyyMMddHHmmss}.csv";
                         //"管线号", "公称直径", "管道等级", "管道材料", "主要介质", "起止点", "操作参数温度", "操作参数压力", "设计参数温度", "设计参数压力", "隔热工程代号", "隔热材料", "厚度", "介质", "压力", "比例", "方法", "合格等级", "PID尾号", "压力管道类别", "应力分析题号", "备注"
 
@@ -254,7 +254,7 @@ namespace FineUIPro.Web.HJGL.DataIn
                             Region1.Items.Add(grid1);
                             setAfterProcess.Tables.Add(dtAfterProcess);
 
-                            string urlHeaderCorrespondence = "http://localhost:8000/api/table/head";
+                            string urlHeaderCorrespondence = "http://47.104.102.122:8000/api/table/head";
                             string data = @"{
                                               ""source_headers"":   " + dynamicObj["headers"].ToString() + @" ,
                                               ""target_fields"": [
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.HJGL.DataIn
                                                 ""热处理类型"",
                                                 ""备注""
                                               ],
-                                              ""extra_instructions"": ""管线号优先匹配管线代号，优先将含有 Main Fluid 的字段映射到 介质,优先匹配隔热工程代号到绝热类别，压力管道类别映射执行标准，有名称首先匹配名称，没有名称匹配代号，按匹配度从高低输出""
+                                              ""extra_instructions"": ""管线号优先匹配管线代号，优先将含有 Main Fluid 的字段映射到 介质,优先匹配隔热工程代号到绝热类别，压力管道类别映射管道类别，有名称首先匹配名称，没有名称匹配代号，按匹配度从高低输出""
                                             }
                                             ";
                             string resHeaderCorrespondence = HeaderCorrespondence(urlHeaderCorrespondence, data, "POST", "application/json;charset=utf-8");
@@ -414,7 +414,7 @@ namespace FineUIPro.Web.HJGL.DataIn
                                                     {
                                                         if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString()))
                                                         {
-                                                            isoInfo.IsHotType = row[dataColumn.ColumnName].ToString();
+                                                            //isoInfo.IsHotType = row[dataColumn.ColumnName].ToString();
                                                             isoInfo.IsHot = "1";
                                                         }
                                                     }