diff --git a/CreateModel.bat b/CreateModel.bat
index 27ceb4a..2f27853 100644
--- a/CreateModel.bat
+++ b/CreateModel.bat
@@ -25,9 +25,9 @@ REM --------------
 
 @echo 设置.net控制台环境
 @echo.
-@call "%VS150%"
+@call "%VS100COMNTOOLS%"vsvars32.bat
 
-SqlMetal /views  /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
 
 @ECHO 完成
 pause
diff --git a/DataBase/hjglDB_7_2024.06.25.rar b/DataBase/hjglDB_7_2024.06.25.rar
new file mode 100644
index 0000000..b389741
Binary files /dev/null and b/DataBase/hjglDB_7_2024.06.25.rar differ
diff --git a/DataBase/hjglDB_7_2024.06.26.rar b/DataBase/hjglDB_7_2024.06.26.rar
new file mode 100644
index 0000000..fe83b40
Binary files /dev/null and b/DataBase/hjglDB_7_2024.06.26.rar differ
diff --git a/HJGL/BLL/WeldingProcess/TrustManage/Batch_BatchTrustItemService.cs b/HJGL/BLL/WeldingProcess/TrustManage/Batch_BatchTrustItemService.cs
index 2447db9..98a0a11 100644
--- a/HJGL/BLL/WeldingProcess/TrustManage/Batch_BatchTrustItemService.cs
+++ b/HJGL/BLL/WeldingProcess/TrustManage/Batch_BatchTrustItemService.cs
@@ -100,7 +100,33 @@ namespace BLL
             Model.Batch_BatchTrustItem update = db.Batch_BatchTrustItem.FirstOrDefault(e => e.TrustBatchItemId == trustBatchItemId);
             if (update != null)
             {
-                update.IsCancelTrust = isCancelTrust;
+                var updatePoint = db.Batch_PointBatchItem.FirstOrDefault(e => e.PointBatchItemId == update.PointBatchItemId);
+                if (updatePoint != null)
+                {
+                    updatePoint.PointDate = null;
+                    updatePoint.PointState = null;
+                    updatePoint.CutDate = null;////鏇存柊鎵规槑缁� 鍒囬櫎鏃ユ湡
+                    updatePoint.IsBuildTrust = null;
+                    updatePoint.JLAudit = null;
+                    updatePoint.GLGSAudit = null;
+                    updatePoint.QTAudit = null;
+                }
+                var item = from x in db.Batch_BatchTrustItem where x.TrustBatchId == update.TrustBatchId select x;
+                // 琛ㄧず杩欎釜鎵归噷鍙湁瀹冧竴鏉℃槑缁�,鍒犻櫎涓昏〃
+                if (item.Count() == 1)
+                {
+                    Model.Batch_BatchTrust delTrust = db.Batch_BatchTrust.FirstOrDefault(x => x.TrustBatchId == update.TrustBatchId);
+                    db.Batch_BatchTrustItem.DeleteOnSubmit(update);
+                    if (delTrust != null)
+                    {
+                        db.Batch_BatchTrust.DeleteOnSubmit(delTrust);
+                    }
+                }
+                else
+                {
+                    db.Batch_BatchTrustItem.DeleteOnSubmit(update);
+                }
+                //update.IsCancelTrust = isCancelTrust;
                 db.SubmitChanges();
             }
         }
diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config
index 8868ed3..23f0894 100644
--- a/HJGL/FineUIPro.Web/Web.config
+++ b/HJGL/FineUIPro.Web/Web.config
@@ -23,7 +23,7 @@
     <add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
     <add key="APPUrl" value="https://www.pgyer.com/pWSd111"/>
     <add key="Https" value="false"/>
-    <add key="UsingUnit" value="TCC11"/>
+    <add key="UsingUnit" value="TCC7"/>
   </appSettings>
   <!--
     鏈夊叧 web.config 鏇存敼鐨勮鏄庯紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkId=235367銆�
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs
index c2fd1c4..7d2a107 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs
@@ -535,7 +535,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                             //琛�0
                             CellRangeAddress region = new CellRangeAddress(rowIndex, rowIndex + 3, 0, 2);
                             ws.AddMergedRegion(region);
