Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS

.gitignore

@@ -32,3 +32,4 @@ bin-release/
 /HJGL_DS/WebAPI/.vs
 /HJGL_DS/FineUIPro.Web/FileUpload/WeldMat/StockIn
 /HJGL_DS/FineUIPro.Web/FileUpload/Common/WelderManage
+/CreateModel2017 - 副本.bat

.vs/VSWorkspaceState.json

@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\SGGL.sln",
+  "PreviewInSolutionExplorer": false
+}

DataBase/版本日志/HJGLDB_DS_2026-01-05_gf.sql

@@ -0,0 +1,106 @@
+
+ALTER PROC [dbo].[HJGL_sp_rpt_iso_analyze]
+          @unitNo  VARCHAR(400) = NULL,
+          @isono VARCHAR(100) = NULL,
+          @steel varchar(50) = NULL,
+          @projectId NVARCHAR(50) = NULL,
+          @StartDate datetime =null,
+          @EndDate datetime =null
+AS
+/*焊接工作量统计 佘春生修改于2020.03.06*/
+SELECT iso.ProjectId,iso.ISO_IsoNo,iso.PressureTestPackageNo,Unit.UnitCode AS bsu_unitcode, --单位代码
+	   Unit.UnitName AS bsu_unitname, --单位名称
+	   Project.ProjectCode as projectCode, --施工号
+	   'Φ'+cast(cast(ISO_Dia as FLOAT) as nvarchar(50))+'×'+cast(cast(ISO_Sch as FLOAT) as nvarchar(50)) as IsoDesc,   --管线主规格
+	  v.ISO_ID,v.total_jot,v.total_din,
+       ISNULL(v1.finished_total_jot,0) AS finished_total_jot,
+       ISNULL(v1.finished_total_din,0) AS finished_total_din,v1.maxdate, 
+       ISNULL(v1.total_film,0) AS total_film,
+       ISNULL(v1.pass_film,0) AS pass_film, 
+       CAST(CASE ISNULL(v1.total_film ,0) WHEN 0 THEN 0
+		ELSE 1.0*ISNULL(v1.pass_film,0) / (1.0 * v1.total_film) END AS DECIMAL(19,3))
+		AS passrate, --点口合格率
+       ISNULL(v2.point_jot,0) AS point_jot,
+       ISNULL(v2.point_total_film,0) AS point_total_film,
+       ISNULL(v2.point_pass_film,0) AS point_pass_film, 
+       CAST(CASE ISNULL(v2.point_total_film ,0) WHEN 0 THEN 0
+		ELSE 1.0*ISNULL(v2.point_pass_film,0) / (1.0 * v2.point_total_film) END AS DECIMAL(19,3))
+		AS point_passrate, --点口合格率
+		
+       ISNULL(v3.ext_jot,0) AS ext_jot,
+       ISNULL(v3.ext_total_film,0) AS ext_total_film,
+       ISNULL(v3.ext_pass_film,0) AS ext_pass_film,
+       CAST(CASE ISNULL(v3.ext_total_film ,0) WHEN 0 THEN 0
+		ELSE 1.0*ISNULL(v3.ext_pass_film,0) / (1.0 * v3.ext_total_film) END AS DECIMAL(19,3))
+		AS point_passrate, --扩透合格率
+		(ISNULL(v2.point_jot,0)+ISNULL(v3.ext_jot,0)) AS check_total_jot,
+		ISNULL(v4.total_repairjot,0) AS total_repairjot,
+		ISNULL(v5.trust_total_jot,0) AS trust_total_jot,
+		CAST(CASE ISNULL(v.total_jot,0) WHEN 0 THEN 0
+		ELSE 1.0*ISNULL(v2.point_jot,0) / (1.0 * v.total_jot) END AS DECIMAL(19,3))
+		AS  trustrate,  --委托比例	
+	    CAST(CASE ISNULL(v.total_jot,0) WHEN 0 THEN 0
+		ELSE 1.0*(ISNULL(v3.ext_jot,0) + ISNULL(v2.point_jot,0)) / (1.0 * v.total_jot) 
+		END AS DECIMAL(19,3))
+		AS  checkrate  --已探比例
+FROM 
+   (SELECT ISO_ID, COUNT(JOT_ID) AS total_jot,SUM(ISNULL(JOT_Size,0)) AS total_din
+      FROM dbo.HJGL_PW_JointInfo
+      GROUP BY ISO_ID) v
+   LEFT JOIN  
+   (SELECT ISO_ID, COUNT(JOT_ID) AS finished_total_jot,SUM(ISNULL(JOT_Size,0)) AS finished_total_din, 
+            max(weldreport.JOT_WeldDate) AS maxdate, SUM(ISNULL(jot.RT_FilmNum,0)) AS total_film,
+            SUM(ISNULL(jot.RT_FilmNum,0)-ISNULL(jot.RT1_RepairFilmNum,0)) AS pass_film
+      FROM dbo.HJGL_PW_JointInfo jot
+           LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID
+      WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) 
+		    AND jot.DReportID is not null
+      GROUP BY ISO_ID) v1 ON v1.ISO_ID=v.ISO_ID 
+   LEFT JOIN  
+   (SELECT ISO_ID, COUNT(jot.JOT_ID) AS point_jot,SUM(ISNULL(jot.RT_FilmNum,0)) AS point_total_film,
+           SUM(ISNULL(jot.RT_FilmNum,0)-ISNULL(jot.RT1_RepairFilmNum,0)) AS point_pass_film
+      FROM dbo.HJGL_PW_JointInfo jot
+           LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID
+      WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) 
+		    AND jot.DReportID is not NULL AND jot.PointType='点口' or ((select top 1 CH_TrustItemID from HJGL_CH_TrustItem ti where ti.JOT_ID=jot.JOT_ID) is not null and jot.PointType is null)
+      GROUP BY ISO_ID) v2 ON v2.ISO_ID=v.ISO_ID 
+   LEFT JOIN  
+   (SELECT ISO_ID, COUNT(jot.JOT_ID) AS ext_jot,SUM(ISNULL(jot.RT_FilmNum,0)) AS ext_total_film,
+            SUM(ISNULL(jot.RT_FilmNum,0)-ISNULL(jot.RT1_RepairFilmNum,0)) AS ext_pass_film
+      FROM dbo.HJGL_PW_JointInfo jot
+           LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID
+      WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) 
+		    AND jot.DReportID is not NULL AND jot.PointType='扩透'
+      GROUP BY ISO_ID) v3 ON v3.ISO_ID=v.ISO_ID   
+  LEFT JOIN  
+   (SELECT jot.ISO_ID, COUNT(distinct trust.JOT_ID) AS trust_total_jot   --trust.CH_TrustItemID
+      FROM dbo.HJGL_CH_TrustItem trust
+           LEFT join dbo.HJGL_PW_JointInfo AS jot on jot.JOT_ID=trust.JOT_ID
+		   LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID
+      WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) 
+		    AND jot.DReportID is not NULL 
+      GROUP BY jot.ISO_ID) v5 ON v5.ISO_ID=v.ISO_ID 
+  LEFT JOIN  
+   (SELECT ISO_ID,COUNT(DISTINCT(jot.JOT_ID)) AS total_repairjot
+      FROM dbo.HJGL_PW_JointInfo jot
+           LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID
+      WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) 
+		    AND jot.DReportID is not NULL 
+		    AND(jot.RT1_RepairFilmNum IS NOT NULL OR jot.PTIsRepair1=1 OR jot.MTIsRepair1=1 OR jot.UTIsRepair1=1)
+      GROUP BY ISO_ID) v4 ON v4.ISO_ID=v.ISO_ID 
+      
+   LEFT JOIN dbo.HJGL_PW_IsoInfo iso ON iso.ISO_ID = v.ISO_ID  
+   LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = iso.BSU_ID   
+   LEFT JOIN Base_Project AS Project ON Project.ProjectId = iso.ProjectId
+   WHERE (iso.ProjectId = @projectId OR @projectId IS NULL)
+		  AND (iso.BSU_ID=@unitno OR @unitno IS NULL) 
+		  AND	(iso.STE_ID=@steel OR @steel IS NULL)  
+		  AND	(iso.ISO_IsoNo = @isono OR  @isono IS NULL)
+
+
+
+
+
+GO
+
+

