2023-09-07

This commit is contained in:
李鹏飞 2023-09-07 16:38:56 +08:00
parent c4aecfbcaf
commit 36c40ea33c
9 changed files with 580 additions and 60 deletions

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="06/29/2023 17:42:46" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="09/07/2023 16:31:45" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -89,7 +89,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFlrkaEt00MIgAr8gX5JbSr">
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRE3tB+HA6hG9IKF+MBymee2">
<TableDataSource Name="Table1" Alias="Head" DataType="System.Int32" Enabled="true" SelectCommand="select * from CH_Trust where CH_TrustID=@CH_TrustID">
<Column Name="CH_TrustID" DataType="System.String"/>
<Column Name="CH_TrustCode" DataType="System.String"/>

View File

@ -0,0 +1,344 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="09/07/2023 16:37:58" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Windows.Forms;
using System.Drawing;
using System.Data;
using FastReport;
using FastReport.Data;
using FastReport.Dialog;
using FastReport.Barcode;
using FastReport.Table;
using FastReport.Utils;
namespace FastReport
{
public class ReportScript
{
private void Table4_ManualBuild(object sender, EventArgs e)
{
DataSourceBase rowData = Report.GetDataSource(&quot;Table1&quot;);
// init the data source
rowData.Init();
// print the first table row - it is a header
Table4.PrintRow(0);
// each PrintRow call must be followed by either PrintColumn or PrintColumns call
// to print cells on the row
Table4.PrintColumns();
// now enumerate the data source and print the table body
// print the table body
Table4.PrintRow(1);
Table4.PrintColumns();
Table4.PrintRow(2);
Table4.PrintColumns();
Table4.PrintRow(3);
Table4.PrintColumns();
Table4.PrintRow(4);
Table4.PrintColumns();
Table4.PrintRow(5);
Table4.PrintColumns();
// go next data source row
rowData.Next();
}
private void Table5_ManualBuild(object sender, EventArgs e)
{
Table5.PrintRow(0);
Table5.PrintColumns();
Table5.PrintRow(1);
Table5.PrintColumns();
}
private int x;
private void Tabel_Data_ManualBuild(object sender, EventArgs e)
{
DataSourceBase rowData = Report.GetDataSource(&quot;Data&quot;);
// init the data source
rowData.Init();
// print the first table row - it is a header
Tabel_Data.PrintRow(0);
// each PrintRow call must be followed by either PrintColumn or PrintColumns call
// to print cells on the row
Tabel_Data.PrintColumns();
x=0;
// now enumerate the data source and print the table body
while (rowData.HasMoreRows)
{
x++;
// print the table body
Tabel_Data.PrintRow(1);
Tabel_Data.PrintColumns();
// go next data source row
rowData.Next();
}
}
}
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRGRimlRRNsAVGXGMeiv1H1L">
<TableDataSource Name="Table1" Alias="Head" DataType="System.Int32" Enabled="true" SelectCommand="select * from CH_Trust where CH_TrustID=@CH_TrustID">
<Column Name="CH_TrustID" DataType="System.String"/>
<Column Name="CH_TrustCode" DataType="System.String"/>
<Column Name="CH_TrustUnit" DataType="System.String"/>
<Column Name="CH_TrustDate" DataType="System.DateTime"/>
<Column Name="CH_TrustType" DataType="System.String"/>
<Column Name="CH_TrustMan" DataType="System.String"/>
<Column Name="CH_Tabler" DataType="System.String"/>
<Column Name="CH_TableDate" DataType="System.DateTime"/>
<Column Name="CH_AuditMan" DataType="System.String"/>
<Column Name="CH_AuditDate" DataType="System.DateTime"/>
<Column Name="CH_Printer" DataType="System.String"/>
<Column Name="CH_PrintDate" DataType="System.DateTime"/>
<Column Name="CH_UnitName" DataType="System.String"/>
<Column Name="CH_WorkNo" DataType="System.String"/>
<Column Name="CH_ItemName" DataType="System.String"/>
<Column Name="CH_SlopeType" DataType="System.String"/>
<Column Name="CH_ServiceTemp" DataType="System.String"/>
<Column Name="CH_Press" DataType="System.String"/>
<Column Name="CH_WeldMethod" DataType="System.String"/>
<Column Name="CH_NDTRate" DataType="System.String"/>
<Column Name="CH_NDTMethod" DataType="System.String"/>
<Column Name="CH_NDTCriteria" DataType="System.String"/>
<Column Name="CH_AcceptGrade" DataType="System.String"/>
<Column Name="CH_Remark" DataType="System.String"/>
<Column Name="CH_CheckUnit" DataType="System.String"/>
<Column Name="ProjectId" DataType="System.String"/>
<Column Name="InstallationId" DataType="System.String"/>
<Column Name="CH_RequestDate" DataType="System.DateTime"/>
<Column Name="ToIso_Id" DataType="System.String"/>
<CommandParameter Name="CH_TrustID" DataType="22" Expression="[CH_TrustID]"/>
</TableDataSource>
<TableDataSource Name="Table3" Alias="Data" DataType="System.Int32" Enabled="true" SelectCommand=" SELECT batch.PipelineCode ,batch.WeldJointCode,batch.WelderCode,joint.Specification , joint.MaterialCode,joint.Remark &#13;&#10; FROM dbo.View_Batch_BatchTrustItem as batch&#13;&#10; left join View_HJGL_WeldJoint joint on batch .WeldJointId=joint.WeldJointId&#13;&#10; where batch.TrustBatchId=@TrustBatchId">
<Column Name="Remark" DataType="System.Int32" PropName="Column" Calculated="true" Expression=""/>
<Column Name="PipelineCode" DataType="System.String"/>
<Column Name="WeldJointCode" DataType="System.String"/>
<Column Name="WelderCode" DataType="System.String"/>
<Column Name="Specification" DataType="System.String"/>
<Column Name="MaterialCode" DataType="System.String"/>
<CommandParameter Name="TrustBatchId" DataType="12" Expression="[TrustBatchId]"/>
</TableDataSource>
</MsSqlDataConnection>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="CH_TrustCode" DataType="System.String"/>
<Column Name="CH_TrustUnit" DataType="System.String"/>
<Column Name="CH_TrustMan" DataType="System.String"/>
<Column Name="CH_SlopeType" DataType="System.String"/>
<Column Name="CH_WeldMethod" DataType="System.String"/>
<Column Name="CH_NDTRate" DataType="System.String"/>
<Column Name="CH_NDTMethod" DataType="System.String"/>
<Column Name="CH_NDTCriteria" DataType="System.String"/>
<Column Name="CH_AcceptGrade" DataType="System.String"/>
<Column Name="CH_CheckUnit" DataType="System.String"/>
<Column Name="ProjectName" DataType="System.String" PropName="ProjectId"/>
<Column Name="WorkAreaName" DataType="System.String" PropName="Column"/>
<Column Name="WorkAreaCode" DataType="System.String" PropName="Column"/>
<Column Name="Column" DataType="System.Int32" Calculated="true" Expression=""/>
<Column Name="Column1" DataType="System.Int32" Calculated="true" Expression=""/>
<Column Name="Column2" DataType="System.Int32" Calculated="true" Expression=""/>
<Column Name="Column3" DataType="System.Int32" Calculated="true" Expression=""/>
</TableDataSource>
<TableDataSource Name="Data" Alias="Dataaaa" ReferenceName="Data.Data" DataType="System.Int32" Enabled="true">
<Column Name="CH_TrustID" DataType="System.String"/>
<Column Name="ISO_IsoNo" DataType="System.Int32" PropName="Column" Calculated="true" Expression=""/>
<Column Name="ISO_IsoNumber" DataType="System.Int32" PropName="Column" Calculated="true" Expression=""/>
<Column Name="JOT_JointNo" DataType="System.Int32" PropName="Column1" Calculated="true" Expression=""/>
<Column Name="WED_Code2" DataType="System.Int32" PropName="Column2" Calculated="true" Expression=""/>
<Column Name="JOT_JointDesc" DataType="System.Int32" PropName="Column3" Calculated="true" Expression=""/>
<Column Name="STE_Name1" DataType="System.Int32" PropName="Column" Calculated="true" Expression=""/>
<Column Name="Remark" DataType="System.Int32" PropName="Column1" Calculated="true" Expression=""/>
</TableDataSource>
<Parameter Name="CH_TrustID" DataType="System.String"/>
<Parameter Name="supUnit" DataType="System.String"/>
<Parameter Name="totalUnit" DataType="System.String"/>
<Parameter Name="ConUnit" DataType="System.String"/>
<Parameter Name="CheckUnit" DataType="System.String"/>
<Parameter Name="TrustBatchId" DataType="System.String"/>
</Dictionary>
<ReportPage Name="Page1" RawPaperSize="9" Guides="75.6">
<PageHeaderBand Name="PageHeader1" Width="718.2" Height="283.5">
<TableObject Name="Table4" Left="18.9" Top="37.8" Width="699.25" Height="246.02" ManualBuildEvent="Table4_ManualBuild">
<TableColumn Name="Column13" Width="94.73"/>
<TableColumn Name="Column14" Width="94.73"/>
<TableColumn Name="Column15" Width="75.83"/>
<TableColumn Name="Column16" Width="94.73"/>
<TableColumn Name="Column17" Width="94.73"/>
<TableColumn Name="Column18" Width="72.05"/>
<TableColumn Name="Column19" Width="72.05"/>
<TableColumn Name="Column20" Width="100.4"/>
<TableRow Name="Row14" Height="64.64">
<TableCell Name="Cell81" Border.Lines="All" Text="SH/T 3543-G414" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt" ColSpan="2" RowSpan="2"/>
<TableCell Name="Cell82" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell83" Border.Lines="All" Text="管道焊口检测委托单" HorzAlign="Center" VertAlign="Center" Font="宋体, 16pt, style=Bold" ColSpan="4" RowSpan="2"/>
<TableCell Name="Cell84" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell85" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell86" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell87" Border.Lines="All" Text="工程名称" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell88" Border.Lines="All" Text="[Table1.ProjectName]" HorzAlign="Center" VertAlign="Center" Font="宋体, 8pt"/>
</TableRow>
<TableRow Name="Row13" Height="43.78">
<TableCell Name="Cell73" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell74" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell75" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell76" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell77" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell78" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell79" Border.Lines="All" Text="单位工程名称" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell80" Border.Lines="All" Text="[Table1.WorkAreaName]" HorzAlign="Center" VertAlign="Center"/>
</TableRow>
<TableRow Name="Row8" Height="34.4">
<TableCell Name="Cell33" Border.Lines="All" Text="检测单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell34" Border.Lines="All" Text="[Table1.CH_CheckUnit]" HorzAlign="Center" VertAlign="Center" ColSpan="2"/>
<TableCell Name="Cell35" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell36" Border.Lines="All" Text="接收人" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell37" Border.Lines="All" Text="[Table1.CH_TrustMan]" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell58" Border.Lines="All" Text="委托单号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell63" Border.Lines="All" Text="[Table1.CH_TrustCode]" HorzAlign="Center" VertAlign="Center" Font="宋体, 8pt" ColSpan="2"/>
<TableCell Name="Cell68" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
</TableRow>
<TableRow Name="Row9" Height="34.4">
<TableCell Name="Cell38" Border.Lines="All" Text="区号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell39" Border.Lines="All" Text="[Table1.WorkAreaCode]" HorzAlign="Center" VertAlign="Center" ColSpan="2"/>
<TableCell Name="Cell40" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell41" Border.Lines="All" Text="检测时机" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell42" Border.Lines="All" Text="焊后" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell59" Border.Lines="All" Text="检测标准" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell64" Border.Lines="All" Text="[Table1.CH_NDTCriteria]" HorzAlign="Center" VertAlign="Center" ColSpan="2"/>
<TableCell Name="Cell69" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
</TableRow>
<TableRow Name="Row10" Height="34.4">
<TableCell Name="Cell43" Border.Lines="All" Text="检测类别" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell44" Border.Lines="All" HorzAlign="Center" VertAlign="Center" ColSpan="2"/>
<TableCell Name="Cell45" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell46" Border.Lines="All" Text="焊接方法" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell47" Border.Lines="All" Text="[Table1.CH_WeldMethod]" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell60" Border.Lines="All" Text="合格级别" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell65" Border.Lines="All" Text="[Table1.CH_AcceptGrade]" HorzAlign="Center" VertAlign="Center" ColSpan="2"/>
<TableCell Name="Cell70" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
</TableRow>
<TableRow Name="Row11" Height="34.4">
<TableCell Name="Cell48" Border.Lines="All" Text="检测方法" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell49" Border.Lines="All" Text="[Table1.CH_NDTMethod]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt" ColSpan="2"/>
<TableCell Name="Cell50" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell51" Border.Lines="All" Text="坡口形式" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell52" Border.Lines="All" Text="[Table1.CH_SlopeType]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell61" Border.Lines="All" Text="检测比例" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell66" Border.Lines="All" Text="[Table1.CH_NDTRate]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt" ColSpan="2"/>
<TableCell Name="Cell71" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
</TableRow>
</TableObject>
</PageHeaderBand>
<DataBand Name="Data1" Top="287.35" Width="718.2" Height="71.82">
<TableObject Name="Tabel_Data" Left="18.9" Width="699.18" Height="71.82" Border.Lines="Top" ManualBuildEvent="Tabel_Data_ManualBuild">
<TableColumn Name="Column21" Width="69.91"/>
<TableColumn Name="Column22" Width="117.16"/>
<TableColumn Name="Column23" Width="0"/>
<TableColumn Name="Column24" Width="158.76"/>
<TableColumn Name="Column25" Width="107.71"/>
<TableColumn Name="Column26" Width="85.03"/>
<TableColumn Name="Column27" Width="85.03"/>
<TableColumn Name="Column28" Width="75.58"/>
<TableRow Name="Row30" Height="22.68">
<TableCell Name="Cell229" Border.Lines="All" Text="序号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell230" Border.Lines="All" Text="管道编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt" ColSpan="2"/>
<TableCell Name="Cell231" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell232" Border.Lines="All" Text="焊口号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell233" Border.Lines="All" Text="焊工号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell234" Border.Lines="All" Text="焊口规格" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell235" Border.Lines="All" Text="焊口材质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell236" Border.Lines="All" Text="备注" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
</TableRow>
<TableRow Name="Row21" Height="49.14">
<TableCell Name="Cell137" Border.Lines="All" Text="[x]" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell138" Border.Lines="All" Text="[Data.PipelineCode]" VertAlign="Center" ColSpan="2"/>
<TableCell Name="Cell139" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell140" Border.Lines="All" Text="[Data.WeldJointCode]" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell141" Border.Lines="All" Text="[Data.WelderCode]" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell142" Border.Lines="All" Text="[Data.Specification]" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell143" Border.Lines="All" Text="[Data.MaterialCode]" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell144" Border.Lines="All" Text="[Data.Remark]" HorzAlign="Center" VertAlign="Center"/>
</TableRow>
</TableObject>
<DataFooterBand Name="DataFooter1" Top="416" Width="718.2">
<ChildBand Name="Child2" Top="363.01" Width="718.2" Height="49.14" FillUnusedSpace="true">
<TableObject Name="Table6" Left="18.9" Width="699.18" Height="49.14" Border.Lines="Top">
<TableColumn Name="Column53" Width="69.91"/>
<TableColumn Name="Column54" Width="117.16"/>
<TableColumn Name="Column55" Width="0"/>
<TableColumn Name="Column56" Width="158.76"/>
<TableColumn Name="Column57" Width="107.71"/>
<TableColumn Name="Column58" Width="85.03"/>
<TableColumn Name="Column59" Width="85.03"/>
<TableColumn Name="Column60" Width="75.58"/>
<TableRow Name="Row29" Height="49.14">
<TableCell Name="Cell221" Border.Lines="All"/>
<TableCell Name="Cell222" Border.Lines="All" ColSpan="2"/>
<TableCell Name="Cell223" Border.Lines="All"/>
<TableCell Name="Cell224" Border.Lines="All"/>
<TableCell Name="Cell225" Border.Lines="All"/>
<TableCell Name="Cell226" Border.Lines="All"/>
<TableCell Name="Cell227" Border.Lines="All"/>
<TableCell Name="Cell228" Border.Lines="All"/>
</TableRow>
</TableObject>
</ChildBand>
</DataFooterBand>
</DataBand>
<PageFooterBand Name="PageFooter1" Top="419.84" Width="718.2" Height="181.43">
<TableObject Name="Table5" Left="18.9" Width="699.21" Height="135.6" Border.Lines="All" RepeatHeaders="false">
<TableColumn Name="Column37" Width="99.45"/>
<TableColumn Name="Column38" Width="90"/>
<TableColumn Name="Column39" Width="99.45"/>
<TableColumn Name="Column40" Width="71.1"/>
<TableColumn Name="Column41" Width="99.45"/>
<TableColumn Name="Column42" Width="67.32"/>
<TableColumn Name="Column43" Width="76.77"/>
<TableColumn Name="Column44" Width="95.67"/>
<TableRow Name="Row24" Height="43.94">
<TableCell Name="Cell161" Border.Lines="Left, Right" Text="&#13;&#10;建设单位:&#13;&#10;" Font="宋体, 10pt" ColSpan="2" RowSpan="2"/>
<TableCell Name="Cell162" Border.Lines="Left, Right, Top" Font="宋体, 10pt"/>
<TableCell Name="Cell163" Border.Lines="Left, Right" Text="&#13;&#10;监理单位:&#13;&#10;" Font="宋体, 10pt" ColSpan="2" RowSpan="2"/>
<TableCell Name="Cell164" Border.Lines="Left, Right, Top" Font="宋体, 10pt"/>
<TableCell Name="Cell165" Border.Lines="Left, Right" Text="&#13;&#10;总包单位:&#13;&#10;" Font="宋体, 10pt" ColSpan="2" RowSpan="2"/>
<TableCell Name="Cell166" Border.Lines="Left, Right, Top" Font="宋体, 10pt"/>
<TableCell Name="Cell167" Border.Lines="Left, Right" Text="&#13;&#10;施工单位:&#13;&#10;" Font="宋体, 10pt" ColSpan="2" RowSpan="2"/>
<TableCell Name="Cell168" Border.Lines="Left, Right, Top" Font="宋体, 10pt"/>
</TableRow>
<TableRow Name="Row25" Height="45.83">
<TableCell Name="Cell169" Border.Lines="All"/>
<TableCell Name="Cell170" Border.Lines="All"/>
<TableCell Name="Cell171" Border.Lines="All"/>
<TableCell Name="Cell172" Border.Lines="All"/>
<TableCell Name="Cell173" Border.Lines="All"/>
<TableCell Name="Cell174" Border.Lines="All"/>
<TableCell Name="Cell175" Border.Lines="All"/>
<TableCell Name="Cell176" Border.Lines="All"/>
</TableRow>
<TableRow Name="Row27" Height="45.83">
<TableCell Name="Cell185" Border.Lines="Left, Right, Bottom" Text="日期: 年 月 日" ColSpan="2"/>
<TableCell Name="Cell186" Border.Lines="All"/>
<TableCell Name="Cell187" Border.Lines="Left, Right, Bottom" Text="日期: 年 月 日" ColSpan="2"/>
<TableCell Name="Cell188" Border.Lines="All"/>
<TableCell Name="Cell189" Border.Lines="Left, Right, Bottom" Text="日期: 年 月 日" ColSpan="2"/>
<TableCell Name="Cell190" Border.Lines="All"/>
<TableCell Name="Cell191" Border.Lines="Left, Right, Bottom" Text="日期: 年 月 日" ColSpan="2"/>
<TableCell Name="Cell192" Border.Lines="All"/>
</TableRow>
</TableObject>
<ChildBand Name="Child1" Top="605.12" Width="718.2" Height="17.77" PrintOnBottom="true"/>
</PageFooterBand>
</ReportPage>
</Report>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="09/06/2023 17:26:50" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="09/07/2023 14:49:06" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -99,7 +99,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRHyTBPHd2lTJcQ0C8qbyv//"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRErYIg5yNvgeNsahpuMCq5a"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="PrefabricatedComponents" DataType="System.String" PropName="CH_TrustCode"/>
<Column Name="PlanStartDate" DataType="System.String" PropName="CH_TrustMan"/>
@ -114,15 +114,8 @@ namespace FastReport
<Column Name="PipelineCode" DataType="System.String"/>
<Column Name="QRCode2" DataType="System.String" PropName="Column"/>
<Column Name="UnitWorkName" DataType="System.Char" PropName="Column"/>
<Column Name="MaterialCode" DataType="System.String" PropName="Column"/>
<Column Name="MaterialId" DataType="System.String"/>
<Column Name="MaterialType" DataType="System.String"/>
<Column Name="SteelType" DataType="System.String"/>
<Column Name="MaterialClass" DataType="System.String"/>
<Column Name="MaterialGroup" DataType="System.String"/>
<Column Name="Remark" DataType="System.String"/>
<Column Name="MetalType" DataType="System.String"/>
<Column Name="FlowingSection" DataType="System.String" PropName="Column"/>
<Column Name="MaterialCode" DataType="System.String"/>
</TableDataSource>
<TableDataSource Name="Data" ReferenceName="Data.Data" DataType="System.Int32" Enabled="true">
<Column Name="CH_TrustID" DataType="System.String"/>

View File

@ -572,7 +572,8 @@ namespace FineUIPro.Web.HJGL.PointTrust
{
if (!batch.EndDate.HasValue)
{
PointBatchService.UpdateBatchIsClosed2(this.PointBatchId, DateTime.Now);
PointBatchService.UpdateBatchIsClosed(this.PointBatchId, DateTime.Now);
/*PointBatchService.UpdateBatchIsClosed2(this.PointBatchId, DateTime.Now);
//生成委托单
Model.HJGL_Batch_BatchTrust newBatchTrust = new Model.HJGL_Batch_BatchTrust();
var project = BLL.ProjectService.GetProjectByProjectId(batch.ProjectId);
@ -595,7 +596,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
newBatchTrust.DetectionTypeId = batch.DetectionTypeId;
newBatchTrust.DetectionRateId = batch.DetectionRateId;
newBatchTrust.PointBatchId = this.PointBatchId;
BLL.Batch_BatchTrustService.AddBatchTrust(newBatchTrust); // 新增委托单
BLL.Batch_BatchTrustService.AddBatchTrust(newBatchTrust); // 新增委托单*/
this.BindGrid();
Alert.ShowInTop("关批成功!", MessageBoxIcon.Success);
}

View File

@ -355,13 +355,68 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
protected void btnPrint_Click(object sender, EventArgs e)
{
Print(tvControlItem.SelectedNodeID,"");
Print(tvControlItem.SelectedNodeID, Grid1.SelectedRowIDArray);
}
private void Print(string PipelineId ,string PipelineComponentId)
private void Print(string PipelineId ,string[] PipelineComponentId)
{
var db = Funs.DB;
BLL.FastReportService.ResetData();
string strSql = @" SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,unitwork.UnitWorkName,
var query =
from com in db.HJGL_Pipeline_Component
join mat in db.HJGL_PipeLineMat on com.PipeLineMatId equals mat.PipeLineMatId into matJoin
from mat in matJoin.DefaultIfEmpty()
join pipe in db.HJGL_Pipeline on com.PipelineId equals pipe.PipelineId into pipeJoin
from pipe in pipeJoin.DefaultIfEmpty()
join punit in db.Base_Unit on com.PreUnit equals punit.UnitId into punitJoin
from punit in punitJoin.DefaultIfEmpty()
join aunit in db.Base_Unit on com.AssembleUnit equals aunit.UnitId into aunitJoin
from aunit in aunitJoin.DefaultIfEmpty()
join unitwork in db.WBS_UnitWork on pipe.UnitWorkId equals unitwork.UnitWorkId into unitworkJoin
from unitwork in unitworkJoin.DefaultIfEmpty()
join mater in db.Base_Material on pipe.MaterialId equals mater.MaterialId into materJoin
from mater in materJoin.DefaultIfEmpty()
where com.QRCode != "" & com.PipelineId == PipelineId
select new
{
com.PipelineComponentId,
com.PipelineComponentCode,
com.BoxNumber,
UnitWorkName = unitwork.UnitWorkName,
com.PipelineId,
PreUnit = punit.UnitName,
AssembleUnit = aunit.UnitName,
mat.PrefabricatedComponents,
com.QRCode,
com.State,
PlanStartDate = string.Format("yyyy-MM-dd", pipe.PlanStartDate),
pipe.PipelineCode,
pipe.FlowingSection,
QRCode2 = "PrePipeline$" + com.PipelineComponentId,
mater.MaterialCode
};
var result = query.ToList();
if (PipelineComponentId.Length>0)
{
result = result.Where(x => PipelineComponentId.Contains(x.PipelineComponentId)).ToList();
}
var tb = LINQToDataTable(result);
if (tb != null)
{
tb.TableName = "Table1";
}
BLL.FastReportService.AddFastreportTable(tb);
string initTemplatePath = "";
string rootPath = Server.MapPath("~/");
initTemplatePath = "File\\Fastreport\\组件打印.frx";
if (File.Exists(rootPath + initTemplatePath))
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Controls/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
}
/*string strSql = @" SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,unitwork.UnitWorkName,
com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,mat.PrefabricatedComponents,
com.QRCode,com.State,CONVERT(varchar(100), pipe.PlanStartDate, 23) as PlanStartDate,pipe.PipelineCode,pipe.FlowingSection,
('PrePipeline$'+com.PipelineComponentId )as QRCode2,mater.*
@ -377,11 +432,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
strSql += " AND com.PipelineId =@PipelineId";
listStr.Add(new SqlParameter("@PipelineId", PipelineId));
if (PipelineComponentId!="")
{
strSql += " AND com.PipelineComponentId =@PipelineComponentId";
listStr.Add(new SqlParameter("@PipelineComponentId", PipelineComponentId));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
if (tb != null)
@ -397,8 +448,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Controls/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
}
}*/
}
/// <summary>
/// 增加焊口信息
/// </summary>
@ -500,11 +552,6 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
}
}
else if (e.CommandName == "cmd_print")
{
string Id = this.Grid1.SelectedRowID;
Print(tvControlItem.SelectedNodeID, Id);
}
}
protected void btnSearch_Click(object sender, EventArgs e)

