From ccb0a6152bb609f5207703ba0d758adc903db929 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Sat, 8 Oct 2022 15:20:07 +0800
Subject: [PATCH] =?UTF-8?q?20221008=20001=20=E7=84=8A=E6=8E=A5=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E4=BF=AE=E6=94=B9=E5=92=8C=E7=84=8A=E6=8E=A5=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/BLL.csproj                           |   1 +
 .../HJGL_WeldingReportService.cs              | 166 +++++
 SGGL/FineUIPro.Web/ErrLog.txt                 | 381 ++++++++++++
 .../File/Fastreport/组件打印.frx              |  48 +-
 SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx |   4 +-
 .../HJGL/PreDesign/PrePipeline.aspx.cs        |   7 +-
 .../WeldingManage/PipelineListPDMSIn.aspx     |   4 +-
 .../WeldingManage/PipelineListPDMSIn.aspx.cs  |   2 +-
 SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx  | 181 ++++--
 .../common/mainMenu_HJGL.aspx.cs              | 565 +++++++++++++++++-
 .../common/mainMenu_HJGL.aspx.designer.cs     |  25 +-
 SGGL/Model/HJGL/sp_index_HJGLItem.cs          |  85 +++
 SGGL/Model/Model.csproj                       |   1 +
 13 files changed, 1389 insertions(+), 81 deletions(-)
 create mode 100644 SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs
 create mode 100644 SGGL/Model/HJGL/sp_index_HJGLItem.cs

diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 66fdf8d6..889cf938 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -342,6 +342,7 @@
     <Compile Include="HJGL\TestPackage\TestPackageApproveService.cs" />
     <Compile Include="HJGL\TestPackage\TestPackageAuditService.cs" />
     <Compile Include="HJGL\TestPackage\TestPackageEditService.cs" />
+    <Compile Include="HJGL\WeldingManage\HJGL_WeldingReportService.cs" />
     <Compile Include="HJGL\WeldingManage\PipelineComponentService.cs" />
     <Compile Include="HJGL\WeldingManage\PipelineMatService.cs" />
     <Compile Include="HJGL\WeldingManage\PipelineService.cs" />