HJGL_DS/.claude/settings.local.json

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(cat:*)",
+      "Bash(find:*)"
+    ]
+  }
+}

HJGL_DS/BLL/BLL.csproj

@@ -95,6 +95,7 @@
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Management" />
+    <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web" />
@@ -114,7 +115,6 @@
     <Compile Include="API\APIUnitInfoService.cs" />
     <Compile Include="API\APIWeldServices.cs" />
     <Compile Include="AttachFile\AttachFileService.cs" />
-    <Compile Include="CacheHelper.cs" />
     <Compile Include="Common\ADomainService.cs" />
     <Compile Include="Common\BaseInfo\AudiFlowService.cs" />
     <Compile Include="Common\BaseInfo\AuditFlowApproveService.cs.cs" />
@@ -125,6 +125,7 @@
     <Compile Include="Common\BaseInfo\Base_TeamGroupService.cs" />
     <Compile Include="Common\BaseInfo\Base_UnitService.cs" />
     <Compile Include="Common\BaseInfo\ProjectPlanService.cs" />
+    <Compile Include="Common\CacheHelper.cs" />
     <Compile Include="Common\ChartControlService.cs" />
     <Compile Include="Common\ConstValue.cs" />
     <Compile Include="Common\FastReportService.cs" />

HJGL_DS/BLL/CacheHelper.cs

