焊接修改

2025-09-24 17:31:28 +08:00
parent cb92dcb730
commit 0f70405339
64 changed files with 2492 additions and 2040 deletions
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.CLGL
                    table.Id = Id;

                    var model = TwInOutplanmasterService.GetListData(table).FirstOrDefault();
-                    txtCusBillCode.Text = TwOutputmasterService.GetCusBillCode(model.WeldTaskCode, (TwConst.TypeInt)model.TypeInt, (BLL.TwConst.Category)model.Category);
+                    txtCusBillCode.Text = TwOutputmasterService.GetCusBillCode(model.WeldTaskCode, (TwConst.TypeInt)model.TypeInt, (BLL.TwConst.Category)model.Category, model.CusBillCode);
                    txtWarehouseCode.Text = model.WarehouseCode;
                    txtCreateDate.Text = string.Format("{0:yyyy-MM-dd}", model.CreateDate);
                    txtCreateMan.Text = Person_PersonsService.GetPersonsNameById(model.CreateMan);
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="07/11/2025 15:24:21" ReportInfo.Modified="07/14/2025 10:45:35" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="07/11/2025 15:24:21" ReportInfo.Modified="09/18/2025 10:19:16" 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="rijcmlqM3/HbiZANEYP3Y6oNtE7mqsCE0NW5tkXiWL0RJsdm/BnXhHrIFd8DaTyqYvkCZwzxANNAMKR/4NYq8Hpgr74n03/lNGCep+NFhLBpywxcCJykGjY1hpi9XXIOAbXetC7CXLOSRSH8epZCbNSEsmvTn+6oa5Ga7wbTAiWTKBm7+K/ZyLsHdEDQE4HlsTkPVD6fuJmRcOAj200z5qPJuhbfg==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqM3/HbiZANEYP3Y6oNtE7mqsCE0NW5tkXiWL0RJsdm/BnXhHrIFd8DaTyqYvkCZwzxANNAMKR/4NYq8Hpgr74n03/lNGCep+NFhLBpywxcCJykGjY1hpi9XXIOAbXetC7CXLOSRSH8epZCbNSEsmvTn+6oa5Ga7wbTAiWTKBm7+K/ZyLsHdEDQE4HlsTkPVD69sa3ZgHVHZvZAvFH8k7oQw==">
      <TableDataSource Name="Data" DataType="System.Int32" PropName="Accident_AccidentHandle" Enabled="true" TableName="Data">
        <Column Name="PipelineCode" DataType="System.String" PropName="AccidentHandleId"/>
        <Column Name="DetectionRateValue" DataType="System.String" PropName="ProjectId"/>
@@ -67,6 +67,7 @@ namespace FastReport
    </MsSqlDataConnection>
    <Parameter Name="projectName" DataType="System.String"/>
    <Parameter Name="UnitWorkName" DataType="System.String"/>
+    <Parameter Name="UnitWorkCode" DataType="System.String"/>
  </Dictionary>
  <ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" LeftMargin="20" TopMargin="25" RightMargin="20" BottomMargin="20" FirstPageSource="4" OtherPagesSource="4" Guides="0,963.9,226.8,614.25,699.3,236.25,727.65,28.35,48.6,297,152.55,373.95,481.95,29.7,589.95,816.75,39.15,144.45,95.85,924.7501,76.95,541.35,649.35,422.55,452.25,511.65,619.65,697.95,757.35,787.05,865.35,895.05,321.3,642.6">
    <PageHeaderBand Name="PageHeader1" Width="971.46" Height="231.14" Guides="0,103.95,66.15,37.8,231.14,35.15,127.19,30.68,65.83,96.51">
@@ -115,7 +116,7 @@ namespace FastReport
        <TableColumn Name="Column26" Width="39.15"/>
        <TableRow Name="Row3" Height="35.15">
          <TableCell Name="Cell13" Border.Lines="All" Text="区号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell14" Border.Lines="All" Text="/" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell14" Border.Lines="All" Text="[UnitWorkCode]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
          <TableCell Name="Cell15" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
          <TableCell Name="Cell16" Border.Lines="All" Text="检测类别" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
          <TableCell Name="Cell17" Border.Lines="All" Text="/" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
@@ -207,7 +208,7 @@ namespace FastReport
        </TableRow>
      </TableObject>
    </PageHeaderBand>
-    <DataBand Name="Data1" Top="235.14" Width="971.46" Height="40.13" Guides="0,40.13">
+    <DataBand Name="Data1" Top="234.26" Width="971.46" Height="40.13" Guides="0,40.13">
      <TableObject Name="Table3" Width="963.9" Height="40.13" Border.Lines="Left, Right, Bottom" ManualBuildEvent="Table3_ManualBuild">
        <TableColumn Name="Column27" Width="48.6"/>
        <TableColumn Name="Column28" Width="95.85"/>
@@ -255,8 +256,8 @@ namespace FastReport
        </TableRow>
      </TableObject>
    </DataBand>
-    <ColumnFooterBand Name="ColumnFooter1" Top="323.4" Width="971.46">
-      <ChildBand Name="Child1" Top="279.27" Width="971.46" Height="40.13" Guides="0,40.13" FillUnusedSpace="true">
+    <ColumnFooterBand Name="ColumnFooter1" Top="320.77" Width="971.46">
+      <ChildBand Name="Child1" Top="277.52" Width="971.46" Height="40.13" Guides="0,40.13" FillUnusedSpace="true">
        <TableObject Name="Table4" Width="963.9" Height="40.13" Border.Lines="Left, Right, Bottom">
          <TableColumn Name="Column48" Width="48.6"/>
          <TableColumn Name="Column49" Width="95.85"/>
@@ -305,7 +306,7 @@ namespace FastReport
        </TableObject>
      </ChildBand>
    </ColumnFooterBand>
-    <PageFooterBand Name="PageFooter1" Top="327.4" Width="971.46" Height="151.2" Guides="0,151.2,37.8,66.15,94.5,122.85">
+    <PageFooterBand Name="PageFooter1" Top="323.9" Width="971.46" Height="151.2" Guides="0,151.2,37.8,66.15,94.5,122.85">
      <TableObject Name="Table5" Width="963.9" Height="151.2" Border.Lines="All">
        <TableColumn Name="Column69" Width="321.3"/>
        <TableColumn Name="Column70" Width="321.3"/>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/09/2025 16:09:34" ReportInfo.Modified="08/05/2025 22:45:00" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/09/2025 16:09:34" ReportInfo.Modified="09/18/2025 10:00:46" ReportInfo.CreatorVersion="2017.1.16.0">
  <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -67,7 +67,7 @@ namespace FastReport
  }
 }</ScriptText>
  <Dictionary>
-    <MsSqlDataConnection Name="Connection1" ConnectionString="rijcmlqM7gJFg/iaLrqMhRfGy5lGjf8B9r68LcNRm542Oxj6bdsq8y94L+xTbZN1O2cfzth4gfOfsC8gRgfEghK5PiBVET2IYs7yXD0EmGmhMXfc1UdHyzSbMUjCa5gip5//BygeTK+HBsONEXMA6MXq2mCxf6mu3+F98NT3g2wocviv499nK5NcTkUaFnLEMIhPXSRmJ65/e+7l3Gyg/Hsh2pE1A==">
+    <MsSqlDataConnection Name="Connection1" ConnectionString="rijcmlqM7gJFg/iaLrqMhRfGy5lGjf8B9r68LcNRm542Oxj6bdsq8y94L+xTbZN1O2cfzth4gfOfsC8gRgfEghK5PiBVET2IYs7yXD0EmGmhMXfc1UdHyzSbMUjCa5gip5//BygeTK+HBsONEXMA6MXq2mCxf6mu3+F98NT3g2wocviv499nK5NcTkUaFnLEMIhPXSRTNrg5k9uAF8fQyvBFH66+Q==">
      <TableDataSource Name="Table" Alias="Data" DataType="System.Int32" Enabled="true" SelectCommand="select checkItem.CHT_CheckItemID,&#13;&#10;                                                    i.ISO_IsoNumber,&#13;&#10;                                                    i.ISO_IsoNo,&#13;&#10;                                                    j.JOT_JointNo,&#13;&#10;                                            (case when j.JOT_CellWelder is not null then (&#13;&#10;	                                        case when j.JOT_FloorWelder is not null and j.JOT_CellWelder&lt;&gt;j.JOT_FloorWelder&#13;&#10;	                                        then cWelder.WED_Code+'/'+fWelder.WED_Code&#13;&#10;	                                        else cWelder.WED_Code end) else fWelder.WED_Code end) as WelderCode,&#13;&#10;                                            (case when d.DetectionTypeCode='RT' or d.DetectionTypeCode='UT' then checkItem.CHT_CheckResult end) as RTUTResult,&#13;&#10;                                            (case when d.DetectionTypeCode='RT' or d.DetectionTypeCode='UT' then checkItem.CHT_CheckNo end) as RTUTCheckNo,&#13;&#10;                                            (case when d.DetectionTypeCode='MT' or d.DetectionTypeCode='PT' then checkItem.CHT_CheckResult end) as MTPTResult,&#13;&#10;                                            (case when d.DetectionTypeCode='MT' or d.DetectionTypeCode='PT' then checkItem.CHT_CheckNo end) as MTPTCheckNo,&#13;&#10;                                            checkItem.CHT_Remark&#13;&#10;                                        from CH_CheckItem as checkItem&#13;&#10;                                        left join CH_Check as c on c.CHT_CheckID=checkItem.CHT_CheckID&#13;&#10;                                        left join PW_JointInfo as j on j.JOT_ID = checkItem.JOT_ID&#13;&#10;                                        left join PW_IsoInfo as i on i.ISO_ID =j.ISO_ID&#13;&#10;                                        left join BS_Welder as cWelder on cWelder.WED_ID =j.JOT_CellWelder&#13;&#10;                                        left join BS_Welder as fWelder on fWelder.WED_ID=j.JOT_FloorWelder&#13;&#10;                                        left join Base_DetectionType as d on d.DetectionTypeId =checkItem.CHT_CheckMethod&#13;&#10;                                        where j.ISO_ID in ('&quot; + @isoIds + &quot;')">
        <Column Name="CHT_CheckItemID" Enabled="false" DataType="System.String"/>
        <Column Name="SingleName" DataType="System.String" PropName="ISO_IsoNumber"/>
@@ -116,6 +116,7 @@ namespace FastReport
    <Parameter Name="PTNoPassFW" DataType="System.String"/>
    <Parameter Name="PTNoPassDW" DataType="System.String"/>
    <Parameter Name="isoIds" DataType="System.String"/>
+    <Parameter Name="UnitWorkCode" DataType="System.String"/>
  </Dictionary>
  <ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" LeftMargin="20" TopMargin="25" RightMargin="20" BottomMargin="20" FirstPageSource="4" OtherPagesSource="4" Guides="0,963.95,254.38,584.36,700.12,963.52,82.64,221.98,323.52,519.56,611.65,788.79,880.88,406.16,488.8,609.24,729.68,963.9,81.9,522.9,110.25,192.15,302.4,412.65,633.15,743.4,853.65,964.26,125.46,241.47,338.58,501.84,580.05,677.16,755.37,843.03,883.44,923.85,321.3,642.6">
    <PageHeaderBand Name="PageHeader1" Width="971.46" Height="103.38" Guides="0,103.38,75.03,28.35">
