N48L@7i)Xb
zD)j&VY42=9t1QDfzUSFF$D`ocIgfWkPCCv~HaBBiqeiVc9>#Jn+0cO`b{J>c+-wIu
zB!x(fVIgeJvF+$Coq<`fqI{X#2ZcnAi&A9RCibbwRSuFBWB67n6A(8|DL7PVQg^qvKBs!
zM`@5DYuC2H@^i-m3LHaARRIHOKY=TscsYoGuo0}j6T?mt8#!G&(-A=}OY)*9s-GxS
zFWfV(`8#0yee_myBu>42a~6)HLd+LarW;;ftXH1b{D&()>$!^;iUM7qdt|!6o^O
ztdhu1Ho+_Nn)+t^Cu!3rY?X1;LAkzg(UW*+m)XL??oDs3@~O5!1(-%?<#-_8wtqpx
zE7X(`RNjBWq@fjPH0o6}<5w;h9K0E`)~{;4x
zCfO*5zFMW;WgKz`#ZF@4nC-yy&G;D2ufj#u7Le$Bfjjyp$i1dcrV*NWw+8I=F+42(
zh|0&=R2N9xAAys8w^0>YGyKis9XGcZPLkEXbRA8;!#x=e{5tS=VOTCJeVfaXKaHH=
zB@C=Eu)@F!11k(H@DX8P-&`aNEC~aPJ;KMrz{30Tf5E`stcyg)eajFm-VW`+&}Gzg
zQmC`hQYsJv^j!i-Mf(o5rvVzG9ChOV43nt6$
z5W!^8$`wpjFj>y3x!cmkzz|GUFxjPG!vvERO!l8*vgllXgf9Qr_if9e?0OYl@QEw_
zFm1g6*gaGfWTM~(-8q}rEf{S+oBj$$D;O>462WK%qZN!+Fj_5C5sX$a+N=xKzlPCP
z(a0?b3=*gFs$nu!WNbRY^E;<
zgAmAU09VaQ2n4RPu}Yk+gc@j~0w#-~;{Q+wAc~?w#f@FU&>epbY*+A1Ew6)_12o6$
zpnP!40SO}{xr@3^2if`Md4qN{OHV!Jz|wACUBaG|7O0#-)(x&*wkIbA8?kJ-!f$xe
zpTLK8ngmOJ|I+dXExHkBLQcdI-3RlMJVh1Db4%0nRU!Iy#vi0uzmMfE`+etY8Wh}&
z3O}_GCe~!HDd0b1y~a
                             
                                 
@@ -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("values");
                         string WeldJonintCodes = values.Value("isALL");
                         string workAreaId = values.Value("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 GetDataJointGrid2(string PipelineID)
+        private List 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> GetModifiedDict()
-        {
-            Dictionary> 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