@@ -1,89 +0,0 @@
-using System;
-using System.Web;
-using System.Collections;
-
-public class CacheHelper
-{
-   /// <summary>
-   /// 获取数据缓存
-   /// </summary>
-   /// <param name="CacheKey">键</param>
-   /// <returns></returns>
-    public static object GetCache(string CacheKey)
-    {
-        System.Web.Caching.Cache objCache = HttpRuntime.Cache;
-        return objCache[CacheKey];
-
-    }
-
-    /// <summary>
-    /// 设置数据缓存
-    /// </summary>
-    /// <param name="CacheKey"></param>
-    /// <param name="objObject"></param>
-    public static void SetCache(string CacheKey, object objObject)
-    {
-        System.Web.Caching.Cache objCache = HttpRuntime.Cache;
-        objCache.Insert(CacheKey, objObject);
-
-    }
-
-     /// <summary>
-     /// 设置数据缓存
-     /// </summary>
-     /// <param name="CacheKey"></param>
-     /// <param name="objObject"></param>
-     /// <param name="Timeout"></param>
-    public static void SetCache(string CacheKey, object objObject, TimeSpan Timeout)
-    {
-        System.Web.Caching.Cache objCache = HttpRuntime.Cache;
-        objCache.Insert(CacheKey, objObject, null, DateTime.MaxValue, Timeout, System.Web.Caching.CacheItemPriority.NotRemovable, null);
-    }
-
-     /// <summary>
-     /// 设置数据缓存
-     /// </summary>
-     /// <param name="CacheKey"></param>
-     /// <param name="objObject"></param>
-     /// <param name="absoluteExpiration"></param>
-     /// <param name="slidingExpiration"></param>
-    public static void SetCache(string CacheKey, object objObject, DateTime absoluteExpiration, TimeSpan slidingExpiration)
-    {
-        System.Web.Caching.Cache objCache = HttpRuntime.Cache;
-        objCache.Insert(CacheKey, objObject, null, absoluteExpiration, slidingExpiration);
-    }
-
-    /// <summary>
-    /// 移除指定数据缓存
-    /// </summary>
-    /// <param name="CacheKey"></param>
-    public static void RemoveAllCache(string CacheKey)
-    {
-
-        System.Web.Caching.Cache _cache = HttpRuntime.Cache;
-        _cache.Remove(CacheKey);
-    }
-
-    /// <summary>
-    /// 移除全部缓存
-    /// </summary>
-    public static void RemoveAllCache()
-    {
-        System.Web.Caching.Cache _cache = HttpRuntime.Cache;
-        IDictionaryEnumerator CacheEnum = _cache.GetEnumerator();
-        while (CacheEnum.MoveNext())
-        {
-            _cache.Remove(CacheEnum.Key.ToString());
-
-        }
-
-    }
-
-          /// <summary>
-         /// 获取缓存
-        /// </summary>
-         private static object GetPrivate(string key)
-        {
-            return string.IsNullOrEmpty(key) ? null : HttpRuntime.Cache.Get(key);
-         }
-}