-                            ws.GetRow(rowIndex).GetCell(0).SetCellValue(tbTitle.Rows[0]["PipelineCode"].ToString());
+                            ws.GetRow(rowIndex).GetCell(0).SetCellValue("NDE-001");
                             ws.GetRow(rowIndex).GetCell(0).CellStyle = style;
                             ws.GetRow(rowIndex).GetCell(1).CellStyle = style;
                             ws.GetRow(rowIndex).GetCell(2).CellStyle = style;
@@ -561,7 +561,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                             //琛�1
                             region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 10, 12);
                             ws.AddMergedRegion(region);
-                            ws.GetRow(rowIndex + 1).GetCell(10).SetCellValue("EnProjectName");
+                            ws.GetRow(rowIndex + 1).GetCell(10).SetCellValue(tbTitle.Rows[0]["EnProjectName"].ToString());
                             ws.GetRow(rowIndex + 1).GetCell(10).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.None, VerticalAlignment.Center, HorizontalAlignment.Justify, 10.5, true, false);
                             ws.GetRow(rowIndex + 1).GetCell(11).CellStyle = styleNone;
                             ws.GetRow(rowIndex + 1).GetCell(12).CellStyle = styleNone;
@@ -577,7 +577,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                             //琛�3
                             region = new CellRangeAddress(rowIndex + 3, rowIndex + 3, 10, 12);
                             ws.AddMergedRegion(region);
-                            ws.GetRow(rowIndex + 3).GetCell(10).SetCellValue("EnWorkAreaName");
+                            ws.GetRow(rowIndex + 3).GetCell(10).SetCellValue(tbTitle.Rows[0]["EnWorkAreaName"].ToString());
                             ws.GetRow(rowIndex + 3).GetCell(10).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.None, VerticalAlignment.Center, HorizontalAlignment.Justify, 10.5, true, false);
                             ws.GetRow(rowIndex + 3).GetCell(11).CellStyle = styleTop;
                             ws.GetRow(rowIndex + 3).GetCell(12).CellStyle = styleTop;
@@ -617,7 +617,15 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                             ws.GetRow(rowIndex + 6).GetCell(6).SetCellValue("琛ㄩ潰鐘舵��");
                             region = new CellRangeAddress(rowIndex + 6, rowIndex + 6, 8, 12);
                             ws.AddMergedRegion(region);
-                            ws.GetRow(rowIndex + 6).GetCell(8).SetCellValue(tbTitle.Rows[0]["SurfaceState"].ToString());
+                            if (tbTitle.Rows[0]["SurfaceState"].ToString() == "")
+                            {
+                                ws.GetRow(rowIndex + 6).GetCell(8).SetCellValue("鎵撻嚎");
+                            }
+                            else
+                            {
+                                ws.GetRow(rowIndex + 6).GetCell(8).SetCellValue(tbTitle.Rows[0]["SurfaceState"].ToString());
+                            }
+                            
 
                             //琛�7
                             ws.GetRow(rowIndex + 7).GetCell(0).SetCellValue("妫�娴嬫爣鍑�");
@@ -668,7 +676,15 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                             ws.GetRow(rowIndex + 11).GetCell(0).SetCellValue("妫�娴嬫椂鏈�");
                             region = new CellRangeAddress(rowIndex + 11, rowIndex + 11, 1, 12);
                             ws.AddMergedRegion(region);
-                            ws.GetRow(rowIndex + 11).GetCell(1).SetCellValue(tbTitle.Rows[0]["DetectionTiming"].ToString());
+                            if (tbTitle.Rows[0]["DetectionTiming"].ToString() == "")
+                            {
+                                ws.GetRow(rowIndex + 11).GetCell(1).SetCellValue("鐒婂悗");
+                            }
+                            else
+                            {
+                                ws.GetRow(rowIndex + 11).GetCell(1).SetCellValue(tbTitle.Rows[0]["DetectionTiming"].ToString());
+                            }
+                            
                             ws.GetRow(rowIndex + 11).GetCell(1).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Justify, 10.5, true, false);
 
                             //琛�12
@@ -795,9 +811,24 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                             ws.GetRow(rowIndex + 3).GetCell(5).SetCellValue("涓撲笟/璐ㄩ噺宸ョ▼甯堬細");
                             ws.GetRow(rowIndex + 3).GetCell(7).SetCellValue("涓氫富浠ｈ〃锛�");
                             ws.GetRow(rowIndex + 3).GetCell(11).SetCellValue("鎺ユ敹浜猴細");