@@ -137,7 +138,7 @@ namespace FastReport
          <TableCell Name="Cell8" Border.Lines="Right, Bottom" Text="[UnitWorkName]" VertAlign="Center" Font="楷体, 10.5pt"/>
        </TableRow>
      </TableObject>
-      <ChildBand Name="Child3" Top="107.38" Width="971.46" Height="28.35" PrintOn="FirstPage" Guides="0,28.35">
+      <ChildBand Name="Child3" Top="106.5" Width="971.46" Height="28.35" PrintOn="FirstPage" Guides="0,28.35">
        <TableObject Name="Table2" Width="963.52" Height="28.35" Border.Lines="Left, Right, Bottom">
          <TableColumn Name="Column4" Width="82.64"/>
          <TableColumn Name="Column5" Width="139.34"/>
@@ -158,7 +159,7 @@ namespace FastReport
            <TableCell Name="Cell36" Border.Lines="All" Text="[ISOLevel]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
          </TableRow>
        </TableObject>
-        <ChildBand Name="Child4" Top="139.73" Width="971.46" Height="47.25" Guides="0,47.25">
+        <ChildBand Name="Child4" Top="137.98" Width="971.46" Height="47.25" Guides="0,47.25">
          <TableObject Name="Table3" Width="963.52" Height="47.25" Border.Lines="Left, Right, Bottom">
            <TableColumn Name="Column12" Width="82.64"/>
            <TableColumn Name="Column13" Width="139.34"/>
@@ -170,7 +171,7 @@ namespace FastReport
            <TableColumn Name="Column19" Width="233.84"/>
            <TableRow Name="Row4" Height="47.25">
              <TableCell Name="Cell37" Border.Lines="All" Text="区号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-              <TableCell Name="Cell38" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+              <TableCell Name="Cell38" Border.Lines="All" Text="[UnitWorkCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
              <TableCell Name="Cell39" Border.Lines="All" Text="检测类别号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
              <TableCell Name="Cell40" Border.Lines="All" Text="/" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
              <TableCell Name="Cell41" Border.Lines="All" Text="管道编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
@@ -179,7 +180,7 @@ namespace FastReport
              <TableCell Name="Cell44" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
            </TableRow>
          </TableObject>
-          <ChildBand Name="Child5" Top="190.98" Width="971.46" Height="170.11" PrintOn="FirstPage" Guides="0,170.11,56.71,33.08,23.63,85.06,113.41,141.76">
+          <ChildBand Name="Child5" Top="188.35" Width="971.46" Height="170.11" PrintOn="FirstPage" Guides="0,170.11,56.71,33.08,23.63,85.06,113.41,141.76">
            <TableObject Name="Table4" Width="963.9" Height="170.11" Border.Lines="All">
              <TableColumn Name="Column56" Width="81.9"/>
              <TableColumn Name="Column57" Width="110.25"/>
@@ -257,7 +258,7 @@ namespace FastReport
                <TableCell Name="Cell317" Border.Lines="All" Text="/" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
              </TableRow>
            </TableObject>
-            <ChildBand Name="Child6" Top="365.09" Width="971.46" Height="37.8" Guides="0,37.8">
+            <ChildBand Name="Child6" Top="361.59" Width="971.46" Height="37.8" Guides="0,37.8">
              <TableObject Name="Table5" Width="964.26" Height="37.8" Border.Lines="All">
                <TableColumn Name="Column74" Width="125.46"/>
                <TableColumn Name="Column75" Width="116.01"/>
@@ -289,7 +290,7 @@ namespace FastReport
        </ChildBand>
      </ChildBand>
    </PageHeaderBand>
-    <DataBand Name="Data1" Top="406.89" Width="971.46" Height="37.8" Guides="0,37.8">
+    <DataBand Name="Data1" Top="402.51" Width="971.46" Height="37.8" Guides="0,37.8">
      <TableObject Name="Table9" Width="964.26" Height="37.8" Border.Lines="All" ManualBuildEvent="Table9_ManualBuild">
        <TableColumn Name="Column96" Width="125.46"/>
        <TableColumn Name="Column97" Width="116.01"/>
@@ -317,8 +318,8 @@ namespace FastReport
        </TableRow>
      </TableObject>
    </DataBand>
-    <ColumnFooterBand Name="ColumnFooter1" Top="490.49" Width="971.46">
-      <ChildBand Name="Child1" Top="448.69" Width="971.46" Height="37.8" Guides="0,37.8" FillUnusedSpace="true">
+    <ColumnFooterBand Name="ColumnFooter1" Top="484.36" Width="971.46">
+      <ChildBand Name="Child1" Top="443.44" Width="971.46" Height="37.8" Guides="0,37.8" FillUnusedSpace="true">
        <TableObject Name="Table8" Width="964.26" Height="37.8" Border.Lines="All">
          <TableColumn Name="Column85" Width="125.46"/>
          <TableColumn Name="Column86" Width="116.01"/>
@@ -347,7 +348,7 @@ namespace FastReport
        </TableObject>
      </ChildBand>
    </ColumnFooterBand>
-    <PageFooterBand Name="PageFooter1" Top="494.49" Width="971.46" Height="85.04" PrintOn="FirstPage" Guides="0,85.04,42.52">
+    <PageFooterBand Name="PageFooter1" Top="487.49" Width="971.46" Height="85.04" PrintOn="FirstPage" Guides="0,85.04,42.52">
      <TableObject Name="Table6" Width="963.9" Height="85.04" Border.Lines="All" PrintOn="FirstPage">
        <TableColumn Name="Column53" Width="321.3"/>
        <TableColumn Name="Column54" Width="321.3"/>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 23:00:23" ReportInfo.Modified="09/01/2025 09:53:14" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 23:00:23" ReportInfo.Modified="09/18/2025 09:57:11" 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/9ZLpp1NuxWREUCgaTVoqDNWrYFz8feIR/">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRF9V3vp1e4jkmMexvV+/syL">
      <TableDataSource Name="Data" DataType="System.Int32" PropName="Accident_AccidentHandle" Enabled="true" TableName="Data">
        <Column Name="PipelineCode" DataType="System.String" PropName="AccidentHandleId"/>
        <Column Name="ManterialCode" DataType="System.String" PropName="ProjectId"/>
@@ -107,7 +107,7 @@ namespace FastReport
        </TableRow>
      </TableObject>
    </PageHeaderBand>
-    <DataBand Name="Data1" Top="155.2" Width="623.7" Height="47.25" Guides="0,47.25">
+    <DataBand Name="Data1" Top="154.32" Width="623.7" Height="47.25" Guides="0,47.25">
      <TableObject Name="Table2" Width="623.53" Height="47.25" Border.Lines="Left, Right, Bottom" ManualBuildEvent="Table2_ManualBuild">
        <TableColumn Name="Column12" Width="122.85"/>
        <TableColumn Name="Column13" Width="28.35"/>
@@ -128,15 +128,15 @@ namespace FastReport
          <TableCell Name="Cell70" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
          <TableCell Name="Cell71" Border.Lines="All" Text="完整" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
          <TableCell Name="Cell72" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
-          <TableCell Name="Cell73" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell73" Border.Lines="All" Text="弯头、三通、半管接头、大小头、法兰" HorzAlign="Center" VertAlign="Center" Font="楷体, 9pt"/>
          <TableCell Name="Cell74" Border.Lines="All" Text="完整" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
          <TableCell Name="Cell75" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
          <TableCell Name="Cell76" Border.Lines="All" Text="合格" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
        </TableRow>
      </TableObject>
    </DataBand>
-    <ColumnFooterBand Name="ColumnFooter1" Top="257.7" Width="623.7">
-      <ChildBand Name="Child1" Top="206.45" Width="623.7" Height="47.25" Guides="0,47.25" FillUnusedSpace="true">
+    <ColumnFooterBand Name="ColumnFooter1" Top="255.07" Width="623.7">
+      <ChildBand Name="Child1" Top="204.7" Width="623.7" Height="47.25" Guides="0,47.25" FillUnusedSpace="true">
        <TableObject Name="Table3" Width="623.53" Height="47.25" Border.Lines="Left, Right, Bottom">
          <TableColumn Name="Column23" Width="122.85"/>
          <TableColumn Name="Column24" Width="28.35"/>
@@ -165,7 +165,7 @@ namespace FastReport
        </TableObject>
      </ChildBand>
    </ColumnFooterBand>
-    <PageFooterBand Name="PageFooter1" Top="261.7" Width="623.7" Height="111.01" Guides="0,111.01,38.56,79.51">
+    <PageFooterBand Name="PageFooter1" Top="258.2" Width="623.7" Height="111.01" Guides="0,111.01,38.56,79.51">
      <TableObject Name="Table4" Width="623.7" Height="111.01" Border.Lines="Left, Top">
        <TableColumn Name="Column34" Width="311.85"/>
        <TableColumn Name="Column35" Width="311.85"/>
@@ -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/28/2025 15:37:09" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/13/2022 11:00:20" ReportInfo.Modified="09/24/2025 17:01:43" ReportInfo.CreatorVersion="2017.1.16.0">
  <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,15 +42,24 @@ namespace FastReport
 }
 </ScriptText>
  <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREfITFM9Q8PjwDZPX3Tprpb"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFzXoN2nwCkAVhWTh9eLj/d"/>
    <TableDataSource Name="Data" ReferenceName="Data" DataType="System.Int32" Enabled="true">
      <Column Name="PackagingManageId" DataType="System.String" PropName="PipelineComponentId"/>
      <Column Name="PackagingCode" DataType="System.String" PropName="PipelineComponentCode"/>
-      <Column Name="PlanStartDate" Enabled="false" DataType="System.DateTime"/>
-      <Column Name="UnitWorkName" Enabled="false" DataType="System.String"/>
-      <Column Name="num" Enabled="false" DataType="System.String"/>
-      <Column Name="CU" Enabled="false" DataType="System.String"/>
      <Column Name="StackingPosition" DataType="System.String" PropName="Column"/>
+      <Column Name="ProjectId" DataType="System.String"/>
+      <Column Name="PipelineComponentId" DataType="System.String"/>
+      <Column Name="State" DataType="System.Int32"/>
+      <Column Name="ContactName" DataType="System.String"/>
+      <Column Name="ContactPhone" DataType="System.String"/>
+      <Column Name="Remark" DataType="System.String"/>
+      <Column Name="ReceiveMan" DataType="System.String"/>
+      <Column Name="ReceiveDate" DataType="System.DateTime"/>
+      <Column Name="TrainNumber" DataType="System.String"/>
+      <Column Name="TrainNumberId" DataType="System.String"/>
+      <Column Name="TypeInt" DataType="System.Int32"/>
+      <Column Name="CompileMan" DataType="System.String"/>
+      <Column Name="CompileDate" DataType="System.DateTime"/>
    </TableDataSource>
    <Parameter Name="ProjectName" DataType="System.String"/>
    <Parameter Name="TrainNumber" DataType="System.String"/>