HJGL_DS/BLL/Common/CacheHelper.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Runtime.Caching;
+
+namespace BLL
+{
+    public static class CacheHelper
+    {
+        private static readonly ObjectCache Cache = MemoryCache.Default;
+
+        /// <summary>
+        /// 添加缓存项
+        /// </summary>
+        /// <param name="key">缓存键</param>
+        /// <param name="value">缓存值</param>
+        /// <param name="absoluteExpiration">绝对过期时间</param>
+        public static void Add(string key, object value, DateTimeOffset absoluteExpiration)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            Cache.Set(key, value, absoluteExpiration);
+        }
+
+        /// <summary>
+        /// 获取缓存项（泛型）
+        /// </summary>
+        /// <typeparam name="T">返回类型</typeparam>
+        /// <param name="key">缓存键</param>
+        /// <returns>缓存值</returns>
+        public static T Get<T>(string key)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            object value = Cache[key];
+            if (value is T tValue)
+            {
+                return tValue;
+            }
+            return default(T);
+        }
+
+        /// <summary>
+        /// 获取缓存项
+        /// </summary>
+        /// <param name="key">缓存键</param>
+        /// <returns>缓存值</returns>
+        public static object Get(string key)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            return Cache[key];
+        }
+
+        /// <summary>
+        /// 移除缓存项
+        /// </summary>
+        /// <param name="key">缓存键</param>
+        public static void Remove(string key)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            Cache.Remove(key);
+        }
+
+        /// <summary>
+        /// 清空所有缓存
+        /// </summary>
+        public static void Clear()
+        {
+            foreach (var item in Cache)
+            {
+                Cache.Remove(item.Key);
+            }
+        }
+
+        /// <summary>
+        /// 检查缓存项是否存在
+        /// </summary>
+        /// <param name="key">缓存键</param>
+        /// <returns>是否存在</returns>
+        public static bool Exists(string key)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            return Cache.Contains(key);
+        }
+    }
+}

HJGL_DS/BLL/Common/FastReportService.cs

