diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config
index e47cfd0..1963de0 100644
--- a/HJGL/.vs/HJGL/config/applicationhost.config
+++ b/HJGL/.vs/HJGL/config/applicationhost.config
@@ -162,7 +162,7 @@
             </site>
             <site name="WebApi" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" />
+                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:3862:localhost" />
@@ -250,7 +250,7 @@
             </site>
             <site name="FineUIPro.Web(10)" id="13">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" />
+                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:13960:localhost" />
diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index 0cfe071..608c5b5 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx
index c9bf320..1e8a4fb 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx
@@ -146,7 +146,7 @@
                             runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true"
                             EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId" AllowSorting="true"
                             SortField="WorkAreaCode,PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort"
-                            AllowPaging="true" IsDatabasePaging="true" PageSize="100"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="100" OnRowDataBound="Grid1_RowDataBound"
                             OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
                             <Columns>
                                 <f:CheckBoxField ColumnID="ckbIsSelected" Width="50px" RenderAsStaticField="false" HeaderText="选择"
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs
index 5bbf6d7..d5a3a20 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs
@@ -4,6 +4,8 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Web.ModelBinding;
+using System.Web.UI.DataVisualization.Charting;
+using System.Windows.Forms;
 using BLL;
 using Model;
 using Newtonsoft.Json.Linq;
@@ -323,7 +325,6 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
             Grid1.DataSource = table;
             Grid1.DataBind();
 
-            this.GetInitGrid1Data();
         }
 
         /// <summary>
@@ -388,6 +389,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
             this.CollectGridJointInfo();
             this.BindGrid();
             this.ShowGridItem();
+
         }
         #endregion
 
@@ -543,6 +545,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
                         JObject values = teamGroupRow.Value<JObject>("values");
                         string WeldJonintCodes = values.Value<string>("isALL");
                         string workAreaId = values.Value<string>("WorkAreaId");
+                        if (string.IsNullOrEmpty(WeldJonintCodes))
+                            WeldJonintCodes = "全部";
                         Model.PTP_PipelineList newitem = new Model.PTP_PipelineList();
                         newitem.PTP_ID = this.PTP_ID;
                         newitem.PipelineId = PipelineId;
@@ -592,20 +596,12 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
 
         #region 绑定焊口信息Grid2列表
 
-        private void GetInitGrid1Data()
-        {
-            for (int i = 0; i < Grid1.Rows.Count; i++)
-            {
-                string rowID = Grid1.DataKeys[i][0].ToString();
-                this.GetBindGrid2Data(rowID);
-            }
-        }
         private void GetBindGrid2Data(string PipelineID)
         {
             this.Grid2.DataSource = GetDataJointGrid2(PipelineID);
             this.Grid2.DataBind();
         }
-        private List<View_Pipeline_WeldJoint> GetDataJointGrid2(string PipelineID)
+        private List<Pipeline_WeldJoint> GetDataJointGrid2(string PipelineID)
         {
             string[] arr = null;
             var tempData=Funs.DB.PTP_PipelineList.Where(t=>t.PipelineId == PipelineID && t.IsAll==false)
@@ -615,7 +611,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
             {
                 arr = tempData.Split(',');
             }
-            var query = Funs.DB.View_Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID )
+            var query = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID )
              .OrderBy(t => t.WeldJointCode).AsQueryable();
             if (arr != null)
             {
@@ -627,13 +623,6 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
 
 
 
-        private Dictionary<int, Dictionary<string, object>> GetModifiedDict()
-        {
-            Dictionary<int, Dictionary<string, object>> modifiedDict = Grid2.GetModifiedDict();
-
-            return modifiedDict;
-        }
-
         #endregion
 
         #region Grid 明细操作事件
@@ -700,8 +689,14 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
             this.BindGrid();
             this.ShowGridItem();
         }
+
         #endregion
 
+        protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
+        {
+            string rowId = e.RowID;
+            Grid dataGrid = e.Row.FindControl("Grid2") as Grid;
 
+        }
     }
 }
\ No newline at end of file