View File

@ -170,6 +170,11 @@
EnableMaximize="true" Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close"
IsModal="true" Width="1050px" Height="650px">
</f:Window>
<f:Window ID="Window2" Title="打印" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
IsModal="true" Width="1010px" Height="660px">
</f:Window>
</form>
<script type="text/javascript">
function reloadGrid() {

View File

@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Web;
@ -445,6 +446,122 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
}
}
protected void btnPrint_Click(object sender, EventArgs e)
{
DataTable dt = new DataTable("Table1");
dt.Columns.Add("ProjectName", typeof(String));
dt.Columns.Add("CH_CheckUnit", typeof(String));
dt.Columns.Add("WorkAreaName", typeof(String));
dt.Columns.Add("CH_TrustUnit", typeof(String));
dt.Columns.Add("CH_TrustMan", typeof(String));
dt.Columns.Add("CH_TrustCode", typeof(String));
dt.Columns.Add("WorkAreaCode", typeof(String));
dt.Columns.Add("CH_NDTCriteria", typeof(String));
dt.Columns.Add("CH_WeldMethod", typeof(String));
dt.Columns.Add("CH_AcceptGrade", typeof(String));
dt.Columns.Add("CH_NDTMethod", typeof(String));
dt.Columns.Add("CH_SlopeType", typeof(String));
dt.Columns.Add("CH_NDTRate", typeof(String));
DataRow dr = dt.NewRow();
if (this.tvControlItem.SelectedNode == null)
{
Alert.ShowInTop("请选择要打印的委托单!", MessageBoxIcon.Warning);
return;
}
string reportId = this.tvControlItem.SelectedNode.NodeID;
// Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(this.tvControlItem.SelectedNodeID);
// Model.HJGL_Batch_PointBatch batch = BLL.PointBatchService.GetPointBatchById(this.tvControlItem.SelectedNodeID);
// var trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(reportId);
var trust = BLL.Batch_BatchTrustService.GetBatchTrustViewById(this.tvControlItem.SelectedNodeID);
if (trust != null)
{
string varValue = string.Empty;
var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
dr["ProjectName"] = projectName;
if (!string.IsNullOrEmpty(trust.NDEUnit))
{
dr["CH_CheckUnit"] = BLL.UnitService.GetUnitNameByUnitId(trust.NDEUnit).ToString();
}
if (!string.IsNullOrEmpty(trust.TrustBatchCode))
{
dr["CH_TrustCode"] = trust.TrustBatchCode;
}
/* if (!string.IsNullOrEmpty(trust.CH_NDTCriteria))
{
dr["CH_NDTCriteria"] = trust.CH_NDTCriteria;
}*/
if (!string.IsNullOrEmpty(trust.DetectionTypeCode))
{
dr["CH_NDTMethod"] = trust.DetectionTypeCode;
}
if (!string.IsNullOrEmpty(trust.DetectionRateId))
{
var list = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(trust.DetectionRateId);
if (list != null)
{
dr["CH_NDTRate"] = list.DetectionRateCode;
}
}
var PworkArea = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == trust.UnitWorkId);
if (PworkArea != null)
{
//var cel = recordSheet.GetRow(3).CreateCell(1);
//cel.SetCellValue(PworkArea.WorkAreaCode);
//cel.CellStyle = styleCenter;
dr["WorkAreaName"] = PworkArea.UnitWorkName;
dr["WorkAreaCode"] = PworkArea.UnitWorkCode;
}
dt.Rows.Add(dr);
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("TrustBatchId", trust.TrustBatchId);
keyValuePairs.Add("totalUnit", "赛鼎工程有限公司");
var unitcheck = Funs.DB.Project_ProjectUnit.FirstOrDefault(x => x.ProjectId == trust.ProjectId && x.UnitType == Const.ProjectUnitType_3);
if (unitcheck != null && !string.IsNullOrEmpty(unitcheck.UnitId))
{
keyValuePairs.Add("supUnit", BLL.UnitService.GetUnitNameByUnitId(unitcheck.UnitId).ToString());
}
BLL.FastReportService.ResetData();
BLL.FastReportService.AddFastreportTable(dt);
BLL.FastReportService.AddFastreportParameter(keyValuePairs);
// Session["Table"] = dt;
// Session["CH_TrustID"] = reportId;
string initTemplatePath = "";
string rootPath = Server.MapPath("~/");
initTemplatePath = "File\\Fastreport\\管道焊口返修委托单NoPic.frx";
if (File.Exists(rootPath + initTemplatePath))
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../Controls/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
}
}
else
{
Alert.ShowInTop("请选择要打印的委托单!", MessageBoxIcon.Warning);
return;
}
}
/*
protected void btnPrint_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
@ -480,6 +597,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
// return;
//}
}
*/
#region
/// <summary>

