shecs/Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2024-05-12 10:29:59 +08:00
parent a1c00d5980
commit cd0275d2bc
11 changed files with 634 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs
+15 -8
View File
@@ -962,7 +962,14 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
string ReportFileName = filePath + "管道焊接工作记录.xlsx";
string sqlStr = @"SELECT WeldSilkId,PipelineId,WorkAreaId,a.ProjectName,a.WeldJointCode,a.Specification,a.Material1Code,a.WeldingMethodCode,a.WeldingDate,a.WeldSilkCode,a.WeldMatCode,a.BackingWelderCode,a.CoverWelderCode,a.IsHotProess,(case a.IsHotProess when 1 then '是' else '否' end) as IsHotProessName,PrepareTemp,WeldingLocationCode FROM View_Pipeline_WeldJoint as a WHERE 1= 1 AND PipelineId =@PipelineId and Is_hjName='是' ";
string sqlStr = @"SELECT WeldSilkId,PipelineId,WorkAreaId,a.ProjectName,a.WeldJointCode,a.Specification,a.Material1Code,
a.WeldingMethodCode,a.WeldingDate,a.WeldSilkCode,a.WeldMatCode,a.BackingWelderCode,a.CoverWelderCode,
a.IsHotProess,(case a.IsHotProess when 1 then '是' else '否' end) as IsHotProessName,PrepareTemp,
WeldingLocationCode,a.WeldTypeCode,
(SELECT TOP 1 n.NDEReportNo FROM dbo.Batch_NDEItem n WHERE n.TrustBatchItemId=
(SELECT TOP 1 bt.TrustBatchItemId FROM dbo.Batch_BatchTrustItem bt WHERE bt.WeldJointId=a.WeldJointId)) AS NDEReportNo
FROM View_Pipeline_WeldJoint as a
WHERE 1= 1 AND PipelineId =@PipelineId and Is_hjName='是' ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID));
SqlParameter[] parameter = listStr.ToArray();
@@ -970,8 +977,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
var titleQuery = from a in Funs.DB.Pipeline_Pipeline
join b in Funs.DB.Base_Project on a.ProjectId equals b.ProjectId
join c in Funs.DB.Base_Unit on a.UnitId equals c.UnitId
select new { a.PipelineId, a.PipelineCode, b.ProjectName, c.UnitName };
join c in Funs.DB.Project_WorkArea on a.WorkAreaId equals c.WorkAreaId
select new { a.PipelineId, a.PipelineCode, b.EnProjectName, b.ProjectName, c.WorkAreaName, c.EnWorkAreaName };
var titleModel = titleQuery.FirstOrDefault();
if (titleModel != null && tb.Rows.Count > 0)
{
@@ -1030,19 +1037,19 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
//行1
region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 11, 14);
ws.AddMergedRegion(region);
ws.GetRow(rowIndex + 1).GetCell(11).SetCellValue("Project Name:");
ws.GetRow(rowIndex + 1).GetCell(11).SetCellValue($"Project Name:{titleModel.EnProjectName}");
ws.GetRow(rowIndex + 1).GetCell(11).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Justify, 9, true, false);
//行2
region = new CellRangeAddress(rowIndex + 2, rowIndex + 2, 11, 14);
ws.AddMergedRegion(region);
ws.GetRow(rowIndex + 2).GetCell(11).SetCellValue($"单位工程名称：{titleModel.UnitName}");
ws.GetRow(rowIndex + 2).GetCell(11).SetCellValue($"单位工程名称：{titleModel.WorkAreaName}");
ws.GetRow(rowIndex + 2).GetCell(11).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Justify, 10, true, false);
//行3
region = new CellRangeAddress(rowIndex + 3, rowIndex + 3, 11, 14);
ws.AddMergedRegion(region);
ws.GetRow(rowIndex + 3).GetCell(11).SetCellValue("Unit Name：");
ws.GetRow(rowIndex + 3).GetCell(11).SetCellValue($"Unit Name：{titleModel.EnWorkAreaName}");
ws.GetRow(rowIndex + 3).GetCell(11).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Justify, 10, true, false);
//画线
@@ -1140,7 +1147,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
//焊口编号
ws.GetRow(dataIndex).GetCell(1).SetCellValue(tb.Rows[i]["WeldJointCode"].ToString());
//焊接形式
ws.GetRow(dataIndex).GetCell(3).SetCellValue("");
ws.GetRow(dataIndex).GetCell(3).SetCellValue(tb.Rows[i]["WeldTypeCode"].ToString());
//焊工代号
List<string> welderStr = new List<string>();
if (!string.IsNullOrWhiteSpace(tb.Rows[i]["BackingWelderCode"].ToString()))
@@ -1178,7 +1185,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
//焊接日期
ws.GetRow(dataIndex).GetCell(13).SetCellValue(tb.Rows[i]["WeldingDate"].ToString());
//无损检查报告
ws.GetRow(dataIndex).GetCell(14).SetCellValue("");
ws.GetRow(dataIndex).GetCell(14).SetCellValue(tb.Rows[i]["NDEReportNo"].ToString());
}
rowIndex += tIndex;
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx
+130 -153
View File
@@ -7,157 +7,134 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="240px" Title="<%$ Resources:Lan,DailyWeldingReport %>"
ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px"
IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DatePicker ID="txtMonth" runat="server" Label="月份" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="Tree_TextChanged" Width="220px" LabelWidth="50px" DisplayType="Month" DateFormatString="yyyy-MM">
</f:DatePicker>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="400px" Title="<%$ Resources:Lan,DailyWeldingReport %>"
OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true"
EnableTextSelection="true">
</f:Tree>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="<%$ Resources:Lan,DailyWeldingReport %>"
TitleToolTip="<%$ Resources:Lan,DailyWeldingReport %>" AutoScroll="true">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:FileUpload runat="server" ID="dailyReportUrl" EmptyText="请选择要导入的Excel日报文件"
LabelWidth="50px" LabelAlign="Right" Width="300px">
</f:FileUpload>
<f:Button ID="btnImport" Icon="ApplicationEdit" runat="server" Text="导入" ToolTip="日报导入"
OnClick="btnImport_Click" >
</f:Button>
<f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" Text="模板下载" ToolTip="模板下载" OnClick="btnDownLoad_Click">
</f:Button>
<f:Label runat="server" Text="注：导入Excel的日报文件的装置、区域、单位、焊接日期必须一至"></f:Label>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="<%$ Resources:Lan,Add %>" Icon="Add" EnablePostBack="true"
runat="server" OnClick="btnNew_Click">
</f:Button>
<f:HiddenField ID="hidFileName" runat="server"></f:HiddenField>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DatePicker ID="txtWeldingDate" Label="<%$ Resources:Lan,WeldingDate %>" runat="server"
DateFormatString="yyyy-MM-dd" LabelWidth="100px" LabelAlign="Right">
</f:DatePicker>
<f:TextBox ID="txtPipelineCode" runat="server" Label="<%$ Resources:Lan,PipelineCode %>"
EmptyText="<%$ Resources:Lan,EnterQueryConditions %>" Width="250px" LabelWidth="100px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtWeldJointCode" runat="server" Label="<%$ Resources:Lan,WeldingJointNumber %>"
EmptyText="<%$ Resources:Lan,EnterQueryConditions %>" Width="250px" LabelWidth="100px" LabelAlign="Right">
</f:TextBox>
<f:Button ID="btnQuery" ToolTip="<%$ Resources:Lan,Inquiry %>" Icon="SystemSearch"
EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
</f:Button>
<f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="<%$ Resources:Lan,DailyWeldingReport %>"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldingDailyId"
AllowCellEditing="true" AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2"
DataIDField="WeldingDailyId" AllowSorting="true" SortField="WeldingDailyCode"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
<Columns>
<f:RenderField Width="120px" ColumnID="WeldingDailyCode" DataField="WeldingDailyCode"
FieldType="String" HeaderText="<%$ Resources:Lan,WeldingReportCode %>" HeaderTextAlign="Center"
TextAlign="Left" SortField="WeldingDailyCode">
</f:RenderField>
<f:TemplateField Width="200px" HeaderText="<%$ Resources:Lan,UnitName %>" HeaderTextAlign="Center"
TextAlign="Center" SortField="UnitId">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitName(Eval("UnitId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField Width="150px" HeaderText="<%$ Resources:Lan,InstallationCode %>"
HeaderTextAlign="Center" TextAlign="Center" SortField="InstallationId">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# ConvertInstallationCode(Eval("InstallationId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="WeldingDate" DataField="WeldingDate" SortField="WeldingDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="<%$ Resources:Lan,WeldingDate %>"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField Width="80px" HeaderText="<%$ Resources:Lan,Tabler %>" HeaderTextAlign="Center"
TextAlign="Center" SortField="Tabler">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertTabler(Eval("Tabler")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="TableDate" DataField="TableDate" SortField="TableDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="<%$ Resources:Lan,TableDate %>"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="<%$ Resources:Lan,Remark %>" HeaderTextAlign="Center" TextAlign="Left"
ExpandUnusedSpace="true">
</f:RenderField>
<f:TemplateField ColumnID="expander" RenderAsRowExpander="true">
<ItemTemplate>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="rowexpanderexpand" Handler="onRowExpanderExpand" />
<f:Listener Event="rowexpandercollapse" Handler="onRowExpanderCollapse" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="<%$ Resources:Lan,NumberOfRecordsPerPage %>">
</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="<%$ Resources:Lan,AllLines %>" Value="10000" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="<%$ Resources:Lan,PopForm %>" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close"
IsModal="true" Width="1200px" Height="650px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="BulletEdit" EnablePostBack="true"
runat="server" Text="<%$ Resources:Lan,Edit %>">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Icon="Delete" ConfirmText="<%$ Resources:Lan,DeleteReminder %>" ConfirmTarget="Top"
runat="server" Text="<%$ Resources:Lan,Delete %>">
</f:MenuButton>
</f:Menu>
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:FileUpload runat="server" ID="dailyReportUrl" EmptyText="请选择要导入的Excel日报文件"
LabelWidth="50px" LabelAlign="Right" Width="300px">
</f:FileUpload>
<f:Button ID="btnImport" Icon="ApplicationEdit" runat="server" Text="导入" ToolTip="日报导入"
OnClick="btnImport_Click">
</f:Button>
<f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" Text="模板下载" ToolTip="模板下载" OnClick="btnDownLoad_Click">
</f:Button>
<f:Label runat="server" Text="注：导入Excel的日报文件的装置、区域、单位、焊接日期必须一至"></f:Label>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="<%$ Resources:Lan,Add %>" Icon="Add" EnablePostBack="true"
runat="server" OnClick="btnNew_Click">
</f:Button>
<f:HiddenField ID="hidFileName" runat="server"></f:HiddenField>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DatePicker ID="txtWeldingDate" Label="<%$ Resources:Lan,WeldingDate %>" runat="server"
DateFormatString="yyyy-MM-dd" LabelWidth="100px" LabelAlign="Right">
</f:DatePicker>
<f:DropDownList ID="drpInstallation" runat="server" Label="装置"
Width="220px" LabelWidth="100px" LabelAlign="Right"></f:DropDownList>
<f:TextBox ID="txtPipelineCode" runat="server" Label="<%$ Resources:Lan,PipelineCode %>"
EmptyText="<%$ Resources:Lan,EnterQueryConditions %>" Width="250px" LabelWidth="100px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtWeldJointCode" runat="server" Label="<%$ Resources:Lan,WeldingJointNumber %>"
EmptyText="<%$ Resources:Lan,EnterQueryConditions %>" Width="250px" LabelWidth="100px" LabelAlign="Right">
</f:TextBox>
<f:Button ID="btnQuery" ToolTip="<%$ Resources:Lan,Inquiry %>" Icon="SystemSearch"
EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
</f:Button>
<f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="<%$ Resources:Lan,DailyWeldingReport %>"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldingDailyId"
AllowCellEditing="true" AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2"
DataIDField="WeldingDailyId" AllowSorting="true" SortField="WeldingDailyCode"
SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
<Columns>
<f:RenderField Width="120px" ColumnID="WeldingDailyCode" DataField="WeldingDailyCode"
FieldType="String" HeaderText="<%$ Resources:Lan,WeldingReportCode %>" HeaderTextAlign="Center"
TextAlign="Left" SortField="WeldingDailyCode">
</f:RenderField>
<f:TemplateField Width="260px" HeaderText="<%$ Resources:Lan,UnitName %>" HeaderTextAlign="Center"
TextAlign="Center" SortField="UnitId">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitName(Eval("UnitId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField Width="150px" HeaderText="<%$ Resources:Lan,InstallationCode %>"
HeaderTextAlign="Center" TextAlign="Center" SortField="InstallationId">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# ConvertInstallationCode(Eval("InstallationId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="WeldingDate" DataField="WeldingDate" SortField="WeldingDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="<%$ Resources:Lan,WeldingDate %>"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField Width="80px" HeaderText="<%$ Resources:Lan,Tabler %>" HeaderTextAlign="Center"
TextAlign="Center" SortField="Tabler">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertTabler(Eval("Tabler")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="TableDate" DataField="TableDate" SortField="TableDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="<%$ Resources:Lan,TableDate %>"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="<%$ Resources:Lan,Remark %>" HeaderTextAlign="Center" TextAlign="Left"
ExpandUnusedSpace="true">
</f:RenderField>
<f:TemplateField ColumnID="expander" RenderAsRowExpander="true">
<ItemTemplate>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="rowexpanderexpand" Handler="onRowExpanderExpand" />
<f:Listener Event="rowexpandercollapse" Handler="onRowExpanderCollapse" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="<%$ Resources:Lan,NumberOfRecordsPerPage %>">
</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="<%$ Resources:Lan,AllLines %>" Value="10000" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="<%$ Resources:Lan,PopForm %>" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close"
IsModal="true" Width="1200px" Height="650px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="BulletEdit" EnablePostBack="true"
runat="server" Text="<%$ Resources:Lan,Edit %>">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Icon="Delete" ConfirmText="<%$ Resources:Lan,DeleteReminder %>" ConfirmTarget="Top"
runat="server" Text="<%$ Resources:Lan,Delete %>">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
@@ -186,7 +163,7 @@
columnMenu: false,
columnResizing: false,
cls: 'gridinrowexpander',
fields: ['Num', 'PipelineCode', 'WeldJointCode', 'BackingWelderCode', 'CoverWelderCode', 'WeldTypeCode', 'JointAttribute', 'WeldingLocationCode', 'DoneDin', 'Dia', 'Thickness', 'WeldingMethodCode', 'Material1Code', 'Material2Code', 'ComponentsCode1', 'ComponentsCode2', 'HeartNo1', 'HeartNo2', 'WeldSilkCode','WeldMatCode','PipeSegment','WPQCode'],
fields: ['Num', 'PipelineCode', 'WeldJointCode', 'BackingWelderCode', 'CoverWelderCode', 'WeldTypeCode', 'JointAttribute', 'WeldingLocationCode', 'DoneDin', 'Dia', 'Thickness', 'WeldingMethodCode', 'Material1Code', 'Material2Code', 'ComponentsCode1', 'ComponentsCode2', 'HeartNo1', 'HeartNo2', 'WeldSilkCode', 'WeldMatCode', 'PipeSegment', 'WPQCode'],
columns: [{
text: '序号', field: 'Num', width: 50
}, {
@@ -211,7 +188,7 @@
text: '壁厚', field: 'Thickness', width: 65
}, {
text: '焊接方法', field: 'WeldingMethodCode', width: 120
},{
}, {
text: '材质1', field: 'Material1Code', width: 110
}, {
text: '材质2', field: 'Material2Code', width: 110
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs
+138 -131
View File
@@ -28,9 +28,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
if (!IsPostBack)
{
this.txtMonth.Text = string.Format("{0:yyyy-MM}",DateTime.Now);
//this.txtMonth.Text = string.Format("{0:yyyy-MM}",DateTime.Now);
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.InitTreeMenu();//加载树
BLL.Project_InstallationService.InitInstallationDropDownList(this.drpInstallation, true, this.CurrUser.LoginProjectId, Resources.Lan.PleaseSelect);
BindGrid();
//this.InitTreeMenu();//加载树
}
}
@@ -40,20 +42,20 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// </summary>
private void InitTreeMenu()
{
if (!string.IsNullOrEmpty(this.txtMonth.Text.Trim()))
{
DateTime startTime = Convert.ToDateTime(this.txtMonth.Text.Trim() + "-01");
DateTime endTime = startTime.AddMonths(1);
this.tvControlItem.Nodes.Clear();
var weldReports = (from x in Funs.DB.Pipeline_WeldingDaily
where x.ProjectId == this.CurrUser.LoginProjectId
select x).ToList();
this.BindNodes(null, weldReports, startTime, endTime);
}
else
{
Alert.ShowInTop("请选择月份！", MessageBoxIcon.Warning);
}
//if (!string.IsNullOrEmpty(this.txtMonth.Text.Trim()))
//{
// DateTime startTime = Convert.ToDateTime(this.txtMonth.Text.Trim() + "-01");
// DateTime endTime = startTime.AddMonths(1);
// this.tvControlItem.Nodes.Clear();
// var weldReports = (from x in Funs.DB.Pipeline_WeldingDaily
// where x.ProjectId == this.CurrUser.LoginProjectId
// select x).ToList();
// this.BindNodes(null, weldReports, startTime, endTime);
//}
//else
//{
// Alert.ShowInTop("请选择月份！", MessageBoxIcon.Warning);
//}
}
#endregion
@@ -65,80 +67,80 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// <param name="node"></param>
private void BindNodes(TreeNode node, List<Model.Pipeline_WeldingDaily> projectWeldReports, DateTime startTime, DateTime endTime)
{
var pUnitDepth = Funs.DB.Project_Unit.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId && x.ProjectId == this.CurrUser.LoginProjectId);
//var pUnitDepth = Funs.DB.Project_Unit.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId && x.ProjectId == this.CurrUser.LoginProjectId);
if (node == null)
{
if (pUnitDepth!=null && pUnitDepth.UnitType == Const.UnitType_5)
{
var installations = (from x in projectWeldReports
join y in Funs.DB.Project_Installation
on x.InstallationId equals y.InstallationId
where x.UnitId==this.CurrUser.UnitId && x.WeldingDate >= startTime && x.WeldingDate < endTime
select y).Distinct().ToList();
foreach (var q in installations)
{
TreeNode newNode = new TreeNode();
newNode.NodeID = q.InstallationId;
newNode.Text = q.InstallationName;
newNode.ToolTip = Resources.Lan.InstallationName;
newNode.Expanded = true;
this.tvControlItem.Nodes.Add(newNode);
this.BindNodes(newNode, projectWeldReports, startTime, endTime);
}
}
else
{
var installations = (from x in projectWeldReports
join y in Funs.DB.Project_Installation
on x.InstallationId equals y.InstallationId
where x.WeldingDate >= startTime && x.WeldingDate < endTime
select y).Distinct().ToList();
foreach (var q in installations)
{
TreeNode newNode = new TreeNode();
newNode.NodeID = q.InstallationId;
newNode.Text = q.InstallationName;
newNode.ToolTip = Resources.Lan.InstallationName;
newNode.Expanded = true;
this.tvControlItem.Nodes.Add(newNode);
this.BindNodes(newNode, projectWeldReports, startTime, endTime);
}
}
//if (node == null)
//{
// if (pUnitDepth!=null && pUnitDepth.UnitType == Const.UnitType_5)
// {
// var installations = (from x in projectWeldReports
// join y in Funs.DB.Project_Installation
// on x.InstallationId equals y.InstallationId
// where x.UnitId==this.CurrUser.UnitId && x.WeldingDate >= startTime && x.WeldingDate < endTime
// select y).Distinct().ToList();
// foreach (var q in installations)
// {
// TreeNode newNode = new TreeNode();
// newNode.NodeID = q.InstallationId;
// newNode.Text = q.InstallationName;
// newNode.ToolTip = Resources.Lan.InstallationName;
// newNode.Expanded = true;
// this.tvControlItem.Nodes.Add(newNode);
// this.BindNodes(newNode, projectWeldReports, startTime, endTime);
// }
// }
// else
// {
// var installations = (from x in projectWeldReports
// join y in Funs.DB.Project_Installation
// on x.InstallationId equals y.InstallationId
// where x.WeldingDate >= startTime && x.WeldingDate < endTime
// select y).Distinct().ToList();
// foreach (var q in installations)
// {
// TreeNode newNode = new TreeNode();
// newNode.NodeID = q.InstallationId;
// newNode.Text = q.InstallationName;
// newNode.ToolTip = Resources.Lan.InstallationName;
// newNode.Expanded = true;
// this.tvControlItem.Nodes.Add(newNode);
// this.BindNodes(newNode, projectWeldReports, startTime, endTime);
// }
// }
}
else if (node.ToolTip == Resources.Lan.InstallationName)
{
List<Model.Base_Unit> units = null;
if (pUnitDepth != null && pUnitDepth.UnitType == Const.UnitType_5)
{
units = (from x in Funs.DB.Base_Unit
where x.UnitId == this.CurrUser.UnitId
select x).ToList();
//}
//else if (node.ToolTip == Resources.Lan.InstallationName)
//{
// List<Model.Base_Unit> units = null;
// if (pUnitDepth != null && pUnitDepth.UnitType == Const.UnitType_5)
// {
// units = (from x in Funs.DB.Base_Unit
// where x.UnitId == this.CurrUser.UnitId
// select x).ToList();
}
else
{
units = (from x in projectWeldReports
join y in Funs.DB.Project_Installation
on x.InstallationId equals y.InstallationId
join z in Funs.DB.Base_Unit
on x.UnitId equals z.UnitId
where x.InstallationId == node.NodeID && x.WeldingDate >= startTime && x.WeldingDate < endTime
select z).Distinct().ToList();
}
// }
// else
// {
// units = (from x in projectWeldReports
// join y in Funs.DB.Project_Installation
// on x.InstallationId equals y.InstallationId
// join z in Funs.DB.Base_Unit
// on x.UnitId equals z.UnitId
// where x.InstallationId == node.NodeID && x.WeldingDate >= startTime && x.WeldingDate < endTime
// select z).Distinct().ToList();
// }
units = units.OrderBy(x => x.InTime).Distinct().ToList();
foreach (var q in units)
{
TreeNode newNode = new TreeNode();
newNode.Text = q.UnitName;
newNode.NodeID = q.UnitId + "|" + node.NodeID;
newNode.ToolTip = Resources.Lan.UnitName;
newNode.EnableClickEvent = true;
node.Nodes.Add(newNode);
}
}
// units = units.OrderBy(x => x.InTime).Distinct().ToList();
// foreach (var q in units)
// {
// TreeNode newNode = new TreeNode();
// newNode.Text = q.UnitName;
// newNode.NodeID = q.UnitId + "|" + node.NodeID;
// newNode.ToolTip = Resources.Lan.UnitName;
// newNode.EnableClickEvent = true;
// node.Nodes.Add(newNode);
// }
//}
}
#endregion
#endregion
@@ -173,58 +175,63 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// </summary>
private void BindGrid()
{
if (this.tvControlItem.SelectedNode != null && this.tvControlItem.SelectedNode.ToolTip == Resources.Lan.UnitName)
{
string[] strs = this.tvControlItem.SelectedNodeID.Split('|');
DateTime startDate = Convert.ToDateTime(this.txtMonth.Text.Trim() + "-1");
DateTime endDate = startDate.AddMonths(1);
string startDateStr = string.Format("{0:yyyy-MM-dd}", startDate);
string endDateStr = string.Format("{0:yyyy-MM-dd}", endDate);
string strSql = @"SELECT distinct d.WeldingDailyId,d.WeldingDailyCode,d.ProjectId,
//if (this.tvControlItem.SelectedNode != null && this.tvControlItem.SelectedNode.ToolTip == Resources.Lan.UnitName)
//{
//string[] strs = this.tvControlItem.SelectedNodeID.Split('|');
//DateTime startDate = Convert.ToDateTime(this.txtMonth.Text.Trim() + "-1");
//DateTime endDate = startDate.AddMonths(1);
//string startDateStr = string.Format("{0:yyyy-MM-dd}", startDate);
//string endDateStr = string.Format("{0:yyyy-MM-dd}", endDate);
string strSql = @"SELECT distinct d.WeldingDailyId,d.WeldingDailyCode,d.ProjectId,
d.InstallationId,d.UnitId,d.WeldingDate,d.Tabler,d.TableDate,d.Remark
FROM dbo.Pipeline_WeldingDaily d
left join dbo.View_Pipeline_WeldJoint w on w.WeldingDailyId=d.WeldingDailyId
WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>
{
List<SqlParameter> listStr = new List<SqlParameter>
{
};
strSql += " AND d.ProjectId =@ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
};
strSql += " AND d.ProjectId =@ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (drpInstallation.SelectedValue != Const._Null)
{
strSql += " AND d.InstallationId =@InstallationId";
listStr.Add(new SqlParameter("@InstallationId", strs[1]));
strSql += " AND d.UnitId =@UnitId";
listStr.Add(new SqlParameter("@UnitId", strs[0]));
strSql += " AND d.WeldingDate >=@startDateStr";
listStr.Add(new SqlParameter("@startDateStr", startDateStr));
strSql += " AND d.WeldingDate <@endDateStr";
listStr.Add(new SqlParameter("@endDateStr", endDateStr));
if (!string.IsNullOrEmpty(this.txtWeldingDate.Text.Trim()))
{
strSql += " AND d.WeldingDate = @WeldingDate";
listStr.Add(new SqlParameter("@WeldingDate", this.txtWeldingDate.Text.Trim()));
}
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
{
strSql += " AND w.PipelineCode LIKE @PipelineCode";
listStr.Add(new SqlParameter("@PipelineCode", "%" + this.txtPipelineCode.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()))
{
strSql += " AND w.WeldJointCode LIKE @WeldJointCode";
listStr.Add(new SqlParameter("@WeldJointCode", "%" + this.txtWeldJointCode.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
// 2.获取当前分页数据
//var table = this.GetPagedDataTable(Grid1, tb1);
Grid1.RecordCount = tb.Rows.Count;
tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
listStr.Add(new SqlParameter("@InstallationId", drpInstallation.SelectedValue));
}
//strSql += " AND d.UnitId =@UnitId";
//listStr.Add(new SqlParameter("@UnitId", strs[0]));
//strSql += " AND d.WeldingDate >=@startDateStr";
//listStr.Add(new SqlParameter("@startDateStr", startDateStr));
//strSql += " AND d.WeldingDate <@endDateStr";
//listStr.Add(new SqlParameter("@endDateStr", endDateStr));
if (!string.IsNullOrEmpty(this.txtWeldingDate.Text.Trim()))
{
strSql += " AND d.WeldingDate = @WeldingDate";
listStr.Add(new SqlParameter("@WeldingDate", this.txtWeldingDate.Text.Trim()));
}
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
{
strSql += " AND w.PipelineCode LIKE @PipelineCode";
listStr.Add(new SqlParameter("@PipelineCode", "%" + this.txtPipelineCode.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()))
{
strSql += " AND w.WeldJointCode = @WeldJointCode";
listStr.Add(new SqlParameter("@WeldJointCode", this.txtWeldJointCode.Text.Trim()));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
// 2.获取当前分页数据
//var table = this.GetPagedDataTable(Grid1, tb1);
Grid1.RecordCount = tb.Rows.Count;
tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
//}
}
#endregion
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.designer.cs
Generated
+42 -76
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.WeldingManage {
public partial class WeldReport {
namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
public partial class WeldReport
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,52 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtMonth 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtMonth;
/// <summary>
/// tvControlItem 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar3 控件。
/// </summary>
@@ -92,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// dailyReportUrl 控件。
/// </summary>
@@ -101,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FileUpload dailyReportUrl;
/// <summary>
/// btnImport 控件。
/// </summary>
@@ -110,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnDownLoad 控件。
/// </summary>
@@ -119,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDownLoad;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -128,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -137,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// hidFileName 控件。
/// </summary>
@@ -146,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hidFileName;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -155,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtWeldingDate 控件。
/// </summary>
@@ -164,7 +121,16 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtWeldingDate;
/// <summary>
/// drpInstallation 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpInstallation;
/// <summary>
/// txtPipelineCode 控件。
/// </summary>
@@ -173,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipelineCode;
/// <summary>
/// txtWeldJointCode 控件。
/// </summary>
@@ -182,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldJointCode;
/// <summary>
/// btnQuery 控件。
/// </summary>
@@ -191,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
@@ -200,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -209,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Label2 控件。
/// </summary>
@@ -218,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label3 控件。
/// </summary>
@@ -227,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label3;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -236,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -245,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -254,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -263,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -272,7 +238,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -281,7 +247,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@@ -290,7 +256,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx
+10
View File
@@ -65,6 +65,16 @@
DataField="SingleNumber" FieldType="String" HeaderTextAlign="Center"
Width="180px">
</f:RenderField>
<f:RenderField HeaderText="管道等级" ColumnID="PipingClassCode"
DataField="PipingClassCode" FieldType="String" HeaderTextAlign="Center"
Width="90px">
</f:RenderField>
<f:RenderField HeaderText="压力管道分级" ColumnID="PIPClassCode"
DataField="PIPClassCode" FieldType="String" HeaderTextAlign="Center"
Width="110px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,PipelineCode %>" ColumnID="PipelineCode"
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
Width="180px">
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs
+91 -81
View File
@@ -225,152 +225,162 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
reportModel.GetRow(rowIndex).GetCell(5).SetCellValue(itemOver["PipelineCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(5).CellStyle = style;
//图纸版次
//管道等级
if (reportModel.GetRow(rowIndex).GetCell(6) == null) reportModel.GetRow(rowIndex).CreateCell(6);
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(itemOver["DrawingsNum"].ToString());
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(itemOver["PipingClassCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(6).CellStyle = style;
//页码
//压力管道分级
if (reportModel.GetRow(rowIndex).GetCell(7) == null) reportModel.GetRow(rowIndex).CreateCell(7);
reportModel.GetRow(rowIndex).GetCell(7).SetCellValue(itemOver["PageNum"].ToString());
reportModel.GetRow(rowIndex).GetCell(7).SetCellValue(itemOver["PIPClassCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(7).CellStyle = style;
//管段
//图纸版次
if (reportModel.GetRow(rowIndex).GetCell(8) == null) reportModel.GetRow(rowIndex).CreateCell(8);
reportModel.GetRow(rowIndex).GetCell(8).SetCellValue(itemOver["PipeSegment"].ToString());
reportModel.GetRow(rowIndex).GetCell(8).SetCellValue(itemOver["DrawingsNum"].ToString());
reportModel.GetRow(rowIndex).GetCell(8).CellStyle = style;
//焊口号
//页码
if (reportModel.GetRow(rowIndex).GetCell(9) == null) reportModel.GetRow(rowIndex).CreateCell(9);
reportModel.GetRow(rowIndex).GetCell(9).SetCellValue(itemOver["WeldJointCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(9).SetCellValue(itemOver["PageNum"].ToString());
reportModel.GetRow(rowIndex).GetCell(9).CellStyle = style;
//焊缝类型
//管段
if (reportModel.GetRow(rowIndex).GetCell(10) == null) reportModel.GetRow(rowIndex).CreateCell(10);
reportModel.GetRow(rowIndex).GetCell(10).SetCellValue(itemOver["WeldTypeCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(10).SetCellValue(itemOver["PipeSegment"].ToString());
reportModel.GetRow(rowIndex).GetCell(10).CellStyle = style;
//焊接位置
//焊口号
if (reportModel.GetRow(rowIndex).GetCell(11) == null) reportModel.GetRow(rowIndex).CreateCell(11);
reportModel.GetRow(rowIndex).GetCell(11).SetCellValue(itemOver["WeldingLocationCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(11).SetCellValue(itemOver["WeldJointCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(11).CellStyle = style;
//管径
//焊缝类型
if (reportModel.GetRow(rowIndex).GetCell(12) == null) reportModel.GetRow(rowIndex).CreateCell(12);
reportModel.GetRow(rowIndex).GetCell(12).SetCellValue(itemOver["JOT_Size"].ToString());
reportModel.GetRow(rowIndex).GetCell(12).SetCellValue(itemOver["WeldTypeCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(12).CellStyle = style;
//规格
//焊接位置
if (reportModel.GetRow(rowIndex).GetCell(13) == null) reportModel.GetRow(rowIndex).CreateCell(13);
reportModel.GetRow(rowIndex).GetCell(13).SetCellValue(itemOver["Specification"].ToString());
reportModel.GetRow(rowIndex).GetCell(13).SetCellValue(itemOver["WeldingLocationCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(13).CellStyle = style;
//材质1
//管径
if (reportModel.GetRow(rowIndex).GetCell(14) == null) reportModel.GetRow(rowIndex).CreateCell(14);
reportModel.GetRow(rowIndex).GetCell(14).SetCellValue(itemOver["MaterialCode1"].ToString());
reportModel.GetRow(rowIndex).GetCell(14).SetCellValue(itemOver["JOT_Size"].ToString());
reportModel.GetRow(rowIndex).GetCell(14).CellStyle = style;
//材质2
//规格
if (reportModel.GetRow(rowIndex).GetCell(15) == null) reportModel.GetRow(rowIndex).CreateCell(15);
reportModel.GetRow(rowIndex).GetCell(15).SetCellValue(itemOver["MaterialCode2"].ToString());
reportModel.GetRow(rowIndex).GetCell(15).SetCellValue(itemOver["Specification"].ToString());
reportModel.GetRow(rowIndex).GetCell(15).CellStyle = style;
//组件1
//材质1
if (reportModel.GetRow(rowIndex).GetCell(16) == null) reportModel.GetRow(rowIndex).CreateCell(16);
reportModel.GetRow(rowIndex).GetCell(16).SetCellValue(itemOver["PipeAssembly1"].ToString());
reportModel.GetRow(rowIndex).GetCell(16).SetCellValue(itemOver["MaterialCode1"].ToString());
reportModel.GetRow(rowIndex).GetCell(16).CellStyle = style;
//组件2
//材质2
if (reportModel.GetRow(rowIndex).GetCell(17) == null) reportModel.GetRow(rowIndex).CreateCell(17);
reportModel.GetRow(rowIndex).GetCell(17).SetCellValue(itemOver["PipeAssembly2"].ToString());
reportModel.GetRow(rowIndex).GetCell(17).SetCellValue(itemOver["MaterialCode2"].ToString());
reportModel.GetRow(rowIndex).GetCell(17).CellStyle = style;
//组件1
if (reportModel.GetRow(rowIndex).GetCell(18) == null) reportModel.GetRow(rowIndex).CreateCell(18);
reportModel.GetRow(rowIndex).GetCell(18).SetCellValue(itemOver["PipeAssembly1"].ToString());
reportModel.GetRow(rowIndex).GetCell(18).CellStyle = style;
//组件2
if (reportModel.GetRow(rowIndex).GetCell(19) == null) reportModel.GetRow(rowIndex).CreateCell(19);
reportModel.GetRow(rowIndex).GetCell(19).SetCellValue(itemOver["PipeAssembly2"].ToString());
reportModel.GetRow(rowIndex).GetCell(19).CellStyle = style;
//炉批号1
if (reportModel.GetRow(rowIndex).GetCell(18) == null) reportModel.GetRow(rowIndex).CreateCell(18);
reportModel.GetRow(rowIndex).GetCell(18).SetCellValue(itemOver["HeartNo1"].ToString());
reportModel.GetRow(rowIndex).GetCell(18).CellStyle = style;
//炉批号2
if (reportModel.GetRow(rowIndex).GetCell(19) == null) reportModel.GetRow(rowIndex).CreateCell(19);
reportModel.GetRow(rowIndex).GetCell(19).SetCellValue(itemOver["HeartNo2"].ToString());
reportModel.GetRow(rowIndex).GetCell(19).CellStyle = style;
//WPS编号
if (reportModel.GetRow(rowIndex).GetCell(20) == null) reportModel.GetRow(rowIndex).CreateCell(20);
reportModel.GetRow(rowIndex).GetCell(20).SetCellValue(itemOver["WPQCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(20).SetCellValue(itemOver["HeartNo1"].ToString());
reportModel.GetRow(rowIndex).GetCell(20).CellStyle = style;
//打底焊工
//炉批号2
if (reportModel.GetRow(rowIndex).GetCell(21) == null) reportModel.GetRow(rowIndex).CreateCell(21);
reportModel.GetRow(rowIndex).GetCell(21).SetCellValue(itemOver["BackingWelderCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(21).SetCellValue(itemOver["HeartNo2"].ToString());
reportModel.GetRow(rowIndex).GetCell(21).CellStyle = style;
//盖面焊工
//WPS编号
if (reportModel.GetRow(rowIndex).GetCell(22) == null) reportModel.GetRow(rowIndex).CreateCell(22);
reportModel.GetRow(rowIndex).GetCell(22).SetCellValue(itemOver["CoverWelderCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(22).SetCellValue(itemOver["WPQCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(22).CellStyle = style;
//打底焊工
if (reportModel.GetRow(rowIndex).GetCell(23) == null) reportModel.GetRow(rowIndex).CreateCell(23);
reportModel.GetRow(rowIndex).GetCell(23).SetCellValue(itemOver["BackingWelderCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(23).CellStyle = style;
//盖面焊工
if (reportModel.GetRow(rowIndex).GetCell(24) == null) reportModel.GetRow(rowIndex).CreateCell(24);
reportModel.GetRow(rowIndex).GetCell(24).SetCellValue(itemOver["CoverWelderCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(24).CellStyle = style;
//焊接方法
if (reportModel.GetRow(rowIndex).GetCell(23) == null) reportModel.GetRow(rowIndex).CreateCell(23);
reportModel.GetRow(rowIndex).GetCell(23).SetCellValue(itemOver["WeldingMethodName"].ToString());
reportModel.GetRow(rowIndex).GetCell(23).CellStyle = style;
//介质
if (reportModel.GetRow(rowIndex).GetCell(24) == null) reportModel.GetRow(rowIndex).CreateCell(24);
reportModel.GetRow(rowIndex).GetCell(24).SetCellValue(itemOver["MediumName"].ToString());
reportModel.GetRow(rowIndex).GetCell(24).CellStyle = style;
//焊接日期
if (reportModel.GetRow(rowIndex).GetCell(25) == null) reportModel.GetRow(rowIndex).CreateCell(25);
reportModel.GetRow(rowIndex).GetCell(25).SetCellValue(itemOver["WeldingMethodName"].ToString());
reportModel.GetRow(rowIndex).GetCell(25).CellStyle = style;
//介质
if (reportModel.GetRow(rowIndex).GetCell(26) == null) reportModel.GetRow(rowIndex).CreateCell(26);
reportModel.GetRow(rowIndex).GetCell(26).SetCellValue(itemOver["MediumName"].ToString());
reportModel.GetRow(rowIndex).GetCell(26).CellStyle = style;
//焊接日期
if (reportModel.GetRow(rowIndex).GetCell(27) == null) reportModel.GetRow(rowIndex).CreateCell(27);
if (itemOver["WeldingDate"] != null && itemOver["WeldingDate"].ToString() != string.Empty)
{
reportModel.GetRow(rowIndex).GetCell(25).SetCellValue((DateTime)Convert.ToDateTime(itemOver["WeldingDate"].ToString()));
reportModel.GetRow(rowIndex).GetCell(25).CellStyle = styleDate;
reportModel.GetRow(rowIndex).GetCell(27).SetCellValue((DateTime)Convert.ToDateTime(itemOver["WeldingDate"].ToString()));
reportModel.GetRow(rowIndex).GetCell(27).CellStyle = styleDate;
}
//reportModel.GetRow(rowIndex).GetCell(23).SetCellValue(itemOver["WeldingDate"].ToString());
//焊接日报号
if (reportModel.GetRow(rowIndex).GetCell(26) == null) reportModel.GetRow(rowIndex).CreateCell(26);
reportModel.GetRow(rowIndex).GetCell(26).SetCellValue(itemOver["WeldingDailyCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(26).CellStyle = style;
//检测类型
if (reportModel.GetRow(rowIndex).GetCell(27) == null) reportModel.GetRow(rowIndex).CreateCell(27);
reportModel.GetRow(rowIndex).GetCell(27).SetCellValue(itemOver["DetectionTypeCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(27).CellStyle = style;
//是否点口
if (reportModel.GetRow(rowIndex).GetCell(28) == null) reportModel.GetRow(rowIndex).CreateCell(28);
reportModel.GetRow(rowIndex).GetCell(28).SetCellValue(itemOver["if_dk"].ToString());
reportModel.GetRow(rowIndex).GetCell(28).SetCellValue(itemOver["WeldingDailyCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(28).CellStyle = style;
//委托号
//检测类型
if (reportModel.GetRow(rowIndex).GetCell(29) == null) reportModel.GetRow(rowIndex).CreateCell(29);
reportModel.GetRow(rowIndex).GetCell(29).SetCellValue(itemOver["TrustBatchCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(29).SetCellValue(itemOver["DetectionTypeCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(29).CellStyle = style;
//检测比例
//是否点口
if (reportModel.GetRow(rowIndex).GetCell(30) == null) reportModel.GetRow(rowIndex).CreateCell(30);
reportModel.GetRow(rowIndex).GetCell(30).SetCellValue(itemOver["DetectionRateCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(30).SetCellValue(itemOver["if_dk"].ToString());
reportModel.GetRow(rowIndex).GetCell(30).CellStyle = style;
//合格等级
//委托号
if (reportModel.GetRow(rowIndex).GetCell(31) == null) reportModel.GetRow(rowIndex).CreateCell(31);
reportModel.GetRow(rowIndex).GetCell(31).SetCellValue(itemOver["AcceptLevel"].ToString());
reportModel.GetRow(rowIndex).GetCell(31).SetCellValue(itemOver["TrustBatchCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(31).CellStyle = style;
//检测日期
//检测比例
if (reportModel.GetRow(rowIndex).GetCell(32) == null) reportModel.GetRow(rowIndex).CreateCell(32);
reportModel.GetRow(rowIndex).GetCell(32).SetCellValue(itemOver["DetectionRateCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(32).CellStyle = style;
//合格等级
if (reportModel.GetRow(rowIndex).GetCell(33) == null) reportModel.GetRow(rowIndex).CreateCell(33);
reportModel.GetRow(rowIndex).GetCell(33).SetCellValue(itemOver["AcceptLevel"].ToString());
reportModel.GetRow(rowIndex).GetCell(33).CellStyle = style;
//检测日期
if (reportModel.GetRow(rowIndex).GetCell(34) == null) reportModel.GetRow(rowIndex).CreateCell(34);
if (itemOver["CHT_CHECKDATE"] != null && itemOver["CHT_CHECKDATE"].ToString() != string.Empty)
{
reportModel.GetRow(rowIndex).GetCell(32).SetCellValue((DateTime)Convert.ToDateTime(itemOver["CHT_CHECKDATE"].ToString()));
reportModel.GetRow(rowIndex).GetCell(32).CellStyle = styleDate;
reportModel.GetRow(rowIndex).GetCell(34).SetCellValue((DateTime)Convert.ToDateTime(itemOver["CHT_CHECKDATE"].ToString()));
reportModel.GetRow(rowIndex).GetCell(34).CellStyle = styleDate;
}
//reportModel.GetRow(rowIndex).GetCell(30).SetCellValue(itemOver["CHT_CHECKDATE"].ToString());
//检测报告
if (reportModel.GetRow(rowIndex).GetCell(33) == null) reportModel.GetRow(rowIndex).CreateCell(33);
reportModel.GetRow(rowIndex).GetCell(33).SetCellValue(itemOver["NDEReportNo"].ToString());
reportModel.GetRow(rowIndex).GetCell(33).CellStyle = style;
if (reportModel.GetRow(rowIndex).GetCell(35) == null) reportModel.GetRow(rowIndex).CreateCell(35);
reportModel.GetRow(rowIndex).GetCell(35).SetCellValue(itemOver["NDEReportNo"].ToString());
reportModel.GetRow(rowIndex).GetCell(35).CellStyle = style;
//是否热处理
if (reportModel.GetRow(rowIndex).GetCell(34) == null) reportModel.GetRow(rowIndex).CreateCell(34);
reportModel.GetRow(rowIndex).GetCell(34).SetCellValue(itemOver["IsHotProess"].ToString());
reportModel.GetRow(rowIndex).GetCell(34).CellStyle = style;
//热处理报告
if (reportModel.GetRow(rowIndex).GetCell(35) == null) reportModel.GetRow(rowIndex).CreateCell(35);
reportModel.GetRow(rowIndex).GetCell(35).SetCellValue(itemOver["HotReportCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(35).CellStyle = style;
//焊丝
if (reportModel.GetRow(rowIndex).GetCell(36) == null) reportModel.GetRow(rowIndex).CreateCell(36);
reportModel.GetRow(rowIndex).GetCell(36).SetCellValue(ConvertWeldSilk(itemOver["WeldSilkId"]));
reportModel.GetRow(rowIndex).GetCell(36).SetCellValue(itemOver["IsHotProess"].ToString());
reportModel.GetRow(rowIndex).GetCell(36).CellStyle = style;
//焊条
//热处理报告
if (reportModel.GetRow(rowIndex).GetCell(37) == null) reportModel.GetRow(rowIndex).CreateCell(37);
reportModel.GetRow(rowIndex).GetCell(37).SetCellValue(itemOver["WMT_MatCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(37).SetCellValue(itemOver["HotReportCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(37).CellStyle = style;
//焊剂
//焊丝
if (reportModel.GetRow(rowIndex).GetCell(38) == null) reportModel.GetRow(rowIndex).CreateCell(38);
reportModel.GetRow(rowIndex).GetCell(38).SetCellValue(ConvertWeldFlux(itemOver["WeldSilkId"]));
reportModel.GetRow(rowIndex).GetCell(38).SetCellValue(ConvertWeldSilk(itemOver["WeldSilkId"]));
reportModel.GetRow(rowIndex).GetCell(38).CellStyle = style;
//焊条
if (reportModel.GetRow(rowIndex).GetCell(39) == null) reportModel.GetRow(rowIndex).CreateCell(39);
reportModel.GetRow(rowIndex).GetCell(39).SetCellValue(itemOver["WMT_MatCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(39).CellStyle = style;
//焊剂
if (reportModel.GetRow(rowIndex).GetCell(40) == null) reportModel.GetRow(rowIndex).CreateCell(40);
reportModel.GetRow(rowIndex).GetCell(40).SetCellValue(ConvertWeldFlux(itemOver["WeldSilkId"]));
reportModel.GetRow(rowIndex).GetCell(40).CellStyle = style;
#endregion