-                            //灏鹃儴琛�4
-                            ws.GetRow(rowIndex + 4).GetCell(2).SetCellValue(JLAudit);
-                            ws.GetRow(rowIndex + 4).GetCell(3).SetCellValue(GLGSAudit);
+                            // 灏鹃儴琛�4
+                            //鎻掑叆绛惧悕鍥剧墖
+                            if (!string.IsNullOrEmpty(getJLInfo.Item1))
+                            {
+                                InsertImage(hssfworkbook, ws, rowIndex + 4, 2, rowIndex + 4, 4, Server.MapPath(getJLInfo.Item1), 1, 1, 10);
+                            }
+                            else
+                            {
+                                ws.GetRow(rowIndex + 4).GetCell(2).SetCellValue(JLAudit);
+                            }
+                            if (!string.IsNullOrEmpty(getGLGSInfo.Item1))
+                            {
+                                InsertImage(hssfworkbook, ws, rowIndex + 4, 5, rowIndex + 4, 6, Server.MapPath(getJLInfo.Item1), 1, 8);
+                            }
+                            else
+                            {
+                                ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue(GLGSAudit);
+                            }
                             //灏鹃儴琛�6
                             ws.GetRow(rowIndex + 6).GetCell(0).SetCellValue("涓撲笟宸ョ▼甯堬細");
                             //灏鹃儴琛�8 
@@ -811,16 +842,6 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                             ws.GetRow(rowIndex + 8).GetCell(7).SetCellValue("  骞�  鏈�  鏃�");
                             ws.GetRow(rowIndex + 8).GetCell(11).SetCellValue("  骞�  鏈�  鏃�");
                             //灏鹃儴琛�9
-
-                            //鎻掑叆绛惧悕鍥剧墖
-                            if (!string.IsNullOrEmpty(getJLInfo.Item1))
-                            {
-                                InsertImage(hssfworkbook, ws, rowIndex + 6, 2, rowIndex + 6, 4, Server.MapPath(getJLInfo.Item1), 1, 1, 10);
-                            }
-                            if (!string.IsNullOrEmpty(getGLGSInfo.Item1))
-                            {
-                                InsertImage(hssfworkbook, ws, rowIndex + 6, 5, rowIndex + 6, 6, Server.MapPath(getJLInfo.Item1), 1, 8);
-                            }
                             #endregion
 
                             ws = WsExcelCreateRow(ws, hssfworkbook, rowIndex + 11, rowIndex + 11, style, 0, 12, 3, true);
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs
index b9b267d..679d7f4 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs
@@ -30,7 +30,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                                      (CASE WHEN IsWelderFirst=1 THEN '鏄�' ELSE '鍚�' END) AS IsWelderFirst, 
                                      JLAudit,GLGSAudit,QTAudit,IsPointAudit
                               FROM dbo.View_Batch_PointBatchItem 
