diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index 54269fb..c45ceb9 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/TestPackageManageEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx
index bc2d984..5c777b8 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx
@@ -169,8 +169,11 @@
                                  FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">                       
                             </f:RenderField>                                                                                  
                             <f:RenderField HeaderText="管线编号" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
-                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left"  Width="220px" ExpandUnusedSpace="true">                       
+                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left"  Width="120px" ExpandUnusedSpace="true">                       
                             </f:RenderField>   
+                               <f:RenderField HeaderText="部分/全部焊口" ColumnID="WeldJonintCode" DataField="WeldJonintCode" SortField="PipelineCode"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left"  Width="120px" ExpandUnusedSpace="true">                       
+                       </f:RenderField>   
                             <f:RenderField HeaderText="设计压力" ColumnID="DesignPressure" DataField="DesignPressure" SortField="DesignPressure"
                                  FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">                       
                             </f:RenderField> 
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs
index e285a1a..3b106df 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs
@@ -230,7 +230,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
             this.SetTextTemp();
             this.PageInfoLoad(); ///页面输入保存信息
             string strSql = @"SELECT ptp.ProjectId, ptp.PTP_ID,ptpPipe.PT_PipeId, WorkArea.WorkAreaCode,IsoInfo.PipelineCode,
-                                    IsoInfo.DesignPressure,IsoInfo.DesignTemperature,ser.MediumName
+                                    IsoInfo.DesignPressure,IsoInfo.DesignTemperature,ser.MediumName,
+                                    ptpPipe.isAll,(case when (isnull(ptpPipe.WeldJonintCode,'')='') then '全部' else ptpPipe.WeldJonintCode end) as WeldJonintCode
                                FROM dbo.PTP_TestPackage AS ptp
                                LEFT JOIN dbo.PTP_PipelineList AS ptpPipe ON ptp.PTP_ID=ptpPipe.PTP_ID
                                LEFT JOIN dbo.Pipeline_Pipeline AS IsoInfo ON  IsoInfo.PipelineId = ptpPipe.PipelineId
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs
index 4555aa1..5bbf6d7 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs
@@ -214,8 +214,12 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
                             LEFT JOIN DBO.Project_WorkArea  AS WorkArea ON IsoInfo.WorkAreaId =WorkArea.WorkAreaId
                             LEFT JOIN dbo.Base_Medium  AS bs ON  bs.MediumId = IsoInfo.MediumId
                               WHERE IsoInfo.ProjectId= @ProjectId AND IsoInfo.UnitId= @UnitId 
-                            AND WorkArea.InstallationId= @InstallationId  
-                            AND NOT EXISTS(select 1 from PTP_PipelineList where IsoInfo.PipelineId=PTP_PipelineList.PipelineId and isAll=1)  ";
+                            AND WorkArea.InstallationId= @InstallationId  AND
+                            IsoInfo.PipelineId not in(
+								select PipelineId from PTP_PipelineList where PipelineId=IsoInfo.PipelineId and 
+								WorkAreaId=IsoInfo.WorkAreaId and isAll=1
+							) 
+                             ";
             }
             else
             {
@@ -237,11 +241,11 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
             listStr.Add(new SqlParameter("@UnitId", this.drpUnit.SelectedValue));
             listStr.Add(new SqlParameter("@InstallationId", this.drpInstallation.SelectedValue));
 
-            if (!string.IsNullOrEmpty(this.PTP_ID))
-            {
-                strSql += " AND IsoList.PTP_ID=@PTP_ID";
-                listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID));
-            }
+            //if (!string.IsNullOrEmpty(this.PTP_ID))
+            //{
+            //    strSql += " AND IsoList.PTP_ID=@PTP_ID";
+            //    listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID));
+            //}
 
             if (this.drpWorkArea.SelectedValue != Const._Null && drpWorkArea.SelectedValue!=null)
             {