@@ -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/28/2025 15:35:44" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/13/2022 11:00:20" ReportInfo.Modified="09/24/2025 17:03:56" 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/9ZLpp1NuxWRG5UvzunCF4u1kOd3HZ7fqd"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRG+WjejNU187041Y1Uu0BvR"/>
    <TableDataSource Name="Data" ReferenceName="Data" DataType="System.Int32" Enabled="true">
      <Column Name="PipelineComponentId" DataType="System.String"/>
      <Column Name="PipelineComponentCode" DataType="System.String"/>
@@ -1485,6 +1485,9 @@
    <Content Include="HJGL\BaseInfo\MaterialCodeLib.aspx" />
    <Content Include="HJGL\BaseInfo\MaterialCodeLibEdit.aspx" />
    <Content Include="HJGL\BaseInfo\MaterialCodeLibIn.aspx" />
+    <Content Include="HJGL\BaseInfo\MaterialColor.aspx" />
+    <Content Include="HJGL\BaseInfo\MaterialColorEdit.aspx" />
+    <Content Include="HJGL\BaseInfo\MaterialColorInaspx.aspx" />
    <Content Include="HJGL\BaseInfo\MaterialEdit.aspx" />
    <Content Include="HJGL\BaseInfo\MaterialView.aspx" />
    <Content Include="HJGL\BaseInfo\Medium.aspx" />
@@ -10087,6 +10090,27 @@
    <Compile Include="HJGL\BaseInfo\MaterialCodeLibIn.aspx.designer.cs">
      <DependentUpon>MaterialCodeLibIn.aspx</DependentUpon>
    </Compile>
+    <Compile Include="HJGL\BaseInfo\MaterialColor.aspx.cs">
+      <DependentUpon>MaterialColor.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\BaseInfo\MaterialColor.aspx.designer.cs">
+      <DependentUpon>MaterialColor.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\BaseInfo\MaterialColorEdit.aspx.cs">
+      <DependentUpon>MaterialColorEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\BaseInfo\MaterialColorEdit.aspx.designer.cs">
+      <DependentUpon>MaterialColorEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\BaseInfo\MaterialColorInaspx.aspx.cs">
+      <DependentUpon>MaterialColorInaspx.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\BaseInfo\MaterialColorInaspx.aspx.designer.cs">
+      <DependentUpon>MaterialColorInaspx.aspx</DependentUpon>
+    </Compile>
    <Compile Include="HJGL\BaseInfo\MaterialEdit.aspx.cs">
      <DependentUpon>MaterialEdit.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -16812,7 +16836,7 @@
    </COMReference>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
  <ProjectExtensions>
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -0,0 +1,126 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MaterialColor.aspx.cs" Inherits="FineUIPro.Web.HJGL.BaseInfo.MaterialColor" %>
+
+<!DOCTYPE html>
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }   
+        .f-grid-row.yellow
+        {
+            background-color: YellowGreen;
+            background-image: none;
+        }
+        
+        .f-grid-row.red
+        {
+            background-color: Yellow;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" AutoScroll="true"
+        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                runat="server" BoxFlex="1" DataKeyNames="MaterialColorId" AllowCellEditing="true" 
+                ClicksToEdit="2" DataIDField="MaterialColorId" AllowSorting="true" SortField="MaterialColorId"
+                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true"
+                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                        <Items>
+                            <f:Button ID="btnNew" ToolTip="新增" Text="新增" Hidden="true" Icon="Add" runat="server" 
+                                OnClick="btnNew_Click">
+                            </f:Button>
+                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
+                                EnableAjax="false" DisableControlBeforePostBack="false">
+                            </f:Button>                            
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>
+                <Columns>
+                    <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                        TextAlign="Center">
+                        <ItemTemplate>
+                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>    
+                               
+                          <f:RenderField Width="150px" ColumnID="UnitId" DataField="UnitId" SortField="UnitId"
+                             FieldType="String" HeaderText="单位id" TextAlign="Left" HeaderTextAlign="Center" >
+                           </f:RenderField>
+                          <f:RenderField Width="150px" ColumnID="MaterialId" DataField="MaterialId" SortField="MaterialId"
+                             FieldType="String" HeaderText="材质id" TextAlign="Left" HeaderTextAlign="Center" >
+                           </f:RenderField>
+                          <f:RenderField Width="150px" ColumnID="ColorName" DataField="ColorName" SortField="ColorName"
+                             FieldType="String" HeaderText="颜色名称" TextAlign="Left" HeaderTextAlign="Center" >
+                           </f:RenderField>
+                          <f:RenderField Width="150px" ColumnID="ColorCardNo" DataField="ColorCardNo" SortField="ColorCardNo"
+                             FieldType="String" HeaderText="色卡号" TextAlign="Left" HeaderTextAlign="Center" >
+                           </f:RenderField>
+                          <f:RenderField Width="150px" ColumnID="RGB" DataField="RGB" SortField="RGB"
+                             FieldType="String" HeaderText="" TextAlign="Left" HeaderTextAlign="Center" >
+                           </f:RenderField>
+                          <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
+                             FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center" >
+                           </f:RenderField>
+                     
+                </Columns>
+                <Listeners>
+                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                </Listeners>
+                <PageItems>
+                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                    </f:ToolbarSeparator>
+                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                    </f:ToolbarText>
+                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        <f:ListItem Text="10" Value="10" />
+                        <f:ListItem Text="15" Value="15" />
+                        <f:ListItem Text="20" Value="20" />
+                        <f:ListItem Text="25" Value="25" />
+                        <f:ListItem Text="所有行" Value="100000" />
+                    </f:DropDownList>
+                </PageItems>
+            </f:Grid>
+        </Items>
+    </f:Panel>
+    <f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
+        IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
+        Title="编辑Base_MaterialColor" EnableIFrame="true" Height="650px"
+        Width="1200px">
+    </f:Window>
+    <f:Menu ID="Menu1" runat="server">      
+        <f:MenuButton ID="btnMenuEdit" OnClick="btnEdit_Click" EnablePostBack="true"
+            Hidden="true" runat="server" Text="编辑" Icon="TableEdit" >
+        </f:MenuButton>
+        <f:MenuButton ID="btnMenuDelete" OnClick="btnDelete_Click" EnablePostBack="true"  Icon="Delete"
+            Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+        </f:MenuButton>
+    </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>
@@ -0,0 +1,247 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HJGL.BaseInfo
+{
+    public partial class MaterialColor : PageBase
+    {
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.GetButtonPower();
+                this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
+                // 绑定表格
+                this.BindGrid();
+            }
+        }
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            Model.Base_MaterialColor table = new Model.Base_MaterialColor();
+            var tb = BLL.BaseMaterialcolorService.GetListByQueryModle(table, Grid1.PageIndex, Grid1.PageSize);
+            Grid1.RecordCount = tb.Total;
+            Grid1.DataSource = tb.Data;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region GV 数据操作
+        /// <summary>
+        /// 过滤表头
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        //protected void Grid1_FilterChange(object sender, EventArgs e)
+        //{
+        //    this.BindGrid();
+        //}
+
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            this.Grid1.PageIndex = e.NewPageIndex;
+            this.BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            this.Grid1.SortDirection = e.SortDirection;
+            this.Grid1.SortField = e.SortField;
+            this.BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 数据编辑事件
+        /// <summary>
+        /// 新增
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("Base_MaterialColorEdit.aspx?MaterialColorId={0}", string.Empty, "增加 - ")));
+        }
+
+        /// <summary>
+        /// 编辑按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnEdit_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string ID = Grid1.SelectedRowID;
+            var model = BLL.BaseMaterialcolorService.GetModelById(ID);
+            if (model != null) ///已上报时不能删除
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("Base_MaterialColorEdit.aspx?MaterialColorId={0}", ID, "编辑 - ")));
+            }
+        }
+
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.btnEdit_Click(null, null);
+        }
+
+        /// <summary>
+        /// 批量删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var model = BLL.BaseMaterialcolorService.GetModelById(rowID);
+                    if (model != null)
+                    {
+                        BLL.BaseMaterialcolorService.DeleteById(rowID);
+                    }
+                }
+
+                BindGrid();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+        #endregion
+
+        #region 关闭弹出窗
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 获取权限按钮
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.BaseMaterialcolorMenuId);
+            if (buttonList.Count > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDelete.Hidden = false;
+                }
+            }
+        }
+        #endregion        
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = 500;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        /// <summary>
+        /// 导出方法
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <returns></returns>
+        private string GetGridTableHtml(Grid grid)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            sb.Append("<tr>");
+            foreach (GridColumn column in grid.Columns)
+            {
+                sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+            }
+            sb.Append("</tr>");
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                foreach (GridColumn column in grid.Columns)
+                {
+                    string html = row.Values[column.ColumnIndex].ToString();
+                    if (column.ColumnID == "tfNumber")
+                    {
+                        html = (row.FindControl("lblNumber") as System.Web.UI.WebControls.Label).Text;
+                    }
+                    sb.AppendFormat("<td>{0}</td>", html);
+                }
+
+                sb.Append("</tr>");
+            }
+
+            sb.Append("</table>");
+
+            return sb.ToString();
+        }
+        #endregion        
+    }
+}
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.BaseInfo
+{
+
+
+    public partial class MaterialColor
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <summary>
+        /// lblNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+
+        /// <summary>
+        /// btnMenuDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}
@@ -0,0 +1,77 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MaterialColorEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.BaseInfo.MaterialColorEdit" %>
+
+<!DOCTYPE html>
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                         <f:FormRow>
+                          <Items>
+                         <f:TextBox ID="txtUnitId" runat="server" Label="单位id" MaxLength="200"  >
+                         </f:TextBox>
+                           </Items>
+                          </f:FormRow>
+                         <f:FormRow>
+                          <Items>
+                         <f:TextBox ID="txtMaterialId" runat="server" Label="材质id" MaxLength="200"  >
+                         </f:TextBox>
+                           </Items>
+                          </f:FormRow>
+                         <f:FormRow>
+                          <Items>
+                         <f:TextBox ID="txtColorName" runat="server" Label="颜色名称" MaxLength="200"  >
+                         </f:TextBox>
+                           </Items>
+                          </f:FormRow>
+                         <f:FormRow>
+                          <Items>
+                         <f:TextBox ID="txtColorCardNo" runat="server" Label="色卡号" MaxLength="200"  >
+                         </f:TextBox>
+                           </Items>
+                          </f:FormRow>
+                         <f:FormRow>
+                          <Items>
+                         <f:TextBox ID="txtRGB" runat="server" Label="" MaxLength="200"  >
+                         </f:TextBox>
+                           </Items>
+                          </f:FormRow>
+                         <f:FormRow>
+                          <Items>
+                         <f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="200"  >
+                         </f:TextBox>
+                           </Items>
+                          </f:FormRow>
+                
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1" 
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭"  runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>          
+        <f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+    </form>
+</body>
+</html>
+
+
@@ -0,0 +1,103 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HJGL.BaseInfo
+{
+    public partial class MaterialColorEdit: PageBase
+    {
+        #region  
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string MaterialColorId
+        {
+            get
+            {
+                return (string)ViewState["MaterialColorId"];
+            }
+            set
+            {
+                ViewState["MaterialColorId"] = value;
+            }
+        }
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ////权限按钮方法
+                this.GetButtonPower();
+                this.MaterialColorId = Request.Params["MaterialColorId"];
+                if (!string.IsNullOrEmpty(this.MaterialColorId))
+                {
+                    Model.Base_MaterialColor model = BLL.BaseMaterialcolorService.GetModelById(this.MaterialColorId);
+                    if (model != null)
+                    {
+                        this.txtUnitId.Text = model.UnitId;
+                        this.txtMaterialId.Text = model.MaterialId;
+                        this.txtColorName.Text = model.ColorName;
+                        this.txtColorCardNo.Text = model.ColorCardNo;
+                        this.txtRGB.Text = model.RGB;
+                        this.txtRemark.Text = model.Remark;
+
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            Model.Base_MaterialColor table = new Model.Base_MaterialColor();
+            table.UnitId = this.txtUnitId.Text;
+            table.MaterialId = this.txtMaterialId.Text;
+            table.ColorName = this.txtColorName.Text;
+            table.ColorCardNo = this.txtColorCardNo.Text;
+            table.RGB = this.txtRGB.Text;
+            table.Remark = this.txtRemark.Text;
+            if (string.IsNullOrEmpty(this.MaterialColorId))
+            {
+                table.MaterialColorId = SQLHelper.GetNewID(typeof(Model.Base_MaterialColor));
+                BLL.BaseMaterialcolorService.Add(table);
+
+            }
+            else
+            {
+                table.MaterialColorId = this.MaterialColorId;
+                BLL.BaseMaterialcolorService.Update(table);
+            }
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+        }
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.BaseMaterialcolorMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+            }
+        }
+        #endregion        
+
+    }
+}
@@ -0,0 +1,134 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.BaseInfo
+{
+
+
+    public partial class MaterialColorEdit
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// txtUnitId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtUnitId;
+
+        /// <summary>
+        /// txtMaterialId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMaterialId;
+
+        /// <summary>
+        /// txtColorName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtColorName;
+
+        /// <summary>
+        /// txtColorCardNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtColorCardNo;
+
+        /// <summary>
+        /// txtRGB 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRGB;
+
+        /// <summary>
+        /// txtRemark 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRemark;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+    }
+}
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MaterialColorInaspx.aspx.cs" Inherits="FineUIPro.Web.HJGL.BaseInfo.MaterialColorInaspx" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HJGL.BaseInfo
+{
+    public partial class MaterialColorInaspx : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码是由工具生成的。
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.BaseInfo
+{
+
+
+    public partial class MaterialColorInaspx
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.Linq;

 namespace FineUIPro.Web.HJGL.BaseInfo
 {
@@ -225,6 +226,10 @@ namespace FineUIPro.Web.HJGL.BaseInfo
        private string judgementDelete(string id)
        {
            string content = string.Empty;
+            if (Funs.DB.HJGL_WeldJoint.Any(x=>x.WeldingLocationId==id))
+            {
+                content = "焊口已关联此焊接位置";
+            }
            return content;
        }
        #endregion
@@ -43,24 +43,48 @@ namespace FineUIPro.Web.HJGL.BaseInfo
        protected void btnSave_Click(object sender, EventArgs e)
        {
            string WeldingLocationId = Request.Params["WeldingLocationId"];
-            var q = Funs.DB.Base_WeldingLocation.FirstOrDefault(x => x.WeldingLocationCode == this.txtWeldingLocationCode.Text.Trim() && (x.WeldingLocationId != WeldingLocationId || (WeldingLocationId == null && x.WeldingLocationId != null)));
-            if (q != null)
-            {
-                Alert.ShowInTop("此位置代号已存在！", MessageBoxIcon.Warning);
-                return;
-            }
+            string code = this.txtWeldingLocationCode.Text.Trim();
+            string name = this.txtWeldingLocationName.Text.Trim();

-            var q2 = Funs.DB.Base_WeldingLocation.FirstOrDefault(x => x.WeldingLocationName == this.txtWeldingLocationName.Text.Trim() && (x.WeldingLocationId != WeldingLocationId || (WeldingLocationId == null && x.WeldingLocationId != null)));
-            if (q2 != null)
+            // 判断是否为编辑场景（id 不为空）
+            if (!string.IsNullOrEmpty(WeldingLocationId))
            {
-                Alert.ShowInTop("此位置名称已存在！", MessageBoxIcon.Warning);
-                return;
+                var q = Funs.DB.Base_WeldingLocation.FirstOrDefault(x => x.WeldingLocationCode == code && x.WeldingLocationId != WeldingLocationId);
+                if (q != null)
+                {
+                    Alert.ShowInTop("此位置代号已存在！", MessageBoxIcon.Warning);
+                    return;
+                }
+
+                var q2 = Funs.DB.Base_WeldingLocation.FirstOrDefault(x => x.WeldingLocationName == name && x.WeldingLocationId != WeldingLocationId);
+                if (q2 != null)
+                {
+                    Alert.ShowInTop("此位置名称已存在！", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            else
+            {
+                // 新增场景：只需判断是否存在相同的 code 或 name
+                var q = Funs.DB.Base_WeldingLocation.FirstOrDefault(x => x.WeldingLocationCode == code);
+                if (q != null)
+                {
+                    Alert.ShowInTop("此位置代号已存在！", MessageBoxIcon.Warning);
+                    return;
+                }
+
+                var q2 = Funs.DB.Base_WeldingLocation.FirstOrDefault(x => x.WeldingLocationName == name);
+                if (q2 != null)
+                {
+                    Alert.ShowInTop("此位置名称已存在！", MessageBoxIcon.Warning);
+                    return;
+                }
            }

            Model.Base_WeldingLocation newWeldingLocation = new Model.Base_WeldingLocation
            {
-                WeldingLocationCode = this.txtWeldingLocationCode.Text.Trim(),
-                WeldingLocationName = this.txtWeldingLocationName.Text.Trim(),
+                WeldingLocationCode = code,
+                WeldingLocationName = name,
                Remark = this.txtRemark.Text.Trim()
            };

@@ -68,13 +92,11 @@ namespace FineUIPro.Web.HJGL.BaseInfo
            {
                newWeldingLocation.WeldingLocationId = WeldingLocationId;
                BLL.Base_WeldingLocationServie.UpdateWeldingLocation(newWeldingLocation);
-                //BLL.Sys_LogService.AddLog(Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_PipingClassMenuId, Const.BtnModify, newPipingClass.PipingClassId);
            }
            else
            {
                newWeldingLocation.WeldingLocationId = SQLHelper.GetNewID(typeof(Model.Base_WeldingLocation));
                BLL.Base_WeldingLocationServie.AddWeldingLocation(newWeldingLocation);
-                //BLL.Sys_LogService.AddLog(Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_PipingClassMenuId, Const.BtnAdd, newPipingClass.PipingClassId);
            }

            ShowNotify("保存成功！", MessageBoxIcon.Success);
@@ -29,7 +29,7 @@
                                </f:ToolbarFill>
                                <f:Button ID="btnNew" Text="新建包装" Icon="Add" runat="server" OnClick="btnNew_Click">
                                </f:Button>
-                                <f:Button ID="btnOutPrint" runat="server" Icon="Printer" EnableAjax="false" Text="生成出库单" ToolTip="打印" OnClick="btnOutPrint_Click"></f:Button>
+                                <f:Button ID="btnOutPrint" runat="server" Icon="Printer" EnableAjax="false" Text="生成装箱单" ToolTip="打印" OnClick="btnOutPrint_Click"></f:Button>
                            </Items>
                        </f:Toolbar>
                    </Toolbars>
@@ -33,7 +33,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
        /// </summary>
        private void BindGrid()
        { 
-            var list = BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim(), this.Grid1.PageIndex, this.Grid1.PageSize);
+            var list = BLL.HJGLPackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim(), this.Grid1.PageIndex, this.Grid1.PageSize);
            Grid1.RecordCount = list.Total;
            Grid1.DataSource = list.Data;
            Grid1.DataBind();
@@ -110,20 +110,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
            BindGrid();
        }
        #endregion
-        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
-        {
-            if (e.CommandName == "cmd_detail")
-            {
-                string id = Grid1.SelectedRowID;
-                string url = "PackagingManageView.aspx?PackagingManageId={0}";
-                PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format(url, id, "操作 - ")));
-            }
-            else if (e.CommandName == "cmd_print")
-            {
-                string Id = this.Grid1.SelectedRowID;
-                Pring(Id);
-            }
-        }
+
        #region 增加按钮
        /// <summary>
        /// 增加按钮
@@ -184,7 +171,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
            }
            string id = Grid1.SelectedRowID;
            string url = string.Empty;
-            var wpq = BLL.HJGL_PackagingmanageService.GetHJGL_PackagingManageById(id);
+            var wpq = BLL.HJGLPackagingmanageService.GetHJGL_PackagingManageById(id);
            if (wpq != null)
            {
                url = "PackagingManageEdit.aspx?PackagingManageId={0}";
@@ -192,6 +179,22 @@ namespace FineUIPro.Web.HJGL.PreDesign
                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format(url, id, "操作 - ")));
            }
        }