diff --git a/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs b/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs
new file mode 100644
index 00000000..ea1002bc
--- /dev/null
+++ b/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs
@@ -0,0 +1,166 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    public class HJGL_WeldingReportService
+    {
+        /// <summary>
+        /// 根据类型获取总达因数(0总达因，1预制口总达因，2安装口总达因)
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="type">0总达因，1预制口总达因，2安装口总达因</param>
+        /// <returns></returns>
+        public static decimal GetSumSize(string projectId,int type)
+        {
+            decimal result = 0;
+
+            var getWelds = Funs.DB.HJGL_WeldJoint.Where(x => x.ProjectId == projectId);
+            if (getWelds.Count() > 0)
+            {
+                switch (type)
+                {
+                    case 0:
+                        result = getWelds.Sum(x => x.Size ?? 0); //项目总达因数
+                        break;
+                    case 1:
+                        if (getWelds.Where(x => x.JointAttribute == "预制口").Count() > 0)
+                        {
+                            result = getWelds.Where(x => x.JointAttribute == "预制口").Sum(x => x.Size ?? 0);
+                        }
+                        break;
+                    case 2:
+                        if (getWelds.Where(x => x.JointAttribute == "安装口").Count() > 0)
+                        {
+                            result = getWelds.Where(x => x.JointAttribute == "安装口").Sum(x => x.Size ?? 0);
+                        }
+                        break;
+                }
+
+            }
+           
+            return result;
+        }
+        /// <summary>
+        /// 工厂预制完成率
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static decimal GetGCRate_finished(string projectId)
+        {
+            decimal result = 0;
+            var getWelds = Funs.DB.HJGL_WeldJoint.Where(x => x.ProjectId == projectId);
+            if (getWelds.Count() > 0)
+            {
+                
+                var getWeldsOk = getWelds.Where(x => x.WeldingDailyId != null);
+                if (getWeldsOk.Count() > 0)
+                {
+                    var GCModel = getWeldsOk.Where(x => x.JointAttribute == "预制口");
+                    if (GCModel.Count() > 0)
+                    {
+                        result = GCModel.Sum(x => x.Size ?? 0);
+ 
+                    }
+                    
+                }
+            }
+            return result;
+        }
+        /// <summary>
+        /// 工厂预制未完成率
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static decimal GetGCRate_unfinished(string projectId)
+        {
+            decimal result = 0;
+            result = GetSumSize(projectId, 1) - GetGCRate_finished(projectId);
+            return result;
+        }
+        /// <summary>
+        /// 现场安装完成率
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static decimal GetXCRate_finished(string projectId)
+        {
+            decimal result = 0;
+            var getWelds = Funs.DB.HJGL_WeldJoint.Where(x => x.ProjectId == projectId);
+            if (getWelds.Count() > 0)
+            {
+
+                var getWeldsOk = getWelds.Where(x => x.WeldingDailyId != null);
+                if (getWeldsOk.Count() > 0)
+                {
+                    var GCModel = getWeldsOk.Where(x => x.JointAttribute == "安装口");
+                    if (GCModel.Count() > 0)
+                    {
+                        result = GCModel.Sum(x => x.Size ?? 0);
+
+                    }
+
+                }
+            }
+            return result;
+        }
+        /// <summary>
+        /// 现场安装未完成率
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static decimal GetXCRate_unfinished(string projectId)
+        {
+            decimal result = 0;
+            result = GetSumSize(projectId, 2) - GetXCRate_finished(projectId);
+            return result;
+        }
+        /// <summary>
+        /// 管道完成预制率
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static decimal GetPipeRate_finished(string projectId)
+        {
+            decimal result = 0;
+            result = GetGCRate_finished(projectId);
+            return result;
+        }
+        /// <summary>
+        /// 管道未完成预制率
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static decimal GetPipeRate_unfinished(string projectId)
+        {
+            decimal result = 0;
+            result = GetSumSize(projectId, 0) - GetPipeRate_finished(projectId);
+            return result;
+        }
+        public static  decimal  GetWelderEfficacy(string projectId)
+        {
+            decimal result = 0;
+            var db = Funs.DB;
+            var q = (from x in db.HJGL_WeldJoint
+                     join y in db.HJGL_WeldingDaily on x.WeldingDailyId equals y.WeldingDailyId
+                     where x.ProjectId ==projectId
+                     group x by x.ProjectId into g
+                      select new
+                     {
+                         TotalDin = g.Sum(x => x.Size),
+                         worktime = g.Select(x=>x.WeldingDailyId).Distinct().Count(),
+                     }) ;
+            foreach (var item in q)
+            {
+                result = decimal.Divide((decimal)item.TotalDin, item.worktime) ;
+  
+            }
+
+            return decimal.Truncate(result);
+        }
+    }
+}
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index e69de29b..6298b4d7 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -0,0 +1,381 @@
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:参数化查询 '(@ProjectId nvarchar(4000))select C.*,M.MainItemName,U.UnitName ' 需要参数 '@ProjectId'，但未提供该参数。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 312
+   在 FineUIPro.Web.HJGL.PreDesign.Material.ChecklistData() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\PreDesign\MaterialManage.aspx.cs:行号 82
+   在 FineUIPro.Web.HJGL.PreDesign.Material.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\PreDesign\MaterialManage.aspx.cs:行号 44
+   在 FineUIPro.Web.HJGL.PreDesign.Material.Page_Load(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\PreDesign\MaterialManage.aspx.cs:行号 35
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/27/2022 16:07:54
+出错文件:http://localhost:8008/HJGL/PreDesign/MaterialManage.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/27/2022 16:07:54
+
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 FineUIPro.Web.mainMenu_HJGL.getWeld(String projectId, String unitId)
+   在 FineUIPro.Web.mainMenu_HJGL.Page_Load(Object sender, EventArgs e)
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/27/2022 16:36:23
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/27/2022 16:36:23
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT SUM(TotalFilm) AS  TotalFilm, ' 需要参数 '@ProjectId'，但未提供该参数。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 312
+   在 FineUIPro.Web.mainMenu_HJGL.getWeld(String projectId, String unitId) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx.cs:行号 176
+   在 FineUIPro.Web.mainMenu_HJGL.Page_Load(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx.cs:行号 113
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/27/2022 17:13:59
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/27/2022 17:13:59
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能将 Null 值赋给类型为 System.Decimal (不可为 null 的值类型)的成员。
+错误堆栈:
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
+   在 System.Linq.Queryable.Sum[TSource](IQueryable`1 source, Expression`1 selector)
+   在 FineUIPro.Web.mainMenu_HJGL.getrate(String projectId, String unitId) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx.cs:行号 139
+   在 FineUIPro.Web.mainMenu_HJGL.Page_Load(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx.cs:行号 112
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/27/2022 17:14:18
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/27/2022 17:14:18
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能将 Null 值赋给类型为 System.Decimal (不可为 null 的值类型)的成员。
+错误堆栈:
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
+   在 System.Linq.Queryable.Sum[TSource](IQueryable`1 source, Expression`1 selector)
+   在 FineUIPro.Web.mainMenu_HJGL.getrate(String projectId, String unitId)
+   在 FineUIPro.Web.mainMenu_HJGL.Page_Load(Object sender, EventArgs e)
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/28/2022 11:23:24
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/28/2022 11:23:24
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能将 Null 值赋给类型为 System.Decimal (不可为 null 的值类型)的成员。
+错误堆栈:
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
+   在 System.Linq.Queryable.Sum[TSource](IQueryable`1 source, Expression`1 selector)
+   在 FineUIPro.Web.mainMenu_HJGL.getrate(String projectId, String unitId) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx.cs:行号 142
+   在 FineUIPro.Web.mainMenu_HJGL.Page_Load(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx.cs:行号 112
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/28/2022 11:27:48
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/28/2022 11:27:48
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能将 Null 值赋给类型为 System.Decimal (不可为 null 的值类型)的成员。
+错误堆栈:
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
+   在 System.Linq.Queryable.Sum[TSource](IQueryable`1 source, Expression`1 selector)
+   在 FineUIPro.Web.mainMenu_HJGL.getrate(String projectId, String unitId) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx.cs:行号 142
+   在 FineUIPro.Web.mainMenu_HJGL.Page_Load(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx.cs:行号 112
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/28/2022 11:29:14
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/28/2022 11:29:14
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:可为空的对象必须具有一个值。
+错误堆栈:
+   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
+   在 System.Nullable`1.get_Value()
+   在 BLL.HJGL_WeldingReportService.GetWelderEfficacy(String projectId) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\HJGL\WeldingManage\HJGL_WeldingReportService.cs:行号 158
+   在 FineUIPro.Web.mainMenu_HJGL.Page_Load(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx.cs:行号 144
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/29/2022 15:59:00
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/29/2022 15:59:00
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 FineUIPro.Web.mainMenu_HJGL.get_PipeRate1() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx.cs:行号 66
+   在 ASP.common_mainmenu_hjgl_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer) 位置 d:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx:行号 150
+   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
+   在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
+   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
+   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
+   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
+   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/29/2022 16:15:39
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/29/2022 16:15:39
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 FineUIPro.Web.mainMenu_HJGL.get_PipeRate1()
+   在 ASP.common_mainmenu_hjgl_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer) 位置 d:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\mainMenu_HJGL.aspx:行号 150
+   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
+   在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
+   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
+   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
+   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
+   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/29/2022 16:16:50
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/29/2022 16:16:50
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT SUM(TotalFilm) AS  TotalFilm, ' 需要参数 '@ProjectId'，但未提供该参数。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 312
+   在 FineUIPro.Web.mainMenu_HJGL.getWeld(String projectId, String unitId)
+   在 FineUIPro.Web.mainMenu_HJGL.Page_Load(Object sender, EventArgs e)
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:10/08/2022 14:26:09
+出错文件:http://localhost:8008/common/mainMenu_HJGL.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:10/08/2022 14:26:09
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 (Object )
+   在 FineUIPro.GridRow.kxpUEMXYxcbykrOznAFBzkoxlAnb()
+   在 (GridRow )
+   在 FineUIPro.GridRow.InitTemplateContainers()
+   在 (GridRow )
+   在 FineUIPro.Grid.BkpgFeAELTFlAvoTrOBrConfcLJbA(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.CRTRkdQFrrBRFQuCddjZPswlTORP(IEnumerable , Boolean )
+   在 (Grid , IEnumerable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.HJGL.WeldingManage.PipelineListPDMSIn.btnImport_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingManage\PipelineListPDMSIn.aspx.cs:行号 744
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:10/08/2022 15:06:24
+出错文件:http://localhost:8008/HJGL/WeldingManage/PipelineListPDMSIn.aspx?UnitWorkId=5c955308-1645-4575-acbf-68dd66c4179a
+IP地址:::1
+操作人员:JT
+
+出错时间:10/08/2022 15:06:24
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 (Object )
+   在 FineUIPro.GridRow.kxpUEMXYxcbykrOznAFBzkoxlAnb()
+   在 (GridRow )
+   在 FineUIPro.GridRow.InitTemplateContainers()
+   在 (GridRow )
+   在 FineUIPro.Grid.BkpgFeAELTFlAvoTrOBrConfcLJbA(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.CRTRkdQFrrBRFQuCddjZPswlTORP(IEnumerable , Boolean )
+   在 (Grid , IEnumerable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.HJGL.WeldingManage.PipelineListPDMSIn.btnImport_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingManage\PipelineListPDMSIn.aspx.cs:行号 744
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:10/08/2022 15:08:07
+出错文件:http://localhost:8008/HJGL/WeldingManage/PipelineListPDMSIn.aspx?UnitWorkId=5c955308-1645-4575-acbf-68dd66c4179a
+IP地址:::1
+操作人员:JT
+
+出错时间:10/08/2022 15:08:07
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 (Object )
+   在 FineUIPro.GridRow.kxpUEMXYxcbykrOznAFBzkoxlAnb()
+   在 (GridRow )
+   在 FineUIPro.GridRow.InitTemplateContainers()
+   在 (GridRow )
+   在 FineUIPro.Grid.BkpgFeAELTFlAvoTrOBrConfcLJbA(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.CRTRkdQFrrBRFQuCddjZPswlTORP(IEnumerable , Boolean )
+   在 (Grid , IEnumerable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.HJGL.WeldingManage.PipelineListPDMSIn.btnImport_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingManage\PipelineListPDMSIn.aspx.cs:行号 744
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:10/08/2022 15:12:38
+出错文件:http://localhost:8008/HJGL/WeldingManage/PipelineListPDMSIn.aspx?UnitWorkId=5c955308-1645-4575-acbf-68dd66c4179a
+IP地址:::1
+操作人员:JT
+
+出错时间:10/08/2022 15:12:38
+
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
index 0aa27f8e..734cba38 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
+++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="09/22/2022 00:44:07" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="10/08/2022 11:29:22" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRGDdJIxGBPkhSIXgks1WU3X"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFqSkg1H3QEwUeSOkG0QSLU"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="PrefabricatedComponents" DataType="System.String" PropName="CH_TrustCode"/>
       <Column Name="PlanStartDate" DataType="System.String" PropName="CH_TrustMan"/>
@@ -112,6 +112,7 @@ namespace FastReport
       <Column Name="AssembleUnit" DataType="System.String"/>
       <Column Name="State" DataType="System.String"/>
       <Column Name="PipelineCode" DataType="System.String"/>
+      <Column Name="QRCode2" DataType="System.String" PropName="Column"/>
     </TableDataSource>
     <TableDataSource Name="Data" ReferenceName="Data.Data" DataType="System.Int32" Enabled="true">
       <Column Name="CH_TrustID" DataType="System.String"/>
@@ -144,42 +145,53 @@ namespace FastReport
   </Dictionary>
   <ReportPage Name="Page1" PaperHeight="150">
     <PageHeaderBand Name="PageHeader1" Width="718.2" Height="45.36"/>
-    <DataBand Name="Data1" Top="49.21" Width="718.2" Height="238.14" DataSource="Table1" Columns.Count="1">
-      <TableObject Name="Table2" Left="56.7" Top="18.9" Width="633.19" Height="189" Border.Lines="All">
+    <DataBand Name="Data1" Top="48.39" Width="718.2" Height="238.14" DataSource="Table1" Columns.Count="1">
+      <TableObject Name="Table2" Left="56.7" Top="18.9" Width="642.64" Height="189" Border.Lines="All">
+        <TableColumn Name="Column3" Width="113.4"/>
         <TableColumn Name="Column1" Width="160.67"/>
-        <TableColumn Name="Column2" Width="292.97"/>
-        <TableColumn Name="Column3" Width="179.55"/>
+        <TableColumn Name="Column2" Width="255.17"/>
+        <TableColumn Name="Column4" Width="113.4"/>
         <TableRow Name="Row1" Height="34.02">
+          <TableCell Name="Cell23" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt" RowSpan="5">
+            <BarcodeObject Name="Barcode1" Left="3.78" Top="47.25" Width="106.55" Height="96.2" AutoSize="false" Text="[Table1.QRCode]" ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="L" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
+            <TextObject Name="Text1" Left="9.45" Top="18.9" Width="94.5" Height="28.35" Text="三维模型定位" HorzAlign="Center" VertAlign="Bottom"/>
+          </TableCell>
           <TableCell Name="Cell1" Text="  预制组件编号：" VertAlign="Bottom" Font="宋体, 11pt"/>
-          <TableCell Name="Cell2" Border.Lines="Bottom" Text="[Table1.PrefabricatedComponents]" VertAlign="Center" Font="宋体, 11pt"/>
-          <TableCell Name="Cell23" Text="三维模型定位" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt"/>
-        </TableRow>
-        <TableRow Name="Row2" Height="34.02">
-          <TableCell Name="Cell6" Text="  管线号：" VertAlign="Bottom" Font="宋体, 11pt"/>
-          <TableCell Name="Cell7" Border.Lines="Bottom" Text="[Table1.PipelineCode]" VertAlign="Center" Font="宋体, 11pt"/>
-          <TableCell Name="Cell24" RowSpan="4">
-            <BarcodeObject Name="Barcode1" Left="28.35" Top="9.45" Width="125.45" Height="124.55" AutoSize="false" Text="[Table1.QRCode]" ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="L" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
+          <TableCell Name="Cell2" Border.Lines="Bottom" Text="[Table1.PipelineComponentCode]" VertAlign="Center" Font="宋体, 11pt"/>
+          <TableCell Name="Cell31" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt" RowSpan="5">
+            <TextObject Name="Text2" Left="9.45" Top="28.35" Width="94.5" Height="18.9" Text="组件验收" HorzAlign="Center" VertAlign="Bottom"/>
+            <BarcodeObject Name="Barcode2" Left="3.78" Top="47.25" Width="106.55" Height="96.2" AutoSize="false" Text="[Table1.QRCode2]" ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="L" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
           </TableCell>
         </TableRow>
+        <TableRow Name="Row2" Height="34.02">
+          <TableCell Name="Cell24" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt"/>
+          <TableCell Name="Cell6" Text="  管线号：" VertAlign="Bottom" Font="宋体, 11pt"/>
+          <TableCell Name="Cell7" Border.Lines="Bottom" Text="[Table1.PipelineCode]" VertAlign="Center" Font="宋体, 11pt"/>
+          <TableCell Name="Cell32" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt"/>
+        </TableRow>
         <TableRow Name="Row3" Height="34.02">
+          <TableCell Name="Cell25"/>
           <TableCell Name="Cell11" Text="  装置名称：" VertAlign="Bottom" Font="宋体, 11pt"/>
           <TableCell Name="Cell12" Border.Lines="Bottom" VertAlign="Center" Font="宋体, 11pt"/>
-          <TableCell Name="Cell25"/>
+          <TableCell Name="Cell33" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt"/>
         </TableRow>
         <TableRow Name="Row4" Height="34.02">
+          <TableCell Name="Cell26"/>
           <TableCell Name="Cell16" Text="  管线计划安装日期：" VertAlign="Bottom" Font="宋体, 11pt"/>
           <TableCell Name="Cell17" Border.Lines="Bottom" Text="[Table1.PlanStartDate]" VertAlign="Center" Font="宋体, 11pt"/>
-          <TableCell Name="Cell26"/>
+          <TableCell Name="Cell34" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt"/>
         </TableRow>
         <TableRow Name="Row5" Height="34.02">
+          <TableCell Name="Cell27"/>
           <TableCell Name="Cell21" Text="  预制单位：" VertAlign="Bottom" Font="宋体, 11pt"/>
           <TableCell Name="Cell22" Border.Lines="Bottom" Text="[Table1.PreUnit]" VertAlign="Center" Font="宋体, 11pt"/>
-          <TableCell Name="Cell27"/>
+          <TableCell Name="Cell35" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt"/>
         </TableRow>
         <TableRow Name="Row6">
+          <TableCell Name="Cell30"/>
           <TableCell Name="Cell28"/>
           <TableCell Name="Cell29"/>
-          <TableCell Name="Cell30"/>
+          <TableCell Name="Cell36"/>
         </TableRow>
       </TableObject>
     </DataBand>
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
index bd9aa95b..667e510b 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
+++ b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="03/13/2022 11:00:20" ReportInfo.Modified="08/25/2022 15:18:24" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/13/2022 11:00:20" ReportInfo.Modified="09/29/2022 10:24:01" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRHcigMA9l4Q8tow2UfS7BN1"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREtq56fxZGt/I6jD6E8jjci"/>
     <TableDataSource Name="Data" ReferenceName="Data" DataType="System.Int32" Enabled="true">
       <Column Name="PipelineComponentId" DataType="System.String"/>
       <Column Name="PipelineComponentCode" DataType="System.String"/>
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
index f73ef6ef..4621d510 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
@@ -258,15 +258,16 @@ namespace FineUIPro.Web.HJGL.PreDesign
         {
             BLL.FastReportService.ResetData();
 
-            string strSql = @"	SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,
+            string strSql = @"			SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,
                                      com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,mat.PrefabricatedComponents,
-									 com.QRCode,com.State,pipe.PlanStartDate,pipe.PipelineCode
+									 com.QRCode,com.State,CONVERT(varchar(100), pipe.PlanStartDate, 23) as PlanStartDate,pipe.PipelineCode,
+									 ('PrePipeline$'+com.PipelineComponentId )as QRCode2
                               FROM HJGL_Pipeline_Component com 
 							  LEFT JOIN HJGL_PipeLineMat mat ON mat.PipeLineMatId=com.PipeLineMatId
 							  LEFT JOIN HJGL_Pipeline pipe  ON pipe.PipelineId =com.PipelineId
 							  LEFT JOIN dbo.Base_Unit punit ON punit.UnitId=com.PreUnit
 							  LEFT JOIN dbo.Base_Unit aunit ON aunit.UnitId=com.AssembleUnit
-							  WHERE com.QRCode!='' ";
+							  WHERE com.QRCode!=''";
             List<SqlParameter> listStr = new List<SqlParameter> { };
 
             strSql += " AND com.PipelineId =@PipelineId";
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx
index 432baf4f..057b082b 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx
@@ -56,8 +56,8 @@
                 <f:FormRow>
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息" Height="350px"
-                            EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true"
-                            AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId"
+                            EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineCode" AllowCellEditing="true"
+                            AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode"
                             AllowSorting="true" SortField="PipelineCode" SortDirection="ASC"
                             AllowPaging="true" IsDatabasePaging="true" PageSize="15" 
                             EnableTextSelection="True" >
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
index 6224e2dd..e7af2d3f 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
@@ -727,7 +727,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// <param name="e"></param>
         protected void btnImport_Click(object sender, EventArgs e)
         {
-            if (State != (int)ButtonState.Check)
+            if (State != (int)ButtonState.Import)
             {
                 ShowNotify("请先审核");
                 return;
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx
index 8b811529..43fc25b7 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx
@@ -33,7 +33,24 @@
                     </div>
                 </div>
             </div>
+<%--            <div class="sub-section sub-section-01">
+                <div class="sub-section-header">
+                    <span class="sub-section-title">工厂预制进度</span>
+                    
+                </div>
+                <div class="sub-section-inner">
+                    <div id="echarts01" class="echarts-box" style="width: 80%; height: 80%;"></div>
+                </div>
+            </div>--%>
             <div class="sub-section sub-section-02">
+                <div class="sub-section-header">
+                    <span class="sub-section-title">管道实时预制率</span>
+                </div>
+                <div class="sub-section-inner">
+                    <div id="echarts02" class="echarts-box" style="width: 80%; height: 80%;"></div>
+                </div>
+            </div>
+            <%--<div class="sub-section sub-section-02">
                 <div class="sub-section-header">
                     <span class="sub-section-title">项目焊接工程量统计</span>
                     <div class="sub-right-select">
@@ -49,11 +66,11 @@
                 <div class="sub-section-inner">
                     <div id="echarts02" class="echarts-box" style="width: 80%; height: 80%;"></div>
                 </div>
-            </div>
+            </div>--%>
             <div class="sub-section sub-section-03">
                 <div class="sub-section-header">
-                    <span class="sub-section-title">焊接缺陷分析</span>
-                    <div class="sub-right-select">
+                    <span class="sub-section-title">焊工功效分析</span>
+                    <%--<div class="sub-right-select">
                         <div class="sub-select-name">
                             <span class="sub-select-value">按分包商</span><span class="dropdown-arrow"></span>
                         </div>
@@ -62,10 +79,12 @@
                             <li class="sub-select-li active" data-type="2">按单位工程</li>
                             <li class="sub-select-li" data-type="3">按材质类别</li>
                         </ul>
-                    </div>
+                    </div>--%>
                 </div>
                 <div class="sub-section-inner">
-                    <div id="echarts03" class="echarts-box"></div>
+                    <%--<div id="echarts03" class="echarts-box"></div>--%>
+                    <div class="real-time-num" runat="server" id="divWelderEfficacyNum">
+                    </div>
                 </div>
             </div>
         </div>
@@ -108,6 +127,7 @@
                 </div>
                 <div class="sub-section-inner">
                     <div id="echarts06" class="echarts-box"></div>
+                    
                 </div>
             </div>
         </div>
@@ -116,16 +136,42 @@
     <script src="../res/indexv1/assets/js/echarts-5.2.0.min.js" type="text/javascript"></script>
     <script src="../res/indexv1/assets/js/draw-circle.js" type="text/javascript"></script>
     <script type="text/javascript">
+        // 施工分包商
+        var dataE05_Type01 = JSON.parse('<%=E05_Type01 %>');
+        var dataE05_Values01_1 = JSON.parse('<%=E05_Values01_1 %>');
+        var dataE05_Values01_2 = JSON.parse('<%=E05_Values01_2 %>');
+        // 单位工程
+        var dataE05_Type02 = JSON.parse('<%=E05_Type02 %>');
+        var dataE05_Values02_1 = JSON.parse('<%=E05_Values02_1 %>');
+        var dataE05_Values02_2 = JSON.parse('<%=E05_Values02_2 %>');
+        // 材料类别
+        var dataE05_Type03 = JSON.parse('<%=E05_Type03 %>');
+        var dataE05_Values03_1 = JSON.parse('<%=E05_Values03_1 %>');
+        var dataE05_Values03_2 = JSON.parse('<%=E05_Values03_2 %>');
+
+
+        var dataE08_Type01 = JSON.parse('<%=E08_Type01 %>');
+        var dataE08_Values01 = JSON.parse('<%=E08_Values01 %>');
+        // 单位工程
+        var dataE08_Type02 = JSON.parse('<%=E08_Type02 %>');
+        var dataE08_Values02 = JSON.parse('<%=E08_Values02 %>');
+        // 材料类别
+        var dataE08_Type03 = JSON.parse('<%=E08_Type03 %>');
+        var dataE08_Values03 = JSON.parse('<%=E08_Values03 %>');
         $(function () {
+            ///一次合格率
+            // 施工分包商
+         
             $('.sub-section-02 ul li').click(function () {
                 var value = $(this).text()
                 var type = $(this).attr('data-type')
                 $(this).parent('ul').siblings('.sub-select-name').find('.sub-select-value').text(value)
-                if (type == '1') {
+               <%-- if (type == '1') {
                     initEchart02({ canvasId: 'echarts02', y: <%=Dy1 %>, n: <%=Dy2 %> })
                 } else if (type == '2') {
-                    initEchart02({ canvasId: 'echarts02', y: <%=HK1 %>, n: <%=HK2 %> })
-                }
+                     initEchart02({ canvasId: 'echarts02', y: <%=HK1 %>, n: <%=HK2 %> })
+                 }--%>
+                initEchart02({ canvasId: 'echarts02', y: <%=PipeRate1 %>, n: <%=PipeRate2 %> })
             })
             $('.sub-section-03 ul li').click(function () {
                 var value = $(this).text()
@@ -146,33 +192,35 @@
                 } else if (type == '3') {
                     initEchart03({ name: '按材质类别', value: [50, 150, 70, 160, 75, 5], indicator: indicator })
                 }
+               // initEchart02({ canvasId: 'echarts03', y: <%=PipeRate1 %>, n: <%=PipeRate2 %> })
+
             }) 
             $('.sub-section-04 ul li').click(function () {
                 var type = $(this).attr('data-type')
                 $(this).addClass('active').siblings().removeClass('active')
                 if (type == 'fbs') {
-                    var data = [40, 90, 83, 95, 80, 40, 90, 83, 95, 80, 40]
-                    initEchart04(data)
+                    // 分包商
+                    initEchart04(dataE08_Type01, dataE08_Values01)
                 } else if (type == 'dwgc') {
-                    var data = [80, 90, 83, 55, 80, 40, 20, 83, 95, 80, 60]
-                    initEchart04(data)
+                    // 单位工程
+                    initEchart04(dataE08_Type02, dataE08_Values02)
                 } else if (type == 'czlb') {
-                    var data = [120, 30, 83, 95, 80, 40, 10, 83, 95, 80, 20]
-                    initEchart04(data)
+                    // 材质类别
+                    initEchart04(dataE08_Type03, dataE08_Values03)
                 }
             })
             $('.sub-section-05 ul li').click(function () {
                 var type = $(this).attr('data-type')
                 $(this).addClass('active').siblings().removeClass('active')
                 if (type == 'fbs') {
-                    var data = [100, 50, 100, 100, 100, 100, 100, 50, 100, 100, 100];
-                    initEchart05(data)
+                    // 分包商
+                    initEchart05(dataE05_Type01, dataE05_Values01_1, dataE05_Values01_2)
                 } else if (type == 'dwgc') {
-                    var data = [20, 50, 100, 100, 100, 45, 100, 50, 100, 100, 34];
-                    initEchart05(data)
+                    // 单位工程
+                    initEchart05(dataE05_Type02, dataE05_Values02_1, dataE05_Values02_2)
                 } else if (type == 'czlb') {
-                    var data = [40, 50, 100, 100, 34, 100, 100, 50, 100, 100, 45];
-                    initEchart05(data)
+                    // 材质类别
+                    initEchart05(dataE05_Type03, dataE05_Values03_1, dataE05_Values03_2)
                 }
             })
             $('.sub-section-06 ul li').click(function () {
@@ -351,12 +399,12 @@
                 });
             }
 
-            function initEchart04(data) {
+            function initEchart04(xAxisData,data) {
                 var chartDom = document.getElementById('echarts04');
                 var myChart = echarts.init(chartDom);
                 var option;
 
-                var xAxisData = ['类型1', '类型2', '类型3', '类型4', '类型5', '类型6', '类型7', '类型8', '类型9', '类型10', '类型11']
+                //xAxisData = ['类型1', '类型2', '类型3', '类型4', '类型5', '类型6', '类型7', '类型8', '类型9', '类型10', '类型11']
                 option = {
                     tooltip: {
                         trigger: 'axis',
@@ -452,18 +500,18 @@
                 });
             }
 
-            function initEchart05(data) {
+            function initEchart05(xAxisData, data1, data2) {
                 var chartDom = document.getElementById('echarts05');
-                var myChart = echarts.init(chartDom);
+                var myChart = echarts.init(chartDom, null);
                 var option;
-                var xAxisData = ['类型1', '类型2', '类型3', '类型4', '类型5', '类型6', '类型7', '类型8', '类型9', '类型10', '类型11'];
+
                 option = {
-                    color: ['#4989fb'],
+                    color: ['#1ab1ff', '#4cffc3'],
                     grid: {
-                        top: '10%',
+                        top: '15%',
                         left: '3%',
                         right: '3%',
-                        bottom: '2%',
+                        bottom: '5%',
                         containLabel: true
                     },
                     tooltip: {
@@ -473,11 +521,30 @@
                             type: 'shadow'
                         }
                     },
+                    legend: {
+                        top: '4%',
+                        left: 'center',
+                        textStyle: {
+                            // fontSize: 12,//字体大小
+                        },
+                        data: [{
+                            name: '焊口数', icon: 'roundRect', textStyle: {
+                                color: '#1ab1ff'
+                            }
+                        }, {
+                            name: '完成焊口数', icon: 'roundRect', textStyle: {
+                                color: '#4cffc3'
+                            }
+                        }],
+                        itemWidth: 18, //图例的宽度
+                        itemHeight: 10, //图例的高度
+                    },
                     xAxis: {
                         data: xAxisData,
                         boundaryGap: true,
                         axisLabel: {
-                            color: '#1ab1ff',
+                            color: '#00b7f8',
+                            interval: 0,
                         },
                         axisTick: {
                             show: false,
@@ -485,7 +552,7 @@
                         axisLine: {
                             onZero: true,
                             lineStyle: {
-                                color: '#1ab1ff',
+                                color: '#00b7f8',
                                 width: 1,
                             }
                         },
@@ -493,8 +560,7 @@
                     yAxis: {
                         type: 'value',
                         axisLabel: {
-                            show: true,
-                            color: '#1ab1ff',
+                            color: '#00b7f8',
                         },
                         axisTick: {
                             show: false,
@@ -503,28 +569,53 @@
                             show: true,
                             lineStyle: {
                                 type: 'dashed',
-                                color: '#0d3760        ',
+                                color: '#2e87ac',
                             },
                         },
                         splitNumber: 5,
                     },
                     series: [
                         {
-                            name: '焊接进度分析',
+                            name: '焊口数',
                             type: 'bar',
                             barWidth: 20,
-                            data: data,
+                            data: data1,
+                            barGap: '10%',/*多个并排柱子设置柱子之间的间距*/
                             itemStyle: {
+                                color: '#1ab1ff',
                                 emphasis: {
                                     barBorderRadius: [10, 10, 0, 0],
                                 },
                                 normal: {
                                     barBorderRadius: [10, 10, 0, 0],
                                     color: new echarts.graphic.LinearGradient(
-                                        0, 1, 1, 0,
+                                        1, 1, 1, 0,
                                         [
-                                            { offset: 0, color: '#4989fb' },
-                                            { offset: 1, color: '#18fbfd' }
+                                            { offset: 0, color: '#4a88fb' },
+                                            { offset: 1, color: '#1af6fd' }
+                                        ]
+                                    )
+                                }
+                            }
+                        },
+                        {
+                            name: '完成焊口数',
+                            type: 'bar',
+                            barWidth: 20,
+                            data: data2,
+                            barGap: '10%',/*多个并排柱子设置柱子之间的间距*/
+                            itemStyle: {
+                                color: '#4cffc3',
+                                emphasis: {
+                                    barBorderRadius: [10, 10, 0, 0],
+                                },
+                                normal: {
+                                    barBorderRadius: [10, 10, 0, 0],
+                                    color: new echarts.graphic.LinearGradient(
+                                        1, 1, 1, 0,
+                                        [
+                                            { offset: 0, color: '#4affc6' },
+                                            { offset: 1, color: '#18fdf9' }
                                         ]
                                     )
                                 }
@@ -532,13 +623,13 @@
                         },
                     ]
                 };
+
                 myChart.clear();//清空
                 option && myChart.setOption(option);
 
                 window.addEventListener("resize", function () {
                     myChart.resize();
                 });
-
             }
 
             function initEchart06(data) {
@@ -641,8 +732,9 @@
                     myChart.resize();
                 });
             }
-
-            initEchart02({ canvasId: 'echarts02', y: <%=Dy1 %>, n: <%=Dy2 %>  })
+           // initEchart02({ canvasId: 'echarts01', y: <%=GCRate1 %>, n: <%=GCRate2 %>  })
+           // initEchart02({ canvasId: 'echarts02', y: <%=XCRate1 %>, n: <%=XCRate2 %>  })
+           initEchart02({ canvasId: 'echarts02', y: <%=PipeRate1 %>, n: <%=PipeRate2 %>  })
             // 03的数值
             var indicator = [
                 { text: '问题1', max: 150, },
@@ -652,11 +744,10 @@
                 { text: '问题3', max: 150, },
                 { text: '问题2', max: 150, }
             ]
-            initEchart03({ name: '按分包商', value: [130, 93, 50, 90, 70, 60], indicator: indicator })
-            var data = [40, 90, 83, 95, 80, 40, 90, 83, 95, 80, 40]
-            initEchart04(data)
+           // initEchart03({ name: '按分包商', value: [130, 93, 50, 90, 70, 60], indicator: indicator })
+            initEchart04(dataE08_Type01, dataE08_Values01)
             var data = [100, 50, 100, 100, 100, 100, 100, 50, 100, 100, 100];
-            initEchart05(data)
+            initEchart05(dataE05_Type01, dataE05_Values01_1, dataE05_Values01_2)
             var data = [40, 90, 83, 95, 80, 40, 90, 83, 95, 80, 40]
             initEchart06(data)
         })
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
index 3aa7d686..f31dc10a 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
@@ -1,4 +1,5 @@
 using BLL;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -9,6 +10,118 @@ namespace FineUIPro.Web
 {
     public partial class mainMenu_HJGL : PageBase
     {
+        #region 定义集合
+        /// <summary>
+        /// 项目单位集合
+        /// </summary>
+        protected static List<Model.Project_ProjectUnit> getProjectUnitList = new List<Model.Project_ProjectUnit>();
+        /// <summary>
+        /// 所有焊口集合
+        /// </summary>
+        protected static List<Model.HJGL_WeldJoint> getAllJotList = new List<Model.HJGL_WeldJoint>();
+        /// <summary>
+        /// 所有管线集合
+        /// </summary>
+        protected static List<Model.HJGL_Pipeline> getAllJIsoInfoList = new List<Model.HJGL_Pipeline>();
+        /// <summary>
+        /// 所有焊接焊口集合
+        /// </summary>
+        protected static List<Model.HJGL_WeldJoint> getFinishedJotList = new List<Model.HJGL_WeldJoint>();
+        /// <summary>
+        /// 当日焊接焊口集合
+        /// </summary>
+        protected static List<Model.HJGL_WeldJoint> getNowJotList = new List<Model.HJGL_WeldJoint>();
+        /// <summary>
+        /// 焊接检测单明细集合
+        /// </summary>
+        protected static List<Model.sp_index_HJGLItem> getCH_CheckItemList = new List<Model.sp_index_HJGLItem>();
+        /// <summary>
+        /// 所有焊工集合
+        /// </summary>
+        protected static IQueryable<Model.SitePerson_Person> getAllWelderList;
+        /// <summary>
+        /// 项目ID
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        #region 工厂预制进度
+        public decimal GCRate1
+        {
+            get
+            {
+                return (decimal)ViewState["GCRate"];
+            }
+            set
+            {
+                ViewState["GCRate"] = value;
+            }
+        }
+        public decimal GCRate2
+        {
+            get
+            {
+                return (decimal)ViewState["GCRate2"];
+            }
+            set
+            {
+                ViewState["GCRate2"] = value;
+            }
+        }
+        #endregion
+        #region 现场安装进度
+        public decimal XCRate1
+        {
+            get
+            {
+                return (decimal)ViewState["XCRate1"];
+            }
+            set
+            {
+                ViewState["XCRate1"] = value;
+            }
+        }
+        public decimal XCRate2
+        {
+            get
+            {
+                return (decimal)ViewState["XCRate2"];
+            }
+            set
+            {
+                ViewState["XCRate2"] = value;
+            }
+        }
+        #endregion
+        #region 管道实时预制率
+
+        public decimal PipeRate1
+        {
+            get
+            {
+                return BLL.HJGL_WeldingReportService.GetPipeRate_finished(this.CurrUser.LoginProjectId);
+            }
+         
+        }
+        public decimal PipeRate2
+        {
+            get
+            {
+                return BLL.HJGL_WeldingReportService.GetPipeRate_unfinished(this.CurrUser.LoginProjectId);
+            }
+ 
+        }
+        #endregion
         #region 项目焊接工程量统计
         public decimal Dy1
         {
@@ -63,13 +176,116 @@ namespace FineUIPro.Web
         /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
         {
-            string projectId = this.CurrUser.LoginProjectId;
+            this.ProjectId = this.CurrUser.LoginProjectId;
             string unitId = this.CurrUser.UnitId;
-            this.getWeld(projectId, unitId);
-            this.SetWorkNum(projectId, unitId);
+            var getWeldReportMain = from x in Funs.DB.HJGL_WeldingDaily
+                                    where x.ProjectId == this.ProjectId
+                                    select x;
+            getProjectUnitList = (from x in Funs.DB.Project_ProjectUnit
+                                  where x.ProjectId == this.ProjectId && (x.UnitType == Const.ProjectUnitType_1 || x.UnitType == Const.ProjectUnitType_2)
+                                  select x).ToList();
+            ////管线集合
+            getAllJIsoInfoList = (from x in Funs.DB.HJGL_Pipeline
+                                  where x.ProjectId == this.ProjectId
+                                  select x).ToList();
+            ////总焊口
+            getAllJotList = (from x in Funs.DB.HJGL_WeldJoint
+                             where x.ProjectId == this.ProjectId
+                             select x).ToList();
+            ////完成焊口
+            getFinishedJotList = (from x in getAllJotList
+                                  where x.WeldingDailyId != null
+                                  select x).ToList();
+            ////当日焊接
+            getNowJotList = (from x in getFinishedJotList
+                             join y in getWeldReportMain on x.WeldingDailyId equals y.WeldingDailyId
+                             where y.WeldingDate.Value.Year== DateTime.Now.Year && y.WeldingDate.Value.Month == DateTime.Now.Month && y.WeldingDate.Value.Day == DateTime.Now.Day
+                             select x).ToList();
+
+            ////焊接检测单明细
+            getCH_CheckItemList = (from x in Funs.DB.HJGL_Batch_NDEItem
+                                   join y in Funs.DB.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
+                                   join z in Funs.DB.HJGL_WeldJoint on y.WeldJointId equals z.WeldJointId
+                                   join line in Funs.DB.HJGL_Pipeline on z.PipelineId equals line.PipelineId
+                                   where z.ProjectId == this.ProjectId
+                                   select new Model.sp_index_HJGLItem
+                                   {
+                                       ProjectId = line.ProjectId,
+                                       ID = x.NDEItemID,
+                                       UnitId = line.UnitId,  ///重定义单位
+                                       WorkAreaId = line.UnitId, /// 重定义区域
+                                       MaterialId = line.UnitWorkId,  ///重定义材质
+                                       CHT_TotalFilm = x.TotalFilm,
+                                       CHT_PassFilm = x.PassFilm
+                                   }).ToList();
+            ////总焊工
+            getAllWelderList = from x in Funs.DB.SitePerson_Person
+                               where x.ProjectId == this.ProjectId && x.WorkPostId=="19B8F2A9-28D3-4F20-867A-1B2237C2E228"
+                               select x;
+
+            this.getrate(this.ProjectId, unitId);
+            this.getWeld(this.ProjectId, unitId);
+            this.SetWorkNum(this.ProjectId, unitId);
+            getecharts04();
+            getecharts05();
+            getecharts06();
+            this.divWelderEfficacyNum.InnerText = BLL.HJGL_WeldingReportService.GetWelderEfficacy(this.CurrUser .LoginProjectId).ToString() ;
 
         }
 
+        private void getrate(string projectId, string unitId)
+        {
+            this.GCRate1 = 0;
+            this.GCRate2 = 0;
+            this.XCRate1 = 0;
+            this.XCRate2 = 0;
+            
+            decimal allGC = 0;
+            decimal allXC = 0;
+            var getWelds = Funs.DB.HJGL_WeldJoint.Where(x => x.ProjectId == projectId);
+            if (!string.IsNullOrEmpty(this.CurrUser.UnitId) )
+            {
+                //getWelds = from x in getWelds
+                //           join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId
+                //           where y.UnitId == unitId
+                //           select x;
+            }
+            if (getWelds.Count() > 0)
+            {
+                decimal allDy = getWelds.Sum(x => x.Size ?? 0); //项目总达因数
+
+                if (getWelds.Where(x => x.JointAttribute == "预制口").Count()>0)
+                {
+                     allGC = getWelds.Where(x => x.JointAttribute == "预制口").Sum(x => x.Size ?? 0);
+                }
+                if (getWelds.Where(x => x.JointAttribute == "安装口") .Count() > 0)
+                {
+                    allXC = getWelds.Where(x => x.JointAttribute == "安装口").Sum(x => x.Size ?? 0);
+                }
+                var getWeldsOk = getWelds.Where(x => x.WeldingDailyId != null);
+                if (getWeldsOk.Count()>0)
+                {
+                    var GCModel = getWeldsOk.Where(x => x.JointAttribute == "预制口");
+                    if (GCModel.Count() > 0)
+                    {
+                        GCRate1 = GCModel.Sum(x => x.Size ?? 0);
+                      //  PipeRate1 = GCRate1;
+
+                    }
+                    var XCModel = getWeldsOk.Where(x => x.JointAttribute == "安装口");
+                    if (XCModel.Count() > 0)
+                    {
+                        XCRate1 = XCModel.Sum(x => x.Size ?? 0);
+
+                    }
+                }
+                GCRate2 = allGC - GCRate1;
+                XCRate2 = allXC - XCRate1;
+               // PipeRate2 = allDy - PipeRate1;
+
+            }
+
+        }
         #region 焊工现场统计
         /// <summary>
         /// 焊工现场统计
@@ -146,5 +362,348 @@ namespace FineUIPro.Web
             }
         }
         #endregion
+
+        #region 焊接一次合格率
+        protected string E08_Type01;
+        protected string E08_Values01;
+
+        protected string E08_Type02;
+        protected string E08_Values02;
+
+        protected string E08_Type03;
+        protected string E08_Values03;
+        /// <summary>
+        ///  焊接一次合格率
+        /// </summary>
+        protected void getecharts04()
+        {
+            E08_Type01 = "[]";
+            E08_Values01 = "[]";
+
+            E08_Type02 = "[]";
+            E08_Values02 = "[]";
+
+            E08_Type03 = "[]";
+            E08_Values03 = "[]";
+            double PassRate = 0;
+            int current_pass_film = 0;
+            int cht_totalfilm = 0;
+            //// 按单位
+            List<string> type01List = new List<string>();
+            List<double> count011List = new List<double>();
+            foreach (var itemUnit in getProjectUnitList)
+            {
+                string unitName = UnitService.GetUnitNameByUnitId(itemUnit.UnitId);
+                type01List.Add(unitName);
+                var getUJots = from x in getCH_CheckItemList
+                               where x.UnitId == itemUnit.UnitId
+                               select x;
+                PassRate = 0;
+                current_pass_film = getUJots.Sum(x => x.CHT_PassFilm) ?? 0;
+                cht_totalfilm = getUJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+                if (cht_totalfilm > 0)
+                {
+                    PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
+                }
+                count011List.Add(PassRate);
+            }
+            if (type01List.Count() > 0)
+            {
+                E08_Type01 = JsonConvert.SerializeObject(type01List);
+                E08_Values01 = JsonConvert.SerializeObject(count011List);
+            }
+            ///按单位工程           
+            List<string> type02List = new List<string>();
+            List<double> count021List = new List<double>();
+            var getWorkAreas = from x in Funs.DB.WBS_UnitWork
+                               where x.ProjectId == this.ProjectId
+                               select x;
+            foreach (var itemWorkArea in getWorkAreas)
+            {
+                type02List.Add(itemWorkArea.UnitWorkName);
+                var getWJots = from x in getCH_CheckItemList
+                               where x.WorkAreaId == itemWorkArea.UnitWorkId
+                               select x;
+
+                PassRate = 0;
+                current_pass_film = getWJots.Sum(x => x.CHT_PassFilm) ?? 0;
+                cht_totalfilm = getWJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+                if (cht_totalfilm > 0)
+                {
+                    PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
+                }
+                count021List.Add(PassRate);
+            }
+            if (type02List.Count() > 0)
+            {
+                E08_Type02 = JsonConvert.SerializeObject(type02List);
+                E08_Values02 = JsonConvert.SerializeObject(count021List);
+            }
+
+            ///按材质类别
+            List<string> type03List = new List<string>();
+            List<double> count031List = new List<double>();
+            var getMaterials = from x in Funs.DB.Base_Material
+                               join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId
+                               where y.ProjectId == this.ProjectId
+                               select x;
+            foreach (var itemMaterial in getMaterials)
+            {
+                string code = itemMaterial.MaterialCode;
+                type03List.Add(code);
+                var getMJots = from x in getCH_CheckItemList
+                               where x.MaterialId == itemMaterial.MaterialId
+                               select x;
+
+                PassRate = 0;
+                current_pass_film = getMJots.Sum(x => x.CHT_PassFilm) ?? 0;
+                cht_totalfilm = getMJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+                if (cht_totalfilm > 0)
+                {
+                    PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
+                }
+                count031List.Add(PassRate);
+            }
+            if (type03List.Count() > 0)
+            {
+                E08_Type03 = JsonConvert.SerializeObject(type03List);
+                E08_Values03 = JsonConvert.SerializeObject(count031List);
+            }
+        }
+
+        #endregion
+
+        #region 焊接进度分析
+        protected string E05_Type01;
+        protected string E05_Values01_1;
+        protected string E05_Values01_2;
+
+        protected string E05_Type02;
+        protected string E05_Values02_1;
+        protected string E05_Values02_2;
+
+        protected string E05_Type03;
+        protected string E05_Values03_1;
+        protected string E05_Values03_2;
+        /// <summary>
+        ///  焊接进度分析
+        /// </summary>
+        protected void getecharts05()
+        {
+            E05_Type01 = "[]";
+            E05_Values01_1 = "[]";
+            E05_Values01_2 = "[]";
+            E05_Type02 = "[]";
+            E05_Values02_1 = "[]";
+            E05_Values02_2 = "[]";
+
+            E05_Type03 = "[]";
+            E05_Values03_1 = "[]";
+            E05_Values03_2 = "[]";
+
+            //// 按单位
+            List<string> type01List = new List<string>();
+            List<int> count011List = new List<int>();
+            List<int> count012List = new List<int>();
+            foreach (var itemUnit in getProjectUnitList)
+            {
+                string unitName = UnitService.GetUnitNameByUnitId(itemUnit.UnitId);
+                type01List.Add(unitName);
+                var getUJots = from x in getAllJotList
+                               join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+                               where y.UnitId == itemUnit.UnitId
+                               select x;
+                count011List.Add(getUJots.Count());
+                var getUCJots = from x in getFinishedJotList
+                                join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+                                where y.UnitId == itemUnit.UnitId
+                                select x;
+                count012List.Add(getUCJots.Count());
+            }
+            if (type01List.Count() > 0)
+            {
+                E05_Type01 = JsonConvert.SerializeObject(type01List);
+                E05_Values01_1 = JsonConvert.SerializeObject(count011List);
+                E05_Values01_2 = JsonConvert.SerializeObject(count012List);
+            }
+            ///按单位工程           
+            List<string> type02List = new List<string>();
+            List<int> count021List = new List<int>();
+            List<int> count022List = new List<int>();
+            var getWorkAreas = from x in Funs.DB.WBS_UnitWork
+                               where x.ProjectId == this.ProjectId
+                               select x;
+            foreach (var itemWorkArea in getWorkAreas)
+            {
+                type02List.Add(itemWorkArea.UnitWorkName);
+                var getWJots = from x in getAllJotList
+                               join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+                               where y.UnitWorkId == itemWorkArea.UnitWorkId
+                               select x;
+                count021List.Add(getWJots.Count());
+                var getWCJots = from x in getFinishedJotList
+                                join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+                                where y.UnitWorkId == itemWorkArea.UnitWorkId
+                                select x;
+                count022List.Add(getWCJots.Count());
+            }
+            if (type02List.Count() > 0)
+            {
+                E05_Type02 = JsonConvert.SerializeObject(type02List);
+                E05_Values02_1 = JsonConvert.SerializeObject(count021List);
+                E05_Values02_2 = JsonConvert.SerializeObject(count022List);
+            }
+
+            ///按材质类别
+            List<string> type03List = new List<string>();
+            List<int> count031List = new List<int>();
+            List<int> count032List = new List<int>();
+            var getMaterials = (from x in Funs.DB.Base_Material
+                               join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId  
+                               where y.ProjectId == this.ProjectId
+                               select x).ToList().Distinct();
+            foreach (var itemMaterial in getMaterials)
+            {
+                string code = itemMaterial.MaterialCode;
+                type03List.Add(code);
+                var getWJots = from x in getAllJotList
+                               join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+                               where y.MaterialId == itemMaterial.MaterialId
+                               select x;
+                count031List.Add(getWJots.Count());
+                var getWCJots = from x in getFinishedJotList
+                                join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
+                                where y.MaterialId == itemMaterial.MaterialId
+                                select x;
+                count032List.Add(getWCJots.Count());
+            }
+            if (type03List.Count() > 0)
+            {
+                E05_Type03 = JsonConvert.SerializeObject(type03List);
+                E05_Values03_1 = JsonConvert.SerializeObject(count031List);
+                E05_Values03_2 = JsonConvert.SerializeObject(count032List);
+            }
+        }
+        #endregion
+
+        #region 焊工业绩分析
+        protected string E06_Type01;
+        protected string E06_Values01;
+        protected string E06_Type02;
+        protected string E06_Values02;
+        protected string E06_Type03;
+        protected string E06_Values03;
+        /// <summary>
+        ///  焊工业绩分析
+        /// </summary>
+        protected void getecharts06()
+        {
+            E06_Type01 = "[]";
+            E06_Values01 = "[]";
+            E06_Type02 = "[]";
+            E06_Values02 = "[]";
+            E06_Type03 = "[]";
+            E06_Values03 = "[]";
+            double PassRate = 0;
+            int current_pass_film = 0;
+            int cht_totalfilm = 0;
+            var allwelder = from x in Funs.DB.SitePerson_Person
+                            join y in Funs.DB.HJGL_WeldJoint on x.PersonId equals y.CoverWelderId
+                            join z in Funs.DB.HJGL_WeldingDaily on y.WeldingDailyId equals z.WeldingDailyId
+                            join m in Funs.DB.HJGL_Pipeline on y.PipelineId equals m.PipelineId
+                            where x.WorkPostId == "19B8F2A9-28D3-4F20-867A-1B2237C2E228"
+                            group new { x,y,z,m} by new {x.UnitId,z.UnitWorkId,m.MaterialId ,y.Size} into tt
+                            select new
+                            {
+                                Size =(tt.Sum(x=>x.y.Size)==null)?0: tt.Sum(x => x.y.Size),
+                                UnitId = tt.Key.UnitId,
+                                MaterialId = tt.Key.MaterialId,
+                                UnitWorkId=tt.Key.UnitWorkId,
+                            };
+
+            //// 按单位
+            List<string> type01List = new List<string>();
+            List<double> count011List = new List<double>();
+            foreach (var itemUnit in getProjectUnitList)
+            {
+                string unitName = UnitService.GetUnitNameByUnitId(itemUnit.UnitId);
+                type01List.Add(unitName);
+                var getUJots = from x in getCH_CheckItemList
+                               where x.UnitId == itemUnit.UnitId
+                               select x;
+                PassRate = 0;
+                current_pass_film = getUJots.Sum(x => x.CHT_PassFilm) ?? 0;
+                cht_totalfilm = getUJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+                if (cht_totalfilm > 0)
+                {
+                    PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
+                }
+                count011List.Add(PassRate);
+            }
+            if (type01List.Count() > 0)
+            {
+                E08_Type01 = JsonConvert.SerializeObject(type01List);
+                E08_Values01 = JsonConvert.SerializeObject(count011List);
+            }
+            ///按单位工程           
+            List<string> type02List = new List<string>();
+            List<double> count021List = new List<double>();
+            var getWorkAreas = from x in Funs.DB.WBS_UnitWork
+                               where x.ProjectId == this.ProjectId
+                               select x;
+            foreach (var itemWorkArea in getWorkAreas)
+            {
+                type02List.Add(itemWorkArea.UnitWorkName);
+                var getWJots = from x in getCH_CheckItemList
+                               where x.WorkAreaId == itemWorkArea.UnitWorkId
+                               select x;
+
+                PassRate = 0;
+                current_pass_film = getWJots.Sum(x => x.CHT_PassFilm) ?? 0;
+                cht_totalfilm = getWJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+                if (cht_totalfilm > 0)
+                {
+                    PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
+                }
+                count021List.Add(PassRate);
+            }
+            if (type02List.Count() > 0)
+            {
+                E08_Type02 = JsonConvert.SerializeObject(type02List);
+                E08_Values02 = JsonConvert.SerializeObject(count021List);
+            }
+
+            ///按材质类别
+            List<string> type03List = new List<string>();
+            List<double> count031List = new List<double>();
+            var getMaterials = from x in Funs.DB.Base_Material
+                               join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId
+                               where y.ProjectId == this.ProjectId
+                               select x;
+            foreach (var itemMaterial in getMaterials)
+            {
+                string code = itemMaterial.MaterialCode;
+                type03List.Add(code);
+                var getMJots = from x in getCH_CheckItemList
+                               where x.MaterialId == itemMaterial.MaterialId
+                               select x;
+
+                PassRate = 0;
+                current_pass_film = getMJots.Sum(x => x.CHT_PassFilm) ?? 0;
+                cht_totalfilm = getMJots.Sum(x => x.CHT_TotalFilm) ?? 0;
+                if (cht_totalfilm > 0)
+                {
+                    PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
+                }
+                count031List.Add(PassRate);
+            }
+            if (type03List.Count() > 0)
+            {
+                E08_Type03 = JsonConvert.SerializeObject(type03List);
+                E08_Values03 = JsonConvert.SerializeObject(count031List);
+            }
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.designer.cs
index 3b5dd5bb..3bbc9ffb 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web {
-    
-    
-    public partial class mainMenu_HJGL {
-        
+namespace FineUIPro.Web
+{
+
+
+    public partial class mainMenu_HJGL
+    {
+
         /// <summary>
         /// Head1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// divPassRate 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divPassRate;
-        
+
         /// <summary>
         /// divWelderNum 控件。
         /// </summary>
@@ -38,5 +40,14 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divWelderNum;
+
+        /// <summary>
+        /// divWelderEfficacyNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divWelderEfficacyNum;
     }
 }
diff --git a/SGGL/Model/HJGL/sp_index_HJGLItem.cs b/SGGL/Model/HJGL/sp_index_HJGLItem.cs
new file mode 100644
index 00000000..fedebdbc
--- /dev/null
+++ b/SGGL/Model/HJGL/sp_index_HJGLItem.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Model
+{
+    /// <summary>
+    /// 项目管线未达焊接比例
+    /// </summary>
+    public class sp_index_HJGLItem
+    {
+        public string ProjectId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ID
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string strValues
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string strTitles
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UnitId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string WorkAreaId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string MaterialId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? CHT_PassFilm
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? CHT_TotalFilm
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj
index d08efe74..0a981a1b 100644
--- a/SGGL/Model/Model.csproj
+++ b/SGGL/Model/Model.csproj
@@ -166,6 +166,7 @@
     <Compile Include="HJGL\PointBatch.cs" />
     <Compile Include="HJGL\PointBatchItem.cs" />
     <Compile Include="HJGL\SpWeldingDailyItem.cs" />
+    <Compile Include="HJGL\sp_index_HJGLItem.cs" />
     <Compile Include="HSSE\DigDataHSEDataCollectItem.cs" />
     <Compile Include="HSSE\PageDataPersonInOutItem.cs" />
     <Compile Include="HSSE\WorkPostStatisticItem.cs" />