-							  WHERE PointState IS NOT NULL AND TrustBatchItemId IS NULL";
+							  WHERE PointState IS NOT NULL AND TrustBatchItemId IS NULL
+                                    AND PointDate>'2024-06-24 23:59:59'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(this.txtPipeCode.Text))
             {
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx
index fc7b307..f9456b7 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx
@@ -47,14 +47,24 @@
                                 <f:ListItem Value="2" Text="宸插鐞�" />
                             </f:DropDownList>
                         </Items>
+                    </f:Toolbar> 
+                    <f:Toolbar ID="Toolbar7" Position="Top" runat="server" ToolbarAlign="Left">
+                        <Items>
+                            <f:DropDownList ID="drpTrustState" runat="server" Label="濮旀墭鐘舵��" LabelWidth="90px" Width="300px" LabelAlign="Right"
+                                AutoPostBack="true" OnSelectedIndexChanged="Tree_TextChanged">
+                                <f:ListItem Value="0" Text="寰呭鎵�" Selected="true" />
+                                <f:ListItem Value="1" Text="鍏ㄩ儴" />
+                            </f:DropDownList>
+                        </Items>
                     </f:Toolbar>
                      <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
                          <Items>
-                             <f:DropDownList ID="drpNde" runat="server" Label="妫�娴嬬被鍨�" LabelWidth="100px" Width="265px" LabelAlign="Right"
+                             <f:DropDownList ID="drpNde" runat="server" Label="妫�娴嬬被鍨�" LabelWidth="90px" Width="300px" LabelAlign="Right"
                                  AutoPostBack="true" OnSelectedIndexChanged="Tree_TextChanged">
                              </f:DropDownList>
                          </Items>
                      </f:Toolbar>
+                   
                    <%-- <f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Left">
                         <Items>
                             <f:TextBox ID="txtWelderCode" runat="server" EmptyText="<%$ Resources:Lan,EnterQueryConditions %>"
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
index b72ee31..801c14d 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
@@ -156,8 +156,14 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                                             var pitem = from x in Funs.DB.Batch_PointBatchItem
                                                         where x.PointBatchId == p.PointBatchId && x.WeldingDate >= sar && x.WeldingDate < end
                                                         select x;
+                                            if (drpTrustState.SelectedValue == "0")
+                                            {
+                                                pitem = pitem.Where(x => x.PointDate.HasValue && (x.IsBuildTrust == null || x.IsBuildTrust == false));
+                                            }
+
                                             if (pitem.Count() > 0)
                                             {
+                                               
                                                 TreeNode tn2 = new TreeNode
                                                 {
                                                     NodeID = p.PointBatchId,
@@ -341,6 +347,10 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         var q = from x in Funs.DB.Batch_PointBatchItem
                                 where x.PointBatchId == item.PointBatchId && x.WeldingDate >= sar && x.WeldingDate < end
                                 select x;
+                        if (drpTrustState.SelectedValue == "0")
+                        {
+                            q = q.Where(x => x.PointDate.HasValue && (x.IsBuildTrust == null || x.IsBuildTrust == false));
+                        }
                         if (q.Count() > 0)
                         {
                             TreeNode newNode = new TreeNode
@@ -896,8 +906,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                                                         select new PointBatchList { PointBatchItemId = x.PointBatchItemId, JointAttribute = y.JointAttribute }).ToList();
 
                         // 鏈鐞嗗浐瀹氱剨鍙�
-                        List<PointBatchList> GJot = jotList.Where(x=>x.JointAttribute == "鍥哄畾F").ToList();
-                       
+                        List<PointBatchList> GJot = jotList.Where(x => x.JointAttribute == "鍥哄畾F").ToList();
+
                         if (Convert.ToInt32(r["DetectionRateValue"]) != 0)
                         {
                             // 鎵逛腑涓�娈电殑鏁伴噺
@@ -1050,8 +1060,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                                     int modelNum = jotList.Count() % dnum;
                                     // 鍙栨暣
                                     double doubleNum = Math.Ceiling((double)jotList.Count() / (double)dnum);
-                                    int intNum=Convert.ToInt32(doubleNum);
-                                   
+                                    int intNum = Convert.ToInt32(doubleNum);
+
                                     for (int i = 0; i < intNum; i++)
                                     {
                                         if (modelNum == 0)
@@ -1135,6 +1145,12 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
 
                         }
                     }
+                    ShowNotify("鎵归噺鐐瑰彛瀹屾垚", MessageBoxIcon.Success);
+                }
+                else 
+                {
+                    ShowNotify("宸叉棤寰呭鐞嗙剨鍙�", MessageBoxIcon.Warning);
+                    return;
                 }
             }
             else
@@ -1657,6 +1673,9 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         pointBatchItem.PointState = null;
                         pointBatchItem.CutDate = null;////鏇存柊鎵规槑缁� 鍒囬櫎鏃ユ湡
                         pointBatchItem.IsBuildTrust = null;
+                        pointBatchItem.JLAudit= null;
+                        pointBatchItem.GLGSAudit= null;
+                        pointBatchItem.QTAudit= null;
                         db.SubmitChanges();
 
                         var trust = db.Batch_BatchTrustItem.FirstOrDefault(p => p.PointBatchItemId == pointBatchItemId);
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.designer.cs
index 89e6ab3..8345591 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.designer.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.designer.cs
@@ -68,6 +68,24 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
         /// </remarks>
         protected global::FineUIPro.DropDownList drpTrust;
 
+        /// <summary>
+        /// Toolbar7 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar7;
+
+        /// <summary>
+        /// drpTrustState 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpTrustState;
+
         /// <summary>
         /// Toolbar3 鎺т欢銆�
         /// </summary>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs
index 85097e1..61f4190 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs
@@ -1340,8 +1340,23 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                             ws.GetRow(rowIndex + 3).GetCell(11).SetCellValue("鎺ユ敹浜猴細");
 
                             // 灏鹃儴琛�4
-                            ws.GetRow(rowIndex + 4).GetCell(2).SetCellValue(JLAudit);
-                            ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue(GLGSAudit);
+                            //鎻掑叆绛惧悕鍥剧墖
+                            if (!string.IsNullOrEmpty(getJLInfo.Item1))
+                            {
+                                InsertImage(hssfworkbook, ws, rowIndex + 4, 2, rowIndex + 4, 4, Server.MapPath(getJLInfo.Item1), 1, 1, 10);
+                            }
+                            else
+                            {
+                                ws.GetRow(rowIndex + 4).GetCell(2).SetCellValue(JLAudit);
+                            }
+                            if (!string.IsNullOrEmpty(getGLGSInfo.Item1))
+                            {
+                                InsertImage(hssfworkbook, ws, rowIndex + 4, 5, rowIndex + 4, 6, Server.MapPath(getJLInfo.Item1), 1, 8);
+                            }
+                            else
+                            {
+                                ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue(GLGSAudit);
+                            }
 
                             //灏鹃儴琛�6
                             ws.GetRow(rowIndex + 6).GetCell(0).SetCellValue("涓撲笟宸ョ▼甯堬細");
@@ -1355,15 +1370,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                             }
                             ws.GetRow(rowIndex + 8).GetCell(7).SetCellValue("  骞�  鏈�  鏃�");
                             ws.GetRow(rowIndex + 8).GetCell(11).SetCellValue("  骞�  鏈�  鏃�");