+
+        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            if (e.CommandName == "cmd_detail")
+            {
+                string id = Grid1.SelectedRowID;
+                string url = "PackagingManageView.aspx?PackagingManageId={0}";
+                PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format(url, id, "操作 - ")));
+            }
+            else if (e.CommandName == "cmd_print")
+            {
+                string Id = this.Grid1.SelectedRowID;
+                Pring(Id);
+            }
+        }
+
        #endregion

        #region 删除
@@ -224,7 +227,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                        string rowID = Grid1.DataKeys[rowIndex][0].ToString();
                        if (this.judgementDelete(rowID, isShow))
                        {
-                            BLL.HJGL_PackagingmanageService.DeleteHJGL_PackagingManageById(rowID);
+                            BLL.HJGLPackagingmanageService.DeleteHJGL_PackagingManageById(rowID);
                            //BLL.Sys_LogService.AddLog(BLL.Const.System_2, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, "删除焊接工艺评定台账");
                        }
                    }
@@ -262,6 +265,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
            }
        }
        #endregion
+
        #region 打印
        /// <summary>
        /// 打印
@@ -278,7 +282,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
            if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID))
            {
                string Id = this.Grid1.SelectedRowID;
-                var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(Id);
+                var model = HJGLPackagingmanageService.GetHJGL_PackagingManageById(Id);
                if (model != null)
                {
                    if (!string.IsNullOrEmpty(model.PipelineComponentId))
@@ -289,7 +293,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                            HJGL_PipelineComponentService.UpdateOutState(item, model.PackagingCode);
                        }
                    }
-                    HJGL_PackagingmanageService.PutOutOrder(Id);
+                    HJGLPackagingmanageService.PutOutOrder(Id);
                    Pring(Id);
                }
            }
@@ -308,10 +312,10 @@ namespace FineUIPro.Web.HJGL.PreDesign
                ShowNotify("请选择要打印的项", MessageBoxIcon.Warning);
                return;
            }
-            DataTable tb = LINQToDataTable(BLL.HJGL_PackagingmanageService.GetPackagingDetailById(Id));
+            DataTable tb = LINQToDataTable(BLL.HJGLPackagingmanageService.GetPackagingDetailById(Id));
            if (tb.Rows.Count > 0)
            {
-                var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(Id);
+                var model = HJGLPackagingmanageService.GetHJGL_PackagingManageById(Id);

                var dtTable = tb.AsEnumerable().OrderBy(o => o["PlanStartDate"]).CopyToDataTable();
                string PlanStartDate = "";
@@ -347,6 +351,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
            }
        }
        #endregion