View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.RepairAndExpand {
public partial class RepairTrust {
namespace FineUIPro.Web.HJGL.RepairAndExpand
{
public partial class RepairTrust
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtTrustDateMonth 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtTrustDateMonth;
/// <summary>
/// Toolbar5 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar5;
/// <summary>
/// txtSearchCode 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSearchCode;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar3 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnAudit 控件。
/// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAudit;
/// <summary>
/// btnPointAudit 控件。
/// </summary>
@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPointAudit;
/// <summary>
/// btnDelete 控件。
/// </summary>
@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// btnPrint 控件。
/// </summary>
@ -155,7 +157,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrint;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -164,7 +166,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtTrustBatchCode 控件。
/// </summary>
@ -173,7 +175,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTrustBatchCode;
/// <summary>
/// txtTrustDate 控件。
/// </summary>
@ -182,7 +184,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTrustDate;
/// <summary>
/// txtDetectionTypeCode 控件。
/// </summary>
@ -191,7 +193,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtDetectionTypeCode;
/// <summary>
/// lbNDEUnit 控件。
/// </summary>
@ -200,7 +202,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbNDEUnit;
/// <summary>
/// lbIsCheck 控件。
/// </summary>
@ -209,7 +211,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbIsCheck;
/// <summary>
/// lbIsAudit 控件。
/// </summary>
@ -218,7 +220,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbIsAudit;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -227,7 +229,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -236,7 +238,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -245,7 +247,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -254,7 +256,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@ -263,5 +265,14 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
}
}

View File

@ -1033,6 +1033,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// </summary>
/// <param name="item"></param>
/// <param name="weldingDailyId"></param>
///
/// <returns></returns>
private string DeleteWeldingDailyItem(string weldJointId)
{