-                            //鎻掑叆绛惧悕鍥剧墖
-                            if (!string.IsNullOrEmpty(getJLInfo.Item1))
-                            {
-                                InsertImage(hssfworkbook, ws, rowIndex + 6, 2, rowIndex + 6, 4, Server.MapPath(getJLInfo.Item1), 1, 1,10);
-                            }
-                            if (!string.IsNullOrEmpty(getGLGSInfo.Item1))
-                            {
-                                InsertImage(hssfworkbook, ws, rowIndex + 6, 5, rowIndex + 6, 6, Server.MapPath(getJLInfo.Item1), 1, 8);
-                            }
+                            
                             //灏鹃儴琛�9
 
                             #endregion
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx
index a46b181..b1a2873 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx
@@ -48,16 +48,17 @@
                             </f:TextBox>
                             <f:CheckBox ID="ckbFirstTwo" runat="server" Label="鏄惁棣栦笁鍙�" LabelAlign="Right" Width="130px" LabelWidth="100"></f:CheckBox>
                             <f:Label runat="server" Width="100px"></f:Label>
+                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                           </f:ToolbarFill>
                             <f:Button ID="BtnAnalyse" Text="<%$ Resources:Lan,Statistics %>" Icon="ChartPie"
                                 runat="server" OnClick="BtnAnalyse_Click">
                             </f:Button>
                             <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="<%$ Resources:Lan,Export %>"
                                 Icon="TableGo" EnableAjax="false" DisableControlBeforePostBack="false">
                             </f:Button>
-                            <f:Button ID="btnExport" BoxConfigAlign="Center" runat="server" Text="瀵煎嚭RT鏃ュ鎵樿〃" ToolTip="鏃ョ閬撶剨鍙ｆ娴嬪鎵樻眹鎬昏〃锛圧T锛�" Icon="DoorOut" EnableAjax="false" DisableControlBeforePostBack="false" OnClick="btnExport_Click" EnablePress="true" Pressed="false">
+                            <f:Button ID="btnExport" BoxConfigAlign="Center" runat="server" Text="瀵煎嚭RT鏃ュ鎵樿〃" ToolTip="鏃ョ閬撶剨鍙ｆ娴嬪鎵樻眹鎬昏〃锛圧T锛�" Icon="DoorOut" EnableAjax="false" DisableControlBeforePostBack="false" OnClick="btnExport_Click" EnablePress="true" Pressed="false" Hidden="true">
                             </f:Button> 
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                           </f:ToolbarFill>
+                            
                         </Items>
                     </f:Toolbar>
                 </Toolbars>