+
        #region 导出按钮
        /// 导出按钮
        /// </summary>
@@ -412,7 +417,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
        {
            if (state != null)
            {
-                string txt = HJGL_PackagingmanageService.GetState().FirstOrDefault(x => x.Value == state.ToString()).Text;
+                string txt = HJGLPackagingmanageService.GetState().FirstOrDefault(x => x.Value == state.ToString()).Text;

                return txt;
            }
@@ -93,15 +93,15 @@
                                        <f:Button ID="btnSelect" Icon="ShapeSquareSelect" Text="选择" runat="server" ToolTip="选择"
                                            OnClick="btnSelect_Click">
                                        </f:Button>
-                                        <f:Button ID="btnSelectStock" Icon="ShapeSquareSelect" Text="选择" runat="server" ToolTip="选择"
+                                        <%--<f:Button ID="btnSelectStock" Icon="ShapeSquareSelect" Text="选择" runat="server" ToolTip="选择"
                                            OnClick="btnSelectStock_Click">
-                                        </f:Button>
+                                        </f:Button>--%>
                                    </Items>
                                </f:Toolbar>
                            </Toolbars>
                            <Columns>
-                                <f:RenderField Width="150px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
-                                    FieldType="String" HeaderText="管线号" TextAlign="Left" HeaderTextAlign="Center">
+                                <f:RenderField Width="150px" ColumnID="CusBillCode" DataField="CusBillCode" SortField="CusBillCode"
+                                    FieldType="String" HeaderText="出库单" TextAlign="Left" HeaderTextAlign="Center">
                                </f:RenderField>
                                <f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
                                    FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
@@ -32,21 +32,21 @@ namespace FineUIPro.Web.HJGL.PreDesign

                drpTypeInt.DataTextField = "Key";
                drpTypeInt.DataValueField = "Value";
-                drpTypeInt.DataSource = HJGL_PackagingmanageService.TypeIntMap;
+                drpTypeInt.DataSource = HJGLPackagingmanageService.TypeIntMap;
                drpTypeInt.DataBind();
 

                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                if (!string.IsNullOrEmpty(PackagingManageId))
                {
-                    var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
+                    var model = HJGLPackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
                    drpTypeInt.Enabled = false;
                    txtPackagingCode.Text = model.PackagingCode;
                    dropPipelineComponentCode.Values = model.PipelineComponentId?.Split(',');
                    txtStackingPosition.Text = model.StackingPosition; 
                    drpTrainNumber.SelectedValue = model.TrainNumberId;
                    drpTypeInt.SelectedValue = model.TypeInt.ToString();
-                    if (model.State== HJGL_PackagingmanageService.state_0)
+                    if (model.State== HJGLPackagingmanageService.state_0)
                    {
                        btnSave.Hidden = false;
                    }
@@ -55,7 +55,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                { 
                    drpTypeInt.Enabled = true;
                    btnSave.Hidden = false;
-                    txtPackagingCode.Text = HJGL_PackagingmanageService.GetNewPackagingCode(this.CurrUser.LoginProjectId);
+                    txtPackagingCode.Text = HJGLPackagingmanageService.GetNewPackagingCode(this.CurrUser.LoginProjectId);
                }
                drpTypeInt_SelectedIndexChanged(null, null);
            }
@@ -99,17 +99,17 @@ namespace FineUIPro.Web.HJGL.PreDesign
                table.TypeInt = int.Parse(drpTypeInt.SelectedValue);
                table.CompileMan = this.CurrUser.PersonId;
                table.CompileDate = DateTime.Now;
-                if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.预制组件).ToString())
+                if (drpTypeInt.SelectedValue == ((int)HJGLPackagingmanageService.TypeInt.预制组件).ToString())
                {
                    table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values);
                }
-                BLL.HJGL_PackagingmanageService.AddHJGL_PackagingManage(table);
+                BLL.HJGLPackagingmanageService.AddHJGL_PackagingManage(table);

                PackagingManageId= table.PackagingManageId;
            }
            else
            {
-                Model.HJGL_PackagingManage table = BLL.HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
+                Model.HJGL_PackagingManage table = BLL.HJGLPackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
                if (table != null)
                {
                    table.PackagingCode = txtPackagingCode.Text;
@@ -120,7 +120,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                    //table.ContactPhone =txtContactPhone.Text;
                    table.TrainNumberId = drpTrainNumber.SelectedValue;
                    table.TypeInt = int.Parse(drpTypeInt.SelectedValue);
-                    if (drpTypeInt.SelectedValue ==((int)HJGL_PackagingmanageService.TypeInt.预制组件).ToString())
+                    if (drpTypeInt.SelectedValue ==((int)HJGLPackagingmanageService.TypeInt.预制组件).ToString())
                    {
                        table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values);

@@ -147,7 +147,7 @@ namespace FineUIPro.Web.HJGL.PreDesign

                    }
                }
-                BLL.HJGL_PackagingmanageService.UpdateHJGL_PackagingManage(table);
+                BLL.HJGLPackagingmanageService.UpdateHJGL_PackagingManage(table);
            }
            SaveDetail();
        }
@@ -188,7 +188,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
        protected void btnSelect_Click(object sender, EventArgs e)
        {
            Save();
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PackagingManageSelect.aspx?PackagingManageId={0}", PackagingManageId, "选择- ")));
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PackagingManageSelect.aspx?PackagingManageId={0}&TypeInt={1}", PackagingManageId, drpTypeInt.SelectedValue, "选择- ")));

        }
        protected void btnSelectStock_Click(object sender, EventArgs e)
@@ -201,31 +201,22 @@ namespace FineUIPro.Web.HJGL.PreDesign

        protected void drpTypeInt_SelectedIndexChanged(object sender, EventArgs e)
        {
-            if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.预制组件).ToString())
+            if (drpTypeInt.SelectedValue == ((int)HJGLPackagingmanageService.TypeInt.预制组件).ToString())
            {
                dropPipelineComponentCode.Hidden=false;
                Grid2.Hidden=true;
                BindGrid();
            }
-            else if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.预制散件).ToString())
+            else  
            {
                dropPipelineComponentCode.Hidden = true;
                Grid2.Hidden = false;
                btnSelect.Hidden = false;
-                btnSelectStock.Hidden = true;
-                BindGrid2(this.PackagingManageId);
+                //btnSelectStock.Hidden = true;
+                BindGrid2(this.PackagingManageId); 

            }
