From 3410de774e6471a66a08fd936ef6a94ca6bb07a2 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 1 Jul 2026 08:15:40 +0800
Subject: [PATCH 1/2] 1

---
 HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs | 4 ++--
 HJGL_DS/FineUIPro.Web/Web.config                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs
index ee675c5..3ae6571 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs
+++ b/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://47.104.102.122:8000/api/table/clean"; // 替换为实际上传地址
+                        string uploadUrl = "http://localhost: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://47.104.102.122:8000/api/table/head";
+                            string urlHeaderCorrespondence = "http://localhost:8000/api/table/head";
                             string data = @"{
                                               ""source_headers"":   " + dynamicObj["headers"].ToString() + @" ,
                                               ""target_fields"": [
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 3c98f31..070a5f8 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

From 715e22707db887febf22aa715d30915be5a3abb4 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 1 Jul 2026 09:07:14 +0800
Subject: [PATCH 2/2] 1

---
 HJGL_DS/BLL/Funs.cs                           | 121 +++++++++---------
 .../FineUIPro.Web/FineUIPro.Web.csproj.user   |   2 +-
 HJGL_DS/WebAPI/WebAPI.csproj.user             |   2 +-
 3 files changed, 62 insertions(+), 63 deletions(-)

diff --git a/HJGL_DS/BLL/Funs.cs b/HJGL_DS/BLL/Funs.cs
index 5a434d1..3f0065c 100644
--- a/HJGL_DS/BLL/Funs.cs
+++ b/HJGL_DS/BLL/Funs.cs
@@ -7,17 +7,17 @@ namespace BLL
     using System.Text.RegularExpressions;
 
     /// <summary>
-    /// ͨ�÷����ࡣ
+    /// ͨ�÷����ࡣ
     /// </summary>
     public static class Funs
     {
         /// <summary>
-        /// ά��һ��DB����
+        /// ά��һ��DB����
         /// </summary>
         private static Dictionary<int, Model.SGGLDB> dataBaseLinkList = new System.Collections.Generic.Dictionary<int, Model.SGGLDB>();
 
         /// <summary>
-        /// ά��һ��DB����
+        /// ά��һ��DB����
         /// </summary>
         public static System.Collections.Generic.Dictionary<int, Model.SGGLDB> DBList
         {
@@ -28,7 +28,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// ���ݿ������ַ���
+        /// ���ݿ������ַ���
         /// </summary>
         private static string connString;
 
@@ -38,7 +38,7 @@ namespace BLL
         public static string usingMatId;
 
         /// <summary>
-        /// ���ݿ������ַ�����
+        /// ���ݿ������ַ�����
         /// </summary>
         public static string ConnString
         {
@@ -46,7 +46,7 @@ namespace BLL
             {
                 if (connString == null)
                 {
-                    throw new NotSupportedException("�����������ַ�����");
+                    throw new NotSupportedException("�����������ַ�����");
                 }
 
                 return connString;
@@ -56,7 +56,7 @@ namespace BLL
             {
                 if (connString != null)
                 {
-                    throw new NotSupportedException("���������ã�");
+                    throw new NotSupportedException("���������ã�");
                 }
 
                 connString = value;
@@ -70,7 +70,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// �����
+        /// �����
         /// </summary>
         public static string UnitSet
         {
@@ -79,7 +79,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// ·��
+        /// ·��
         /// </summary>
         public static string RootPath
         {
@@ -88,7 +88,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// ϵͳ��
+        /// ϵͳ��
         /// </summary>
         public static string SystemName
         {
@@ -96,7 +96,7 @@ namespace BLL
             set;
         }
         /// <summary>
-        /// AD����
+        /// AD����
         /// </summary>
         public static string ADomainUrl
         {
@@ -104,7 +104,7 @@ namespace BLL
             set;
         }
         /// <summary>
-        /// APP���ص�ַ
+        /// APP���ص�ַ
         /// </summary>
         public static string APPUrl
         {
@@ -122,7 +122,7 @@ namespace BLL
 
 
         /// <summary>
-        /// ÿҳ����
+        /// ÿҳ����
         /// </summary>
         public static int PageSize
         {
@@ -131,7 +131,7 @@ namespace BLL
         } = 15;
 
         /// <summary>
-        /// ���ݿ������ġ�
+        /// ���ݿ������ġ�
         /// </summary>
         public static Model.SGGLDB DB
         {
@@ -147,50 +147,50 @@ namespace BLL
         }
 
         /// <summary>
-        /// ΪĿ����������� "��ѡ��" ��
+        /// ΪĿ����������� "��ѡ��" ��
         /// </summary>
-        /// <param name="DLL">Ŀ��������</param>
+        /// <param name="DLL">Ŀ��������</param>
         public static void PleaseSelect(System.Web.UI.WebControls.DropDownList DDL)
         {
-            DDL.Items.Insert(0, new System.Web.UI.WebControls.ListItem("- ��ѡ�� -", "0"));
+            DDL.Items.Insert(0, new System.Web.UI.WebControls.ListItem("- ��ѡ�� -", "0"));
             return;
         }
 
         /// <summary>
-        /// ΪĿ����������� "��ѡ��" ��
+        /// ΪĿ����������� "��ѡ��" ��
         /// </summary>
-        /// <param name="DLL">Ŀ��������</param>
+        /// <param name="DLL">Ŀ��������</param>
         public static void FineUIPleaseSelect(FineUIPro.DropDownList DDL)
         {
-            DDL.Items.Insert(0, new FineUIPro.ListItem("- ��ѡ�� -", BLL.Const._Null));
+            DDL.Items.Insert(0, new FineUIPro.ListItem("- ��ѡ�� -", BLL.Const._Null));
             return;
         }
 
         /// <summary>
-        /// ΪĿ����������� "���±���" ��
+        /// ΪĿ����������� "���±���" ��
         /// </summary>
-        /// <param name="DLL">Ŀ��������</param>
+        /// <param name="DLL">Ŀ��������</param>
         public static void ReCompileSelect(System.Web.UI.WebControls.DropDownList DDL)
         {
-            DDL.Items.Insert(0, new System.Web.UI.WebControls.ListItem("���±���", "0"));
+            DDL.Items.Insert(0, new System.Web.UI.WebControls.ListItem("���±���", "0"));
             return;
         }
 
         /// <summary>
-        /// ΪĿ����������� "���±���" ��
+        /// ΪĿ����������� "���±���" ��
         /// </summary>
-        /// <param name="DLL">Ŀ��������</param>
+        /// <param name="DLL">Ŀ��������</param>
         public static void FineUIReCompileSelect(FineUIPro.DropDownList DDL)
         {
-            DDL.Items.Insert(0, new FineUIPro.ListItem("���±���", "0"));
+            DDL.Items.Insert(0, new FineUIPro.ListItem("���±���", "0"));
             return;
         }
 
         /// <summary>
-        /// �ַ����Ƿ�Ϊ������
+        /// �ַ����Ƿ�Ϊ������
         /// </summary>
-        /// <param name="decimalStr">Ҫ�����ַ���</param>
-        /// <returns>�����ǻ��</returns>
+        /// <param name="decimalStr">Ҫ�����ַ���</param>
+        /// <returns>�����ǻ��</returns>
         public static bool IsDecimal(string decimalStr)
         {
             if (String.IsNullOrEmpty(decimalStr))
@@ -211,10 +211,10 @@ namespace BLL
         }
 
         /// <summary>
-        /// �ж�һ���ַ����Ƿ�������
+        /// �ж�һ���ַ����Ƿ�������
         /// </summary>
-        /// <param name="integerStr">Ҫ�����ַ���</param>
-        /// <returns>�����ǻ��</returns>
+        /// <param name="integerStr">Ҫ�����ַ���</param>
+        /// <returns>�����ǻ��</returns>
         public static bool IsInteger(string integerStr)
         {
             if (String.IsNullOrEmpty(integerStr))
@@ -235,10 +235,10 @@ namespace BLL
         }
 
         /// <summary>
-        /// ��ȡ�µ�����
+        /// ��ȡ�µ�����
         /// </summary>
-        /// <param name="number">Ҫת��������</param>
-        /// <returns>�µ�����</returns>
+        /// <param name="number">Ҫת��������</param>
+        /// <returns>�µ�����</returns>
         public static string InterceptDecimal(object number)
         {
             if (number == null)
@@ -285,11 +285,11 @@ namespace BLL
         }
 
         /// <summary>
-        /// �ж��ַ����ӵ�nλ��ʼ�Ժ��Ƿ�Ϊ0
+        /// �ж��ַ����ӵ�nλ��ʼ�Ժ��Ƿ�Ϊ0
         /// </summary>
-        /// <param name="number">Ҫ�жϵ��ַ���</param>
-        /// <param name="n">��ʼ��λ��</param>
-        /// <returns>false����Ϊ0��true��Ϊ0</returns>
+        /// <param name="number">Ҫ�жϵ��ַ���</param>
+        /// <param name="n">��ʼ��λ��</param>
+        /// <returns>false����Ϊ0��true��Ϊ0</returns>
         public static bool GetStr(string number, int n)
         {
             for (int i = n; i < number.Length; i++)
@@ -303,11 +303,11 @@ namespace BLL
         }
 
         /// <summary>
-        /// ��ȡ�ַ�������
+        /// ��ȡ�ַ�������
         /// </summary>
-        /// <param name="str">Ҫ��ȡ���ַ���</param>
-        /// <param name="n">����</param>
-        /// <returns>��ȡ���ַ���</returns>
+        /// <param name="str">Ҫ��ȡ���ַ���</param>
+        /// <param name="n">����</param>
+        /// <returns>��ȡ���ַ���</returns>
         public static string GetSubStr(object str, object n)
         {
             if (str != null)
@@ -326,7 +326,7 @@ namespace BLL
 
 
         /// <summary>
-        /// �����ı�ת��ʱ������
+        /// �����ı�ת��ʱ������
         /// </summary>
         /// <returns></returns>
         public static DateTime? GetNewDateTime(string time)
@@ -350,7 +350,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// �����ı�ת������
+        /// �����ı�ת������
         /// </summary>
         /// <returns></returns>
         public static decimal? GetNewDecimal(string value)
@@ -374,7 +374,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// �����ı�ת������
+        /// �����ı�ת������
         /// </summary>
         /// <returns></returns>
         public static decimal GetNewDecimalOrZero(string value)
@@ -388,7 +388,7 @@ namespace BLL
                 }
                 catch (Exception)
                 {
-                    // 如果直接解析失败（如带单位 "10M", "5KM", "3KG"），取前面的数字部分
+                    // ���ֱ�ӽ���ʧ�ܣ������λ "10M", "5KM", "3KG"����ȡǰ������ֲ���
                     try
                     {
                         Match match = Regex.Match(value, @"\d+\.?\d*");
@@ -408,7 +408,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// 从qty字符串中提取单位（如 "10M" → "M", "5KG" → "KG", "33.4 mm" → "mm", "10" → ""）
+        /// ��qty�ַ�������ȡ��λ���� "10M" �� "M", "5KG" �� "KG", "33.4 mm" �� "mm", "10" �� ""��
         /// </summary>
         public static string GetUnitFromQty(string value)
         {
@@ -419,9 +419,8 @@ namespace BLL
             return "";
         }
 
-
         /// <summary>
-        /// �����ı�ת����������
+        /// �����ı�ת����������
         /// </summary>
         /// <returns></returns>
         public static int? GetNewInt(string value)
@@ -445,7 +444,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// �����ı�ת����������
+        /// �����ı�ת����������
         /// </summary>
         /// <returns></returns>
         public static int GetNewIntOrZero(string value)
@@ -467,7 +466,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// ָ���ϴ��ļ�������
+        /// ָ���ϴ��ļ�������
         /// </summary>
         /// <returns></returns>
         public static string GetNewFileName()
@@ -477,7 +476,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// ���ݱ�ʶ�����ַ���list
+        /// ���ݱ�ʶ�����ַ���list
         /// </summary>
         /// <param name="str"></param>
         /// <param name="n"></param>
@@ -494,24 +493,24 @@ namespace BLL
         }
 
         /// <summary>
-        /// ���ݵ�һҳ�͵ڶ�ҳ�������ܼ�¼����ȷ����Ҫ��ӡ��ҳ
+        /// ���ݵ�һҳ�͵ڶ�ҳ�������ܼ�¼����ȷ����Ҫ��ӡ��ҳ
         /// </summary>
-        /// <param name="pageSize1">��һҳ����</param>
-        /// <param name="pageSize2">�ڶ�ҳ����</param>
-        /// <param name="count">�ܼ�¼��</param>
+        /// <param name="pageSize1">��һҳ����</param>
+        /// <param name="pageSize2">�ڶ�ҳ����</param>
+        /// <param name="count">�ܼ�¼��</param>
         /// <returns></returns>
         public static int GetPagesCountByPageSize(int pageSize1, int pageSize2, int count)
         {
             int pagesCount = 0;
-            if (pageSize1 >= count)    //�ܼ�¼��С�ڵ��ڵ�һҳ����
+            if (pageSize1 >= count)    //�ܼ�¼��С�ڵ��ڵ�һҳ����
             {
                 pagesCount = 1;
             }
-            else if (count > pageSize1 && count <= (pageSize1 + pageSize2))   //�ܼ�¼�����ڵ�һҳ������С�ڵ��ڵ�һҳ�ӵڶ�ҳ������
+            else if (count > pageSize1 && count <= (pageSize1 + pageSize2))   //�ܼ�¼�����ڵ�һҳ������С�ڵ��ڵ�һҳ�ӵڶ�ҳ������
             {
                 pagesCount = 2;
             }
-            else    //�ܼ�¼�����ڵ�һҳ�ӵڶ�ҳ������
+            else    //�ܼ�¼�����ڵ�һҳ�ӵڶ�ҳ������
             {
                 int lastCount = count - pageSize1;
                 decimal c = Convert.ToDecimal(Math.Round(Convert.ToDecimal(lastCount) / Convert.ToDecimal(pageSize2), 2));
@@ -530,7 +529,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// ��ȡ�ϴη������
+        /// ��ȡ�ϴη������
         /// </summary>
         /// <returns></returns>
         public static string GetRepariMark(string repairMark)
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index e3436b8..80f7761 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index 8cd7f1f..28be9c4 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>