@@ -1,40 +1,85 @@
-using System.Web;
+using FastReport;
-using System.Web.Security;
+using NPOI.POIFS.Crypt;
+using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Data;
+using System.Web;
-using FastReport;
+using System.Web.Security;
 
 namespace BLL.Common
 {
     public static class FastReportService
     {
- 
+        // 缓存过期时间：30分钟
+        private static readonly int CacheExpirationMinutes = 5;
+
         /// <summary>
-        /// 重置数据
+        /// 重置数据 - 清理缓存和Session
         /// </summary>
         public static void ResetData()
         {
-            HttpContext.Current.Session["ReportDataTables"] = null;
+            if (HttpContext.Current?.Session == null)
-            HttpContext.Current.Session["ReportParameterValues"] = null;
+            {
+                return;
+            }
+
+            // 清理Session中的缓存键引用
+            var cacheKeys = HttpContext.Current.Session["ReportDataCacheKeys"] as List<string>;
+            if (cacheKeys != null)
+            {
+                foreach (var key in cacheKeys)
+                {
+                    try
+                    {
+                        CacheHelper.Remove(key);
+                    }
+                    catch
+                    {
+                        // 忽略缓存删除异常
+                    }
+                }
+            }
+            HttpContext.Current.Session["ReportDataCacheKeys"] = null;
+            HttpContext.Current.Session["ReportParameterCacheKey"] = null;
         }
+
+        /// <summary>
+        /// 添加报表数据表到缓存
+        /// </summary>
         public static void AddFastreportTable(DataTable dataTable)
         {
-            List<DataTable> dataTables = (List<DataTable>)HttpContext.Current.Session["ReportDataTables"];
+
-            if (dataTables == null)
+            // 生成唯一缓存键
+            string cacheKey = $"ReportData_{Guid.NewGuid()}_{DateTime.Now.Ticks}";
+
+            // 将数据表存储到缓存中，设置5分钟过期
+            CacheHelper.Add(cacheKey, dataTable, DateTimeOffset.Now.AddMinutes(CacheExpirationMinutes));
+
+            List<string> cacheKeys = HttpContext.Current.Session["ReportDataCacheKeys"] as List<string>;
+            if (cacheKeys==null)
             {
-                dataTables = new List<DataTable>();
+                cacheKeys = new List<string>();
             }
-            dataTables.Add(dataTable);
+            cacheKeys.Add(cacheKey);
-
+            HttpContext.Current.Session["ReportDataCacheKeys"] = cacheKeys; 
-            HttpContext.Current.Session["ReportDataTables"] = dataTables;
         }
-        public static void AddFastreportParameter(Dictionary<string, string> Dicparames)
-        {
-            HttpContext.Current.Session["ReportParameterValues"] = Dicparames;
 
+        /// <summary>
+        /// 添加报表参数到缓存
+        /// </summary>
+        public static void AddFastreportParameter(Dictionary<string, string> Dicparames)
+        {  
+            // 生成唯一缓存键
+            string cacheKey = $"ReportParam_{Guid.NewGuid()}_{DateTime.Now.Ticks}";
+
+            // 将参数存储到缓存中，设置5分钟过期
+            CacheHelper.Add(cacheKey, Dicparames, DateTimeOffset.Now.AddMinutes(CacheExpirationMinutes));
+
+            // Session只存储缓存键的引用（轻量级）
+            HttpContext.Current.Session["ReportParameterCacheKey"] = cacheKey;
         }
 
         /// <summary>
@@ -82,16 +127,8 @@ namespace BLL.Common
 
                 }
             }
-            if (printType == "1")
+            FastReport.Export.Pdf.PDFExport exp = new FastReport.Export.Pdf.PDFExport();
-            {
+            report.Export(exp, path);
-                FastReport.Export.Pdf.PDFExport exp = new FastReport.Export.Pdf.PDFExport();
-                report.Export(exp, path);
-            }
-            else if (printType == "2")
-            {
-                FastReport.Export.OoXML.Word2007Export exportBase = new FastReport.Export.OoXML.Word2007Export();
-                report.Export(export: exportBase, fileName: path.Replace(oldValue: "pdf", newValue: "docx"));
-            }
         }
     }
 }

HJGL_DS/BLL/app.config

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

HJGL_DS/BLL/packages.config

@@ -4,4 +4,5 @@
   <package id="NPOI" version="2.5.5" targetFramework="net461" />
   <package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net461" />
   <package id="SharpZipLib" version="1.3.2" targetFramework="net461" />
+  <package id="System.Runtime.Caching" version="4.7.0" targetFramework="net461" />
 </packages>

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx

@@ -82,6 +82,9 @@
                             <f:RenderField HeaderText="单位名称" ColumnID="bsu_unitname" DataField="bsu_unitname" SortField="bsu_unitname"
                                  FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="220px">                               
                             </f:RenderField>
+                            <f:RenderField HeaderText="施工号" ColumnID="projectCode" DataField="projectCode" SortField="projectCode"
+                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="220px">
+                            </f:RenderField> 
                             <f:RenderField HeaderText="管线号" ColumnID="iso_isono" DataField="iso_isono" SortField="iso_isono"
                                  FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="220px">
                             </f:RenderField>  

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=.\MSSQLSERVER2022;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/;"/>

HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs

@@ -171,17 +171,15 @@ namespace FineUIPro.Web.WeldMat.Stock
         protected void btnMoveStore_Click(object sender, EventArgs e)
         {
             //if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_StockMoveRecordsMenuId, BLL.Const.BtnMoveStore))
-            if (this.CurrUser.UserId == "95eae1e8-ddb9-4b76-99f4-78a3636a398b")  //焊材移库功能只能赵瑞霞操作
+            if (this.CurrUser.UserId == "95eae1e8-ddb9-4b76-99f4-78a3636a398b" || this.CurrUser.Account == Const.Gly)  //焊材移库功能只能赵瑞霞操作
             {
-                if (CurrUser.Account != Const.Gly)
-                {
                     PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockMove.aspx", "移库 - ")));
-                }
+                //}
-                else
+                //else
-                {
+                //{
-                    Alert.ShowInTop("管理员不能操作！", MessageBoxIcon.Warning);
+                //    Alert.ShowInTop("管理员不能操作！", MessageBoxIcon.Warning);
-                    return;
+                //    return;
-                }
+                //}
             }
             else
             {

HJGL_DS/FineUIPro.Web/common/ReportPrint/Fastreport.aspx.cs

@@ -29,14 +29,35 @@ namespace FineUIPro.Web.common.ReportPrint
         {
             get
             {
-                return (List<DataTable>)Session["ReportDataTables"];
+                List<DataTable> dataTables = new List<DataTable>();
+                var cacheKeys = HttpContext.Current.Session["ReportDataCacheKeys"] as List<string>;
+                if (cacheKeys != null)
+                {
+                    foreach (var key in cacheKeys)
+                    {
+
+                        var dataTable = CacheHelper.Get<DataTable>(key);
+                        if (dataTable != null)
+                        {
+                            dataTables.Add(dataTable);
+                        }
+                    }
+
+                }
+                return dataTables;
             }
         }
         public Dictionary<string, string> ParameterValues
         {
             get
             {
-                return (Dictionary<string, string>)Session["ReportParameterValues"];
+                var cacheKey = Session["ReportParameterCacheKey"] as string;
+                if (!string.IsNullOrEmpty(cacheKey))
+                {
+                    return CacheHelper.Get<Dictionary<string, string>>(cacheKey);
+
+                }
+                return null;
             }
         }
         protected void Page_Load(object sender, EventArgs e)
@@ -58,7 +79,10 @@ namespace FineUIPro.Web.common.ReportPrint
                 WebReport1.Report.Save(ReportPath);
             }
             WebReport1.ReportFile = ReportPath;
-            WebReport1.Prepare();
+            System.Threading.Tasks.Task.Run(() =>
+            {
+                WebReport1.Prepare();
+            }); 
            // WebReport1.ExportPdf();
         }
         private void demo()

HJGL_DS/WebAPI/Web.config

@@ -1,79 +1,79 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   有关如何配置 ASP.NET 应用程序的详细信息，请访问
   https://go.microsoft.com/fwlink/?LinkId=301879
   -->
 <configuration>
   <appSettings>
-    <add key="webpages:Version" value="3.0.0.0"/>
+    <add key="webpages:Version" value="3.0.0.0" />
-    <add key="webpages:Enabled" value="false"/>
+    <add key="webpages:Enabled" value="false" />
-    <add key="ClientValidationEnabled" value="true"/>
+    <add key="ClientValidationEnabled" value="true" />
-    <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
+    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200" />
     <!--版本号-->
-    <add key="SystemVersion" value="WebApi_V2022-10-07-001"/>
+    <add key="SystemVersion" value="WebApi_V2022-10-07-001" />
     <!--附件上传物理路径-->
-    <add key="localRoot" value="D:\HJGL\HJGL\FineUIPro.Web\"/>
+    <add key="localRoot" value="D:\HJGL\HJGL\FineUIPro.Web\" />
     <!--每页数量-->
-    <add key="PageSize" value="15"/>
+    <add key="PageSize" value="15" />
   </appSettings>
   <system.web>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="false" targetFramework="4.6.1" />
-    <httpRuntime targetFramework="4.6.1"/>
+    <httpRuntime targetFramework="4.6.1" />
   </system.web>
   <system.webServer>
     <!-- 跨域访问必须添加 -->
     <httpProtocol>
       <customHeaders>
-        <add name="Access-Control-Allow-Origin" value="*"/>
+        <add name="Access-Control-Allow-Origin" value="*" />
-        <add name="Access-Control-Allow-Headers" value="Content-Type"/>
+        <add name="Access-Control-Allow-Headers" value="Content-Type" />
-        <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS"/>
+        <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS" />
       </customHeaders>
     </httpProtocol>
     <handlers>
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
+      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
-      <remove name="OPTIONSVerbHandler"/>
+      <remove name="OPTIONSVerbHandler" />
-      <remove name="TRACEVerbHandler"/>
+      <remove name="TRACEVerbHandler" />
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
+      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
     </handlers>
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f"/>
+        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" />
-        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
+        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
+        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
+        <bindingRedirect oldVersion="1.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <system.codedom>
     <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
     </compilers>
   </system.codedom>
 </configuration>