-            else if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.其他材料).ToString())
-            {
-                dropPipelineComponentCode.Hidden = true;
-                Grid2.Hidden = false;
-                btnSelect.Hidden = true;
-                btnSelectStock.Hidden = false;
-                BindGrid2(this.PackagingManageId);
-
-            }
-
+            
        }
        protected void Grid2_RowCommand(object sender, GridCommandEventArgs e)
        {
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.HJGL.PreDesign {
-    
-    
-    public partial class PackagingManageEdit {
-        
+namespace FineUIPro.Web.HJGL.PreDesign
+{
+
+
+    public partial class PackagingManageEdit
+    {
+
        /// <summary>
        /// form1 控件。
        /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
        /// <summary>
        /// PageManager1 控件。
        /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.PageManager PageManager1;
-        
+
        /// <summary>
        /// Form2 控件。
        /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Form Form2;
-        
+
        /// <summary>
        /// txtPackagingCode 控件。
        /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtPackagingCode;
-        
+
        /// <summary>
        /// drpTypeInt 控件。
        /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DropDownList drpTypeInt;
-        
+
        /// <summary>
        /// dropPipelineComponentCode 控件。
        /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DropDownBox dropPipelineComponentCode;
-        
+
        /// <summary>
        /// Grid1 控件。
        /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Grid Grid1;
-        
+
        /// <summary>
        /// Label1 控件。
        /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Label Label1;
-        
+
        /// <summary>
        /// Label3 控件。
        /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Label Label3;
-        
+
        /// <summary>
        /// txtpipelineCode 控件。
        /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtpipelineCode;
-        
+
        /// <summary>
        /// txtpipelineComponentCode 控件。
        /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtpipelineComponentCode;
-        
+
        /// <summary>
        /// txtflowingSection 控件。
        /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtflowingSection;
-        
+
        /// <summary>
        /// btnFind 控件。
        /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnFind;
-        
+
        /// <summary>
        /// txtStackingPosition 控件。
        /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtStackingPosition;
-        
+
        /// <summary>
        /// drpTrainNumber 控件。
        /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DropDownList drpTrainNumber;
-        
+
        /// <summary>
        /// Grid2 控件。
        /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Grid Grid2;
-        
+
        /// <summary>
        /// Toolbar3 控件。
        /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar3;
-        
+
        /// <summary>
        /// btnSelect 控件。
        /// </summary>
@@ -173,16 +175,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnSelect;
-        
-        /// <summary>
-        /// btnSelectStock 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnSelectStock;
-        
+
        /// <summary>
        /// tbNumber 控件。
        /// </summary>
@@ -191,7 +184,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.NumberBox tbNumber;
-        
+
        /// <summary>
        /// Toolbar2 控件。
        /// </summary>
@@ -200,7 +193,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar2;
-        
+
        /// <summary>
        /// btnSave 控件。
        /// </summary>
@@ -209,7 +202,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnSave;
-        
+
        /// <summary>
        /// btnClose 控件。
        /// </summary>
@@ -218,7 +211,7 @@ namespace FineUIPro.Web.HJGL.PreDesign {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnClose;
-        
+
        /// <summary>
        /// Window1 控件。
        /// </summary>
@@ -49,7 +49,7 @@
                        <f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="单位工程"
                            OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
                            AutoLeafIdentification="true"
-                            EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
+                            EnableTextSelection="true"  >
                        </f:Tree>
                    </Items>
                </f:Panel>
@@ -68,7 +68,7 @@
                            DataKeyNames="Id" EnableColumnLines="true"
                            DataIDField="Id" EnableTextSelection="True" AllowSorting="true" SortField="MaterialCode"
                            SortDirection="ASC"   AllowPaging="false" IsDatabasePaging="true"
-                            PageSize="1000" EnableCheckBoxSelect="true">
+                            PageSize="1000" EnableCheckBoxSelect="true"  OnRowDataBound="Grid1_RowDataBound">
                            <Toolbars>
                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
                                    <Items>
@@ -85,6 +85,9 @@
                                </f:Toolbar>
                            </Toolbars>
                            <Columns>
+                                <f:RenderField Width="150px" ColumnID="CusBillCode" DataField="CusBillCode" SortField="CusBillCode"
+                                    FieldType="String" HeaderText="出库单编号" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
                                <f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
                                    FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
                                </f:RenderField>
@@ -97,8 +100,8 @@
                                <f:RenderField Width="150px" ColumnID="MaterialUnit" DataField="MaterialUnit" SortField="MaterialUnit"
                                    FieldType="String" HeaderText="单位" TextAlign="Left" HeaderTextAlign="Center">
                                </f:RenderField>
-                                <f:RenderField Width="150px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
-                                    FieldType="String" HeaderText="计划数量" TextAlign="Left" HeaderTextAlign="Center">
+                                <f:RenderField Width="150px" ColumnID="ActNum" DataField="ActNum" SortField="ActNum"
+                                    FieldType="String" HeaderText="数量" TextAlign="Left" HeaderTextAlign="Center">
                                </f:RenderField> 
                            </Columns>
                        </f:Grid>
@@ -1,15 +1,8 @@
 using BLL;
-using FastReport.DevComponents.DotNetBar;
-using FineUIPro.Web.HJGL.WeldingManage;
-using Model;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.Linq;
-using System.Web;
-using System.Web.UI;
 using System.Web.UI.WebControls;

 namespace FineUIPro.Web.HJGL.PreDesign
@@ -32,6 +25,20 @@ namespace FineUIPro.Web.HJGL.PreDesign
                ViewState["PackagingManageId"] = value;
            }
        }
+        /// <summary>
+        /// 0是散件 1 是其他
+        /// </summary>
+        public string TypeInt
+        {
+            get
+            {
+                return (string)ViewState["TypeInt"];
+            }
+            set
+            {
+                ViewState["TypeInt"] = value;
+            }
+        }

        #endregion 定义项

@@ -46,7 +53,8 @@ namespace FineUIPro.Web.HJGL.PreDesign
        {
            if (!IsPostBack)
            {
-                PackagingManageId = Request.QueryString["PackagingManageId"];
+                PackagingManageId = Request.Params["PackagingManageId"];
+                TypeInt = Request.Params["TypeInt"];
                this.InitTreeMenu();//加载树
                InitDropList();
            }
@@ -55,12 +63,6 @@ namespace FineUIPro.Web.HJGL.PreDesign
        #endregion 加载页面

        #region 加载树
-
-        private void BindNodes(TreeNode node)
-        {
-            BLL.PipelineService.BindTreeNodes(node, this.tvPipeCode.Text.Trim(), txtMaterialCode.Text.Trim(), this.CurrUser.LoginProjectId, pageSize);
-        }
-
        /// <summary>
        /// 加载树
        /// </summary>
@@ -86,141 +88,46 @@ namespace FineUIPro.Web.HJGL.PreDesign
            var pUnits = (from x in Funs.DB.Project_ProjectUnit where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
            // 获取当前用户所在单位
            var currUnit = pUnits.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId);
-
+            //获取主项
            var unitWorkList = (from x in Funs.DB.WBS_UnitWork
                                where x.ProjectId == this.CurrUser.LoginProjectId
                                      && x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
                                select x).ToList();
+            //获取当前项目出库单
+            Model.Tw_InOutMasterOutput querytable = new Model.Tw_InOutMasterOutput();
+            querytable.ProjectId = this.CurrUser.LoginProjectId;
+            querytable.InOutType = (int?)TwConst.InOutType.出库;
+            querytable.TypeInt = TypeInt == ((int)HJGLPackagingmanageService.TypeInt.预制散件).ToString() ? (int)TwConst.TypeInt.散件出库 : (int)TwConst.TypeInt.其他出库;
+            var outMasterOutputs = BLL.TwOutputmasterService.GetListData(querytable);

            List<Model.WBS_UnitWork> unitWork1 = null;
            List<Model.WBS_UnitWork> unitWork2 = null;

-            //// 当前为施工单位，只能操作本单位的数据
-            //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
-            //{
-            //    unitWork1 = (from x in unitWorkList
-            //                 where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
-            //                 select x).ToList();
-            //    unitWork2 = (from x in unitWorkList
-            //                 where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
-            //                 select x).ToList();
-            //}
-            //else
-            //{
-            unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
            unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
-            //}
-            //var dbpipeLineMat = from x in Funs.DB.HJGL_PipeLineMat select x;
-            //var DBpipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId select x;
-            if (unitWork1.Count() > 0)
-            {
-                foreach (var q in unitWork1)
-                {
-                    string strSql = " SELECT DISTINCT [t0].[PipelineId] FROM [dbo].[HJGL_Pipeline] AS [t0]\r\nleft JOIN [dbo].[HJGL_PipeLineMat] AS [t1] ON [t0].[PipelineId] = [t1].[PipelineId]";
-                    strSql += "where  [t0].[UnitWorkId] =@UnitWorkId ";
-                    List<SqlParameter> listStr = new List<SqlParameter>();
-                    listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId));
-
-                    if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
-                    {
-                        strSql += " and  [t1].[MaterialCode] like @MaterialCode";
-                        listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode.Text.Trim() + "%"));
-
-                    }
-                    if (!string.IsNullOrEmpty(tvPipeCode.Text.Trim()))
-                    {
-                        strSql += " and  [t0].[PipelineCode] like @PipelineCode";
-                        listStr.Add(new SqlParameter("@PipelineCode", "%" + tvPipeCode.Text.Trim() + "%"));
-
-                    }
-                    SqlParameter[] parameter = listStr.ToArray();
-                    DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
-                    var a = dt.Rows.Count;
-
-                    //int a = (from x in DBpipeline
-                    //         join y in dbpipeLineMat on x.PipelineId equals y.PipelineId
-                    //         where x.PipelineCode.Contains(tvPipeCode.Text.Trim()) && x.UnitWorkId == q.UnitWorkId
-                    //         && y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
-                    //         select x.PipelineId).Distinct().Count();
-                    var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
-                    TreeNode tn1 = new TreeNode();
-                    tn1.NodeID = q.UnitWorkId;
-                    tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
-                    tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
-                    tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
-                    tn1.EnableExpandEvent = true;
-                    rootNode1.Nodes.Add(tn1);
-                    if (a > 0)
-                    {
-                        // BindNodes(tn1);
-                        TreeNode newNode = new TreeNode();
-                        newNode.Text = "加载管线...";
-                        newNode.NodeID = "加载管线...";
-                        tn1.Nodes.Add(newNode);
-                    }
-                }
-            }
+ 
            if (unitWork2.Count() > 0)
            {

                foreach (var q in unitWork2)
                {
-                    string strSql = " SELECT DISTINCT [t0].[PipelineId] FROM [dbo].[HJGL_Pipeline] AS [t0]\r\nleft JOIN [dbo].[HJGL_PipeLineMat] AS [t1] ON [t0].[PipelineId] = [t1].[PipelineId]";
-                    strSql += "where  [t0].[UnitWorkId] =@UnitWorkId ";
-                    List<SqlParameter> listStr = new List<SqlParameter>();
-                    listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId));
-
-                    if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
-                    {
-                        strSql += " and  [t1].[MaterialCode] like @MaterialCode";
-                        listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode.Text.Trim() + "%"));
-
-                    }
-                    if (!string.IsNullOrEmpty(tvPipeCode.Text.Trim()))
-                    {
-                        strSql += " and  [t0].[PipelineCode] like @PipelineCode";
-                        listStr.Add(new SqlParameter("@PipelineCode", "%" + tvPipeCode.Text.Trim() + "%"));
-
-                    }
-                    SqlParameter[] parameter = listStr.ToArray();
-                    DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
-
-                    var a = dt.Rows.Count;
-
-                    //var b = (from x in Funs.DB.HJGL_Pipeline
-                    //         join y in Funs.DB.HJGL_PipeLineMat on x.PipelineId equals y.PipelineId
-                    //         where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
-                    //         select x).Distinct();
-                    //var b = (from x in DBpipeline 
-                    //         join y in dbpipeLineMat on x.PipelineId equals y.PipelineId
-                    //         where x.PipelineCode.Contains(tvPipeCode.Text.Trim()) && x.UnitWorkId == q.UnitWorkId
-                    //         && y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
-                    //         select x.PipelineId).Distinct();
-                    //int a = (from x in DBpipeline
-                    //         join y in dbpipeLineMat on x.PipelineId equals y.PipelineId
-                    //         where x.PipelineCode.Contains(tvPipeCode.Text.Trim()) && x.UnitWorkId == q.UnitWorkId
-                    //         && y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
-                    //         select x.PipelineId).Distinct().Count();
+                    var unitworkOutMasterOutputs = outMasterOutputs.Where(x => x.UnitWorkId == q.UnitWorkId);
                    var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
                    TreeNode tn2 = new TreeNode();
                    tn2.NodeID = q.UnitWorkId;
-                    tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
-                    //if (q.UnitWorkId == this.hdUnitWorkId.Text)
-                    //{
-                    //    tn2.Expanded = true;
-                    //}
+                    tn2.Text = q.UnitWorkName;
                    tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
-                    tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
+                    //tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
                    tn2.EnableExpandEvent = true;
                    tn2.EnableClickEvent = true;

                    rootNode2.Nodes.Add(tn2);
-                    if (a > 0)
+                    foreach (var item in unitworkOutMasterOutputs)
                    {
-                        // BindNodes(tn2);
-                        TreeNode newNode = new TreeNode();
-                        newNode.Text = "加载管线...";
-                        newNode.NodeID = "加载管线...";
+                        FineUIPro.TreeNode newNode = new FineUIPro.TreeNode();
+                        newNode.Text = item.CusBillCode;
+                        newNode.NodeID = item.Id;
+                        newNode.CommandName = "出库单";
+                        newNode.EnableClickEvent = true;
                        tn2.Nodes.Add(newNode);
                    }
                }
@@ -234,20 +141,6 @@ namespace FineUIPro.Web.HJGL.PreDesign
        protected void btnTreeFind_Click(object sender, EventArgs e)
        {
            this.InitTreeMenu();
-            //this.BindGrid3(this.tvControlItem.SelectedNodeID);
-        }
-
-        #endregion Methods
-
-        #region Methods
-
-        protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
-        {
-            if (e.Node.Nodes[0].NodeID == "加载管线...")
-            {
-                e.Node.Nodes.Clear();
-                BindNodes(e.Node);
-            }
        }

        #endregion Methods
@@ -267,20 +160,14 @@ namespace FineUIPro.Web.HJGL.PreDesign
                e.Node.ParentNode.CommandName = (int.Parse(CommandName.Split('|')[0]) + 1) + "|" + int.Parse(CommandName.Split('|')[1]);
                TreeNode treeNode = e.Node.ParentNode;
                treeNode.Nodes.Remove(e.Node);
