11
This commit is contained in:
@@ -53,7 +53,7 @@
|
||||
</Toolbars>
|
||||
<Items>
|
||||
<f:Tree ID="tvControlItem" ShowHeader="false" Title="试压包节点树" OnNodeCommand="tvControlItem_NodeCommand"
|
||||
runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true" AutoLeafIdentification="true"
|
||||
runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true" AutoLeafIdentification="true"
|
||||
EnableSingleExpand="true" EnableTextSelection="true">
|
||||
</f:Tree>
|
||||
</Items>
|
||||
@@ -66,7 +66,8 @@
|
||||
<Items>
|
||||
<f:HiddenField runat="server" ID="hdPTP_ID"></f:HiddenField>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server"> </f:ToolbarFill>
|
||||
<f:DropDownList ID="drpPrintTypeList" Width="500" EnableMultiSelect="true" EnableCheckBoxSelect="true" runat="server" Label="打印报表" LabelAlign="Right"></f:DropDownList>
|
||||
<f:DropDownList ID="drpPrintTypeList" Width="500" EnableMultiSelect="true"
|
||||
AutoSelectFirstItem="false" EnableCheckBoxSelect="true" runat="server" Label="打印报表" LabelAlign="Right"></f:DropDownList>
|
||||
<f:Button ID="btnPrint" Text="打印" Icon="Printer" EnableAjax="false" runat="server" DisableControlBeforePostBack="false" EnablePostBack="true" OnClick="btnPrint_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnAudit" Text="审核" ToolTip="审核检测单" AjaxLoadingType="Mask" ShowAjaxLoadingMaskText="true"
|
||||
@@ -175,8 +176,8 @@
|
||||
</Items>
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="试压包明细" EnableCollapse="true" Collapsed="false"
|
||||
runat="server" BoxFlex="1" DataKeyNames="PT_PipeId" AllowCellEditing="true"
|
||||
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PT_PipeId" AllowSorting="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true"
|
||||
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId" AllowSorting="true"
|
||||
SortField="WorkAreaCode,PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="True"
|
||||
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange">
|
||||
<Toolbars>
|
||||
@@ -214,7 +215,7 @@
|
||||
<f:RenderField HeaderText="不合格数" ColumnID="CountU" DataField="CountU" SortField="CountU"
|
||||
FieldType="Int" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="应检测比例" ColumnID="NDTR_Name" DataField="NDTR_Name" SortField="NDTR_Name"
|
||||
<f:RenderField HeaderText="应检测比例" ColumnID="NDTR_Rate" DataField="NDTR_Rate" SortField="NDTR_Rate"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="实际检测比例" ColumnID="Ratio" DataField="Ratio" SortField="Ratio"
|
||||
|
||||
+1282
-1056
File diff suppressed because it is too large
Load Diff
@@ -1139,55 +1139,58 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
||||
|
||||
//获取当前页数据
|
||||
var pageTb = GetPageToTable(tb, dStart, dEnd);
|
||||
for (int j = 0; j < pageTb.Rows.Count; j++)
|
||||
int j = 0;
|
||||
foreach (DataRow dr in pageTb.Rows)
|
||||
{
|
||||
int dataIndex = dataTit + j;
|
||||
//管道编号/单线号
|
||||
ws.GetRow(dataIndex).GetCell(0).SetCellValue(titleModel.PipelineCode);
|
||||
//焊口编号
|
||||
ws.GetRow(dataIndex).GetCell(1).SetCellValue(tb.Rows[i]["WeldJointCode"].ToString());
|
||||
ws.GetRow(dataIndex).GetCell(1).SetCellValue(dr["WeldJointCode"].ToString());
|
||||
//焊接形式
|
||||
ws.GetRow(dataIndex).GetCell(3).SetCellValue(tb.Rows[i]["WeldTypeCode"].ToString());
|
||||
ws.GetRow(dataIndex).GetCell(3).SetCellValue(dr["WeldTypeCode"].ToString());
|
||||
//焊工代号
|
||||
List<string> welderStr = new List<string>();
|
||||
if (!string.IsNullOrWhiteSpace(tb.Rows[i]["BackingWelderCode"].ToString()))
|
||||
if (!string.IsNullOrWhiteSpace(dr["BackingWelderCode"].ToString()))
|
||||
{
|
||||
welderStr.Add(tb.Rows[i]["BackingWelderCode"].ToString());
|
||||
welderStr.Add(dr["BackingWelderCode"].ToString());
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(tb.Rows[i]["CoverWelderCode"].ToString()))
|
||||
if (!string.IsNullOrWhiteSpace(dr["CoverWelderCode"].ToString()))
|
||||
{
|
||||
welderStr.Add(tb.Rows[i]["CoverWelderCode"].ToString());
|
||||
welderStr.Add(dr["CoverWelderCode"].ToString());
|
||||
}
|
||||
if (welderStr.Count > 0) welderStr = welderStr.GroupBy(x => x).Select(x => x.Key).ToList();
|
||||
ws.GetRow(dataIndex).GetCell(4).SetCellValue(string.Join("/", welderStr));
|
||||
//规格mm
|
||||
ws.GetRow(dataIndex).GetCell(5).SetCellValue(tb.Rows[i]["Specification"].ToString());
|
||||
ws.GetRow(dataIndex).GetCell(5).SetCellValue(dr["Specification"].ToString());
|
||||
//材质
|
||||
ws.GetRow(dataIndex).GetCell(6).SetCellValue(tb.Rows[i]["Material1Code"].ToString());
|
||||
ws.GetRow(dataIndex).GetCell(6).SetCellValue(dr["Material1Code"].ToString());
|
||||
//焊接位置
|
||||
ws.GetRow(dataIndex).GetCell(7).SetCellValue(tb.Rows[i]["WeldingLocationCode"].ToString());
|
||||
ws.GetRow(dataIndex).GetCell(7).SetCellValue(dr["WeldingLocationCode"].ToString());
|
||||
//焊接方法
|
||||
ws.GetRow(dataIndex).GetCell(8).SetCellValue(tb.Rows[i]["WeldingMethodCode"].ToString());
|
||||
ws.GetRow(dataIndex).GetCell(8).SetCellValue(dr["WeldingMethodCode"].ToString());
|
||||
//焊材牌号
|
||||
List<string> silkMats = new List<string>();
|
||||
if (!string.IsNullOrWhiteSpace(tb.Rows[i]["WeldSilkCode"].ToString()))
|
||||
if (!string.IsNullOrWhiteSpace(dr["WeldSilkCode"].ToString()))
|
||||
{
|
||||
silkMats.Add(tb.Rows[i]["WeldSilkCode"].ToString());
|
||||
silkMats.Add(dr["WeldSilkCode"].ToString());
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(tb.Rows[i]["WeldMatCode"].ToString()))
|
||||
if (!string.IsNullOrWhiteSpace(dr["WeldMatCode"].ToString()))
|
||||
{
|
||||
silkMats.Add(tb.Rows[i]["WeldMatCode"].ToString());
|
||||
silkMats.Add(dr["WeldMatCode"].ToString());
|
||||
}
|
||||
if (silkMats.Count > 0) silkMats = silkMats.GroupBy(x => x).Select(x => x.Key).ToList();
|
||||
ws.GetRow(dataIndex).GetCell(10).SetCellValue(string.Join("/", silkMats));
|
||||
//实际预热温度
|
||||
ws.GetRow(dataIndex).GetCell(12).SetCellValue(tb.Rows[i]["PrepareTemp"].ToString());
|
||||
ws.GetRow(dataIndex).GetCell(12).SetCellValue(dr["PrepareTemp"].ToString());
|
||||
//焊接日期
|
||||
ws.GetRow(dataIndex).GetCell(13).SetCellValue(tb.Rows[i]["WeldingDate"].ToString());
|
||||
ws.GetRow(dataIndex).GetCell(13).SetCellValue(dr["WeldingDate"].ToString());
|
||||
//无损检查报告
|
||||
ws.GetRow(dataIndex).GetCell(14).SetCellValue(tb.Rows[i]["NDEReportNo"].ToString());
|
||||
ws.GetRow(dataIndex).GetCell(14).SetCellValue(dr["NDEReportNo"].ToString());
|
||||
j++;
|
||||
}
|
||||
|
||||
|
||||
rowIndex += tIndex;
|
||||
|
||||
#endregion
|
||||
|
||||
Reference in New Issue
Block a user