@@ -66,10 +67,10 @@
                             HeaderText="<%$ Resources:Lan,RequestSheetNumber %>" HeaderTextAlign="Center" TextAlign="Left"
                             SortField="TrustBatchCode">
                         </f:RenderField>
-                        <f:RenderField Width="80px" ColumnID="InstallationCode" DataField="InstallationCode" FieldType="String"
+                        <%--<f:RenderField Width="80px" ColumnID="InstallationCode" DataField="InstallationCode" FieldType="String"
                             HeaderText="<%$ Resources:Lan,InstallationCode %>" HeaderTextAlign="Center" TextAlign="Left"
                             SortField="InstallationCode">
-                        </f:RenderField>
+                        </f:RenderField>--%>
                          <f:RenderField Width="220px" ColumnID="PipelineCode" DataField="PipelineCode" FieldType="String"
                             HeaderText="<%$ Resources:Lan,PipelineCode %>" HeaderTextAlign="Center" TextAlign="Left"
                             SortField="PipelineCode">
@@ -78,10 +79,10 @@
                             HeaderText="<%$ Resources:Lan,WeldingJointNumber %>" HeaderTextAlign="Center"
                             TextAlign="Left" SortField="WeldJointCode">
                         </f:RenderField>
-                        <f:RenderField Width="80px" ColumnID="JointArea" DataField="JointArea" FieldType="String"
+                        <%--<f:RenderField Width="80px" ColumnID="JointArea" DataField="JointArea" FieldType="String"
                             HeaderText="<%$ Resources:Lan,WeldingArea %>" HeaderTextAlign="Center" TextAlign="Left"
                             SortField="JointArea">
-                        </f:RenderField>
+                        </f:RenderField>--%>
 
                         <f:RenderField Width="120px" ColumnID="MaterialCode" DataField="MaterialCode" FieldType="String"
                             HeaderText="<%$ Resources:Lan,MaterialSpecification %>" HeaderTextAlign="Center" TextAlign="Left"
@@ -91,9 +92,9 @@
                             HeaderText="<%$ Resources:Lan,InchDiameter %>" HeaderTextAlign="Center" TextAlign="Left"
                             SortField="Size">
                         </f:RenderField>
-                         <f:RenderField Width="90px" ColumnID="Thickness" DataField="Thickness" FieldType="Double"
-                            HeaderText="<%$ Resources:Lan,WallThickness %>" HeaderTextAlign="Center" TextAlign="Left"
-                            SortField="Thickness">
+                         <f:RenderField Width="90px" ColumnID="Specification" DataField="Specification" FieldType="String"
+                            HeaderText="<%$ Resources:Lan,Specifications %>" HeaderTextAlign="Center" TextAlign="Left"
+                            SortField="Specifications">
                         </f:RenderField>
                         <f:RenderField Width="90px" ColumnID="WeldTypeCode" DataField="WeldTypeCode" FieldType="String"
                             HeaderText="<%$ Resources:Lan,WeldingJointType %>" HeaderTextAlign="Center" TextAlign="Left"
@@ -103,9 +104,13 @@
                             HeaderText="<%$ Resources:Lan,WelderCode %>" HeaderTextAlign="Center" TextAlign="Left"
                             SortField="WelderCode">
                         </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="WeldingMethodCode" DataField="WeldingMethodCode" 
+                         <f:RenderField Width="100px" ColumnID="TeamGroupName" DataField="TeamGroupName" FieldType="String"
+                             HeaderText="鏂藉伐闃�" HeaderTextAlign="Center" TextAlign="Left"
+                             SortField="WelderCode">
+                         </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="WeldingMethodCode" DataField="WeldingMethodCode"
                             HeaderText="<%$ Resources:Lan,WeldingMethod %>" HeaderTextAlign="Center" TextAlign="Left"
-                            SortField="WeldingMethodCode" FieldType="String" >
+                            SortField="WeldingMethodCode" FieldType="String">
                         </f:RenderField>
                         <f:RenderField Width="90px" ColumnID="DetectionRateCode" DataField="DetectionRateCode" 
                             HeaderText="<%$ Resources:Lan,TestPercentage %>" HeaderTextAlign="Center" TextAlign="Left"
@@ -114,7 +119,10 @@
                          <f:RenderField Width="90px" ColumnID="AcceptLevel" DataField="AcceptLevel" FieldType="String" HeaderText="鍚堟牸绛夌骇"
                             HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                         <f:RenderField Width="90px" ColumnID="Sheet" DataField="Sheet" FieldType="String" HeaderText="椤垫暟"
+                        <f:RenderField Width="90px" ColumnID="PIPClassCode" DataField="PIPClassCode" FieldType="String" HeaderText="鍘嬪姏绠￠亾鍒嗙骇"
+                            HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="90px" ColumnID="Sheet" DataField="Sheet" FieldType="String" HeaderText="椤垫暟"
                             HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="120px" ColumnID="TrustDate" DataField="TrustDate" 
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx.designer.cs
index 00928d6..1a5edc5 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx.designer.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.WeldingProcess.TrustManage {
-    
-    
-    public partial class TrustBatchSelect {
-        
+namespace FineUIPro.Web.WeldingProcess.TrustManage
+{
+
+
+    public partial class TrustBatchSelect
+    {
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar1 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// drpInstallation 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList drpInstallation;
-        
+
         /// <summary>
         /// txtTrustBatchCode 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TextBox txtTrustBatchCode;
-        
+
         /// <summary>
         /// txtTrustDate 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DatePicker txtTrustDate;
-        
+
         /// <summary>
         /// txtPipeLineCode 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TextBox txtPipeLineCode;
-        
+
         /// <summary>
         /// ToolbarFill2 鎺т欢銆�
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill2;
-        
+
         /// <summary>
         /// Toolbar2 鎺т欢銆�
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtWeldJointCode 鎺т欢銆�
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TextBox txtWeldJointCode;
-        
+
         /// <summary>
         /// txtWelderCode 鎺т欢銆�
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TextBox txtWelderCode;
-        
+
         /// <summary>
         /// ckbFirstTwo 鎺т欢銆�
         /// </summary>
@@ -137,34 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.CheckBox ckbFirstTwo;
-        
-        /// <summary>
-        /// BtnAnalyse 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Button BtnAnalyse;
-        
-        /// <summary>
-        /// btnOut 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Button btnOut;
-        
-        /// <summary>
-        /// btnExport 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Button btnExport;
-        
+
         /// <summary>
         /// ToolbarFill1 鎺т欢銆�
         /// </summary>
@@ -173,7 +148,34 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
+        /// <summary>
+        /// BtnAnalyse 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button BtnAnalyse;
+
+        /// <summary>
+        /// btnOut 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <summary>
+        /// btnExport 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnExport;
+
         /// <summary>
         /// ToolbarSeparator1 鎺т欢銆�
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 鎺т欢銆�
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 鎺т欢銆�
         /// </summary>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx
index 01fcda0..67a75c6 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx
@@ -41,7 +41,7 @@
                                     LabelWidth="90px">
                                 </f:DropDownList>
                                 <f:DropDownList ID="drpTeamGroup" runat="server" Label="鐝粍" EnableCheckBoxSelect="true" EnableMultiSelect="true"
-                                    LabelAlign="Right" Width="160px" LabelWidth="80px">
+                                    LabelAlign="Right" Width="200px" LabelWidth="80px">
                                 </f:DropDownList>
                                 <f:DropDownList ID="drpAudit" runat="server" Label="瀹℃牳鐘舵��" LabelWidth="80" Width="160" EmptyText="璇烽�夋嫨">
                                     <f:ListItem Value="鍏ㄩ儴" Text="鍏ㄩ儴" />
diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs
index 12f69ba..71bd9c3 100644
--- a/HJGL/Model/Model.cs
+++ b/HJGL/Model/Model.cs
@@ -29,6 +29,10 @@ namespace Model
 		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnCreated();
+		partial void OnCreated()
+		{
+			this.CommandTimeout = 600;
+		}
     partial void InsertAttachFile(AttachFile instance);
     partial void UpdateAttachFile(AttachFile instance);
     partial void DeleteAttachFile(AttachFile instance);
diff --git a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache
index d0868e3..9671693 100644
Binary files a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache and b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache differ