-                BindNodes(e.Node.ParentNode);
            }
            else
            {
                if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
-                {
-                    Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
-                    this.hdUnitWorkId.Text = string.Empty;
-                    if (pipeline != null)
-                    {
-                        this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
+                { 
+                     
+                    this.BindGrid(this.tvControlItem.SelectedNodeID);

-                        this.BindGrid(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
-                    }
                }
            }
        }
@@ -288,23 +175,44 @@ namespace FineUIPro.Web.HJGL.PreDesign
        #endregion 点击TreeView

        #region 数据绑定
-
-        private void BindGrid(string pipelineId, string unitworkid) 
+        /// <summary>
+        /// 行绑定事件（没有焊接方法无法选择）
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
        {
-            var Prelist = HJGL_PipelineComponentService.GetPipelinePrefabricatedComponent(unitworkid, pipelineId);
+            DataRowView row = e.DataItem as DataRowView;
+            string id = e.RowID;
+            if (Funs.DB.HJGL_PackagingManageDetail.Any(x=>x.TwOutputDetailId==id))
+            {
+                e.RowSelectable = false;  
+            }
+            ;
+        }
+        private void BindGrid(string outputMasterId)
+        {
+            ////var Prelist = HJGL_PipelineComponentService.GetPipelinePrefabricatedComponent(unitworkid, pipelineId);
             
-            var inoutplandetail = (from x in Funs.DB.HJGL_PackagingManageDetail
-                                        where x.PipelineId == pipelineId
-                                        && (x.PipelineComponentId == null || x.PipelineComponentId == "")
-                                        select x).ToList();
-            var queryList = Prelist;
-            // 优化 Linq 过滤条件,过滤已经进入包装的预制散件
-            var result = (from x in queryList
-                          join y in inoutplandetail on x.MaterialCode equals y.MaterialCode into yy
-                          from y in yy.DefaultIfEmpty()
-                          where y == null
-                          select x).ToList();
-            Grid1.DataSource = result;
+            ////var inoutplandetail = (from x in Funs.DB.HJGL_PackagingManageDetail
+            ////                            where x.PipelineId == pipelineId
+            ////                            && (x.PipelineComponentId == null || x.PipelineComponentId == "")
+            ////                            select x).ToList();
+            ////var queryList = Prelist;
+            ////// 优化 Linq 过滤条件,过滤已经进入包装的预制散件
+            ////var result = (from x in queryList
+            ////              join y in inoutplandetail on x.MaterialCode equals y.MaterialCode into yy
+            ////              from y in yy.DefaultIfEmpty()
+            ////              where y == null
+            ////              select x).ToList();
+            ////Grid1.DataSource = result;
+            ////Grid1.DataBind();
+
+
+            Model.Tw_InOutDetailOutput table = new Model.Tw_InOutDetailOutput();
+            table.OutputMasterId = outputMasterId;
+            var tb = BLL.TwOutputdetailService.GetByModle(table).ToList();
+            Grid1.DataSource = tb;
            Grid1.DataBind();
        }

@@ -338,26 +246,27 @@ namespace FineUIPro.Web.HJGL.PreDesign
        protected void btnSave_Click(object sender, EventArgs e)
        {
            Save();
-            this.BindGrid(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
+            this.BindGrid(this.tvControlItem.SelectedNodeID);
        }

        private void Save()
        {
-            var List_Id = Grid1.SelectedRowIDArray;
-            if (List_Id != null)
+            var SelectIDArry = Grid1.SelectedRowIDArray;
+            if (SelectIDArry != null)
            {
-                foreach (var id in List_Id)
+                foreach (var id in SelectIDArry)
                {
-                    var hJGL_PipeLineMat = BLL.PipelineMatService.GetPipeLineMat(id);
-                    if (hJGL_PipeLineMat != null)
+                    var twoutputdetailModel = BLL.TwOutputdetailService.GetById(id);
+                    if (twoutputdetailModel != null)
                    {
                        var model = new Model.HJGL_PackagingManageDetail()
                        {
                            Id = SQLHelper.GetNewID(),
                            PackagingManageId = this.PackagingManageId,
-                            PipelineId = hJGL_PipeLineMat.PipelineId,
-                            MaterialCode = hJGL_PipeLineMat.MaterialCode,
-                            Number = hJGL_PipeLineMat.Number,
+                            //PipelineId = hJGL_PipeLineMat.PipelineId,
+                            MaterialCode = twoutputdetailModel.MaterialCode,
+                            Number = twoutputdetailModel.ActNum,
+                            TwOutputDetailId = twoutputdetailModel.Id,
                            CreateTime = DateTime.Now,
                            CreateUser = this.CurrUser.PersonId,
                        };
@@ -45,9 +45,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
        /// </summary>
        private void BindGrid()
        {
-            var pack = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
+            var pack = HJGLPackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
            if (pack == null) return;
-            var detailList= HJGL_PackagingmanageService.GetPackagingDetailById(PackagingManageId);
+            var detailList= HJGLPackagingmanageService.GetPackagingDetailById(PackagingManageId);
            Grid1.RecordCount = detailList.Count();
            Grid1.DataSource = detailList;
            Grid1.DataBind();
@@ -366,6 +366,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                //    List<SqlParameter> listStr = new List<SqlParameter>();
                //    listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
                //    if (!string.IsNullOrEmpty(this.hdUnitWorkId.Text))
+
                //    {
                //        listStr.Add(new SqlParameter("@unitWorkId", this.hdUnitWorkId.Text));
                //    }
@@ -43,7 +43,7 @@
                                    OnClick="btnNew_Click">
                                </f:Button>
                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                    EnableAjax="false" DisableControlBeforePostBack="false" Hidden="true">
                                </f:Button>
                                <f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="打印" ToolTip="打印" OnClick="btnPrint_Click"></f:Button>
                            </Items>
@@ -296,7 +296,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                ShowNotify("请选择要打印的项", MessageBoxIcon.Warning);
                return;
            }
-            DataTable tb = LINQToDataTable(HJGL_PackagingmanageService.GetPackagingManage(Id));
+            DataTable tb = LINQToDataTable(HJGLPackagingmanageService.GetPackagingManage(Id));
            if (tb.Rows.Count > 0)
            {
                var model = TrainNumberManageService.GetModelById(Id); 
@@ -44,7 +44,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
        private void BindGrid()
        {

-            var result = HJGL_PackagingmanageService.GetPackagingManage(TrainNumberId); 
+            var result = HJGLPackagingmanageService.GetPackagingManage(TrainNumberId); 
            Grid1.RecordCount = result.Count();
            Grid1.DataSource = result;
            Grid1.DataBind();
@@ -64,7 +64,7 @@
                                <f:RenderField HeaderText="打印状态" ColumnID="PrintState" DataField="PrintState" SortField="PrintState"
                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
                                </f:RenderField> 
-                                 <f:LinkButtonField Width="60px" TextAlign="Center" CommandName="typePrint" Text="分类打印" />
+                                 <f:LinkButtonField Width="60px" TextAlign="Center" CommandName="typePrint" Text="子类打印" />
                            </Columns>
                            <PageItems>
                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@@ -33,7 +33,7 @@
        <Items>
            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="试压包打印表" EnableCollapse="true"
                runat="server" BoxFlex="1" DataKeyNames="TypeInt" AllowCellEditing="true"  ForceFit="true"
-                 DataIDField="TypeInt" AllowSorting="true" SortField="TypeInt"
+                 DataIDField="TypeInt" AllowSorting="true" SortField="TypeInt" EnableCheckBoxSelect="true" 
                SortDirection="DESC"  EnableColumnLines="true"
                AllowPaging="true" IsDatabasePaging="true" PageSize="10">
                <Toolbars>
@@ -58,26 +58,28 @@ namespace FineUIPro.Web.HJGL.TestPackage
        protected void btnPrint_Click(object sender, EventArgs e)
        {
            Model.PTP_TestPackage updateTestPackage = Funs.DB.PTP_TestPackage.FirstOrDefault(x => x.PTP_ID == PTP_ID);
-
-            var fastReportItem = BLL.TestPackagePrintService.GetFastReportItem(updateTestPackage,Grid1.SelectedRowID,PTP_ID,this.CurrUser.LoginProjectId);
-            BLL.FastReportService.ResetData();
-            BLL.FastReportService.AddFastreportParameter(fastReportItem.ParameterValues);
-            if (fastReportItem.DataTables!=null)
+            List<Model.FastReportItem> FastReportItemList = new List<Model.FastReportItem>();
+            foreach (var item in Grid1.SelectedRowIDArray)
            {
-                foreach (var item in fastReportItem.DataTables)
-                {
-                    BLL.FastReportService.AddFastreportTable(item);
-                }
+                var fastReportItem = BLL.TestPackagePrintService.GetFastReportItem(updateTestPackage, item, PTP_ID, this.CurrUser.LoginProjectId);
+                FastReportItemList.Add(fastReportItem);
+                TestPackagePrintService.AddPrintCountByTypeInt(PTP_ID, int.Parse(item)); //增加打印次数
            }
-            string initTemplatePath = "";
-            string rootPath = Server.MapPath("~/");
-            initTemplatePath = fastReportItem.ReportPath;

-            if (File.Exists(rootPath + initTemplatePath))
-            {
-                TestPackagePrintService.AddPrintCountByTypeInt(PTP_ID, int.Parse( Grid1.SelectedRowID));
-                PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Controls/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
-            }
-        }
+            // 在文件名中加入时间戳，例如：PTP_ID_2025-09-17-14-30-00.pdf
+            string timeStamp = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
+            string fileName = $"{PTP_ID}_{timeStamp}.pdf";
+            string filePath = System.IO.Path.Combine(Funs.RootPath, "FileUpload", fileName); 
+            BLL.FastReportService.ExportMergeReport(FastReportItemList, filePath, "1");
+            FileInfo info = new FileInfo(filePath);
+            long fileSize = info.Length;
+            System.Web.HttpContext.Current.Response.Clear();
+            System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("试压包资料子类.pdf", System.Text.Encoding.UTF8));
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
+            System.Web.HttpContext.Current.Response.TransmitFile(filePath, 0, fileSize);
+            System.Web.HttpContext.Current.Response.Flush();
+            System.Web.HttpContext.Current.Response.Close();
+        } 
    }
 }
@@ -37,9 +37,9 @@
                <f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
                    ShowHeader="false" Layout="Region" BoxConfigAlign="Stretch">
                    <Items>
-                        <f:Panel ID="panelTopRegion" runat="server" RegionPosition="Center" ShowBorder="true" 
+                        <f:Panel ID="panelTopRegion" runat="server" RegionPosition="Center" ShowBorder="true"  EnableCollapse="true"
                            Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
-                            TitleToolTip="三维模型显示" AutoScroll="true" RegionPercent="70%">
+                            TitleToolTip="三维模型显示" AutoScroll="true" RegionPercent="30%">
                            <Items>
                                <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
                                    BodyPadding="0px">
@@ -50,7 +50,7 @@
                        </f:Panel>
                        <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Bottom" RegionSplit="true" EnableCollapse="true" ShowBorder="true"
                            Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="试压包"
-                            TitleToolTip="试压包" AutoScroll="true" RegionPercent="30%">
+                            TitleToolTip="试压包" AutoScroll="true" RegionPercent="70%">
                            <Items>
                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="试压包明细" EnableCollapse="true" Collapsed="false"
                                    runat="server" BoxFlex="1" DataKeyNames="PT_PipeId" AllowCellEditing="true" OnRowClick="Grid1_RowClick"   EnableRowClickEvent="true"
@@ -72,7 +72,7 @@
                                        </f:Toolbar>
                                    </Toolbars>
                                    <Columns>
-                                        <f:WindowField ColumnID="myWindowField1" Width="160px" WindowID="Window1" HeaderText="管线编号"
+                                        <f:WindowField ColumnID="myWindowField1" Width="160px" WindowID="Window3" HeaderText="管线编号"
                                            Text="编辑" ToolTip="编辑" DataTextFormatString="{0}" DataIFrameUrlFields="PipelineId" DataTextField="PipelineCode"
                                            DataIFrameUrlFormatString="../WeldingManage/PipelineEdit.aspx?PipelineId={0}" DataWindowTitleField="PipelineCode"
                                            DataWindowTitleFormatString="编辑 - {0}" />
@@ -121,6 +121,10 @@
            EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
            IsModal="true" Width="1024px" Height="900px">
        </f:Window>
+        <f:Window ID="Window3" Title="管线信息维护" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="1280px" Height="700px">
+        </f:Window>
        <f:Menu ID="Menu1" runat="server">
            <Items>
                <f:MenuButton ID="btnMenuImport" EnablePostBack="true" runat="server" Text="导入" Icon="PageExcel" OnClick="btnMenuImport_Click" >
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.HJGL.TestPackage {
-    
-    
-    public partial class TestPackageEdit {
-        
+namespace FineUIPro.Web.HJGL.TestPackage
+{
+
+
+    public partial class TestPackageEdit
+    {
+
        /// <summary>
        /// Head1 控件。
        /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
        /// <summary>
        /// form1 控件。
        /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
        /// <summary>
        /// PageManager1 控件。
        /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.PageManager PageManager1;
-        
+
        /// <summary>
        /// Panel1 控件。
        /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Panel Panel1;
-        
+
        /// <summary>
        /// panelLeftRegion 控件。
        /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Panel panelLeftRegion;
-        
+
        /// <summary>
        /// txtCode 控件。
        /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtCode;
-        
+
        /// <summary>
        /// tvControlItem 控件。
        /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Tree tvControlItem;
-        
+
        /// <summary>
        /// hdPTP_ID 控件。
        /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.HiddenField hdPTP_ID;
-        
+
        /// <summary>
        /// Panel2 控件。
        /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Panel Panel2;
-        
+
        /// <summary>
        /// panelTopRegion 控件。
        /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Panel panelTopRegion;
-        
+
        /// <summary>
        /// ContentPanel1 控件。
        /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.ContentPanel ContentPanel1;
-        
+
        /// <summary>
        /// ctlAuditFlow 控件。
        /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Web.Controls._3DLook ctlAuditFlow;
-        
+
        /// <summary>
        /// panelCenterRegion 控件。
        /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Panel panelCenterRegion;
-        
+
        /// <summary>
        /// Grid1 控件。
        /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Grid Grid1;
-        
+
        /// <summary>
        /// Toolbar2 控件。
        /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar2;
-        
+
        /// <summary>
        /// txtTestPackageNo 控件。
        /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Label txtTestPackageNo;
-        
+
        /// <summary>
        /// txtTestPackageName 控件。
        /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Label txtTestPackageName;
-        
+
        /// <summary>
        /// txtRemark 控件。
        /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Label txtRemark;
-        
+
        /// <summary>
        /// txtadjustTestPressure 控件。
        /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Label txtadjustTestPressure;
-        
+
        /// <summary>
        /// ToolbarSeparator1 控件。
        /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
        /// <summary>
        /// ToolbarText1 控件。
        /// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
        /// <summary>
        /// ddlPageSize 控件。
        /// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
        /// <summary>
        /// Window1 控件。
        /// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Window Window1;
-        
+
        /// <summary>
        /// Window2 控件。
        /// </summary>
@@ -227,7 +229,16 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Window Window2;
-        
+
+        /// <summary>
+        /// Window3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window3;
+
        /// <summary>
        /// Menu1 控件。
        /// </summary>
@@ -236,7 +247,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Menu Menu1;
-        
+
        /// <summary>
        /// btnMenuImport 控件。
        /// </summary>
@@ -245,7 +256,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton btnMenuImport;
-        
+
        /// <summary>
        /// btnMenuNew 控件。
        /// </summary>
@@ -254,7 +265,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton btnMenuNew;
-        
+
        /// <summary>
        /// btnMenuModify 控件。
        /// </summary>
@@ -263,7 +274,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
        /// <summary>
        /// btnMenuSee 控件。
        /// </summary>
@@ -272,7 +283,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton btnMenuSee;
-        
+
        /// <summary>
        /// btnMenuDel 控件。
        /// </summary>
@@ -281,7 +292,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton btnMenuDel;
-        
+
        /// <summary>
        /// btnPrinterAll 控件。
        /// </summary>
@@ -194,9 +194,9 @@ namespace FineUIPro.Web.HJGL.TestPackage
                        pipeline.UnitId = unitWork.UnitId;                        
                    }

-                    if (pds[i].A != null)
+                    if (pds[i].B != null)
                    {
-                        string col0 = pds[i].A.ToString();
+                        string col0 = pds[i].B.ToString();
                        if (string.IsNullOrEmpty(col0))
                        {
                            result.Add("第" + (i + 1).ToString() + "行," + "试压包编号" + "," + "此项为必填项！" + "|");
@@ -210,21 +210,21 @@ namespace FineUIPro.Web.HJGL.TestPackage
                    {
                        result.Add("第" + (i + 1).ToString() + "行," + "试压包编号" + "," + "此项为必填项！" + "|");
                    }
-                    if (pds[i].B != null)
-                    {
-                        pipeline.TestPackageName = pds[i].B.ToString();//系统名称
-                    }
                    if (pds[i].C != null)
                    {
-                        pipeline.AdjustTestPressure = pds[i].C.ToString();//调整试验压力
+                        pipeline.TestPackageName = pds[i].C.ToString();//系统名称
                    }
                    if (pds[i].D != null)
                    {
-                        pipeline.Remark = pds[i].D.ToString(); //备注
+                        pipeline.AdjustTestPressure = pds[i].D.ToString();//调整试验压力
                    }
-                    if (pds[i].E != null) //管线号
+                    if (pds[i].E != null)
                    {
-                        string col2 = pds[i].E.ToString();
+                        pipeline.Remark = pds[i].E.ToString(); //备注
+                    }
+                    if (pds[i].F != null) //管线号
+                    {
+                        string col2 = pds[i].F.ToString();
                        if (string.IsNullOrEmpty(col2))
                        {
                            result.Add("第" + (i + 1).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|");
@@ -532,9 +532,24 @@ namespace FineUIPro.Web.HJGL.TestPackage
                                x.TestPressure
                            };

+                // materialize and add sequence number
+                var list = queryList.ToList();
+                var indexed = list.Select((x, idx) => new
+                {
+                    No = idx + 1,
+                    x.PipelineId,
+                    x.PipelineCode,
+                    x.PipingClassCode,
+                    x.MediumName,
+                    x.DesignPress,
+                    x.DesignTemperature,
+                    x.TestMediumCode,
+                    x.TestPressure
+                }).ToList();
+
                var value = new
                {
-                    model = queryList.ToList()
+                    model = indexed
                };
                MiniExcel.SaveAsByTemplate(path, uploadfilepath, value);
            }
@@ -13,7 +13,7 @@
        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
            <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="评标小组名单审批" EnableCollapse="true"
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="评标委员会组建审批" EnableCollapse="true"
                    runat="server" BoxFlex="1" DataKeyNames="ApproveUserReviewID" AllowCellEditing="true"
                    ClicksToEdit="2" DataIDField="ApproveUserReviewID" AllowSorting="true" OnSort="Grid1_Sort"
                    SortDirection="DESC" EnableColumnLines="true" OnRowDoubleClick="Grid1_RowDoubleClick" OnPageIndexChange="Grid1_PageIndexChange"
@@ -110,7 +110,7 @@
                </f:Grid>
            </Items>
        </f:Panel>
-        <f:Window ID="Window1" Title="评标小组名单审批" Hidden="true" EnableIFrame="true" EnableMaximize="true" Maximized="false"
+        <f:Window ID="Window1" Title="评标委员会组建审批" Hidden="true" EnableIFrame="true" EnableMaximize="true" Maximized="false"
            Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close"  EnableDrag="true"
            Width="1200px" Height="650px">
        </f:Window>
@@ -32,7 +32,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                    Const.ContractReviewing.ToString (),
                    Const.ContractReview_Refuse.ToString()
                };
-                btnNew.OnClientClick = Window1.GetShowReference("ApproveUserReviewEdit.aspx", "评标小组名单审批创建") + "return false;";
+                btnNew.OnClientClick = Window1.GetShowReference("ApproveUserReviewEdit.aspx", "评标委员会组建审批") + "return false;";
                GetButtonPower();
                BindGrid();
            }
@@ -97,13 +97,12 @@

                        <f:DropDownList ID="DropApproval_Construction" runat="server" AutoPostBack="true" EnableEdit="true" Label="主办部门负责人" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
                    </Items>
-                </f:FormRow>
-
- <%--               <f:FormRow>
+                </f:FormRow> 
+                <f:FormRow>
                    <Items>
-                        <f:DropDownList ID="DropDeputyGeneralManager" runat="server" AutoPostBack="true" EnableEdit="true" Label="项目主管领导" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
+                        <f:DropDownList ID="DropDeputyGeneralManager" runat="server" AutoPostBack="true" EnableEdit="true" Label="分管领导" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
                    </Items>
-                </f:FormRow>--%>
+                </f:FormRow>
                <f:FormRow>
                    <Items>
                        <f:Label ID="label12" runat="server" Text="注：“说明”栏填写内容为“技术或技术组小组长”或“商务或商务组小组长”或“评标组长”。"></f:Label>
@@ -50,6 +50,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropApproval_Construction, null, CurrUser.UnitId, Const.ConstructionMinister + "," + Const.ConstructionViceMinister, false);

                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropConstructionManager, null, Const.UnitId_SEDIN, null, true);
+                //分管领导
+                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropDeputyGeneralManager, null, this.CurrUser.UnitId, Const.DeputyGeneralManager, false);
+
                Bind();
                BindGrid();
                #region Grid1
@@ -109,7 +112,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                    DropConstructionManager.SelectedValue = Bid.ConstructionManager;
                    //  DropProjectManager.SelectedValue = Bid.ProjectManager;
                    DropApproval_Construction.SelectedValue = Bid.Approval_Construction;
-                    //DropDeputyGeneralManager.SelectedValue = Bid.DeputyGeneralManager;
+                    DropDeputyGeneralManager.SelectedValue = Bid.DeputyGeneralManager;
                    DropDepart.SelectedValue = Bid.DepartId;
                }

@@ -192,12 +195,12 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                return false;

            }
-            //if (DropDeputyGeneralManager.SelectedValue == Const._Null)
-            //{
-            //    ShowNotify("请选择分管副总经理！", MessageBoxIcon.Warning);
-            //    return false;
+/*            if (DropDeputyGeneralManager.SelectedValue == Const._Null)
+            {
+                ShowNotify("请选择分管副总经理！", MessageBoxIcon.Warning);
+                return false;

-            //}
+            }*/

            Model.PHTGL_BidApproveUserReview newtable = new Model.PHTGL_BidApproveUserReview();
            var Bid = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(drpBidDocumentCode.SelectedValue);
@@ -211,7 +214,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
            newtable.ConstructionManager = DropConstructionManager.SelectedValue;
            // newtable.ProjectManager = DropProjectManager.SelectedValue;
            newtable.Approval_Construction = DropApproval_Construction.SelectedValue;
-            // newtable.DeputyGeneralManager = DropDeputyGeneralManager.SelectedValue;
+            newtable.DeputyGeneralManager = DropDeputyGeneralManager.SelectedValue;
            newtable.DepartId = DropDepart.SelectedValue;
            if (string.IsNullOrEmpty(ApproveUserReviewID))
            {
@@ -194,6 +194,15 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
        /// </remarks>
        protected global::FineUIPro.DropDownList DropApproval_Construction;

+        /// <summary>
+        /// DropDeputyGeneralManager 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropDeputyGeneralManager;
+
        /// <summary>
        /// label12 控件。
        /// </summary>