lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20230220 003焊接修改

Browse Source
This commit is contained in:
李鹏飞
2023-02-20 21:59:35 +08:00
parent e2edbb0f51
commit 8e8eecbcfc
28 changed files with 4507 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
+11 -5
View File
@@ -38,8 +38,12 @@
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线号"
EmptyText="输入查询条件" Width="230px" LabelWidth="65px">
</f:TextBox>
<f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>
<f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
<f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
</f:Button>
<f:Button ID="btnStatisticsMat" ToolTip="匹配材料" Icon="TabGo" runat="server" OnClick="btnStatisticsMat_Click">
@@ -130,9 +134,11 @@
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="false" runat="server" IsModal="true"
Width="1200px" Height="750px">
<f:Window ID="Window2" Title="匹配100%材料" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" runat="server"
Width="650px" Height="300px" Icon="TagBlue"
EnableCollapse="true" EnableResize="true"
IsModal="false" AutoScroll="true" BodyPadding="10px">
</f:Window>
</form>
<script type="text/javascript">
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs
Generated
+9
View File
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.HiddenField hdUnitWorkId;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// btnTreeFind 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
+153 -155
View File
@@ -6,8 +6,7 @@
<head runat="server">
<title>编辑焊接日报</title>
<style type="text/css">
.customlabel span
{
.customlabel span {
color: red;
font-weight: bold;
}
@@ -15,106 +14,105 @@
</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="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊接日报"
TitleToolTip="焊接日报" AutoScroll="true">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:HiddenField runat="server" ID="hdItemsString">
</f:HiddenField>
<f:HiddenField runat="server" ID="hdTablerId">
</f:HiddenField>
<f:DropDownList ID="drpJointAttribute" Label="焊口属性" AutoPostBack="true"
runat="server" ShowRedStar="true" Required="true" LabelWidth="100px" OnSelectedIndexChanged="drpJointAttribute_SelectedIndexChanged"
Width="180px" LabelAlign="Right">
</f:DropDownList>
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线号" AutoPostBack="true" LabelAlign="Right" OnTextChanged="drpJointAttribute_SelectedIndexChanged"></f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" ToolTip="保存" Text ="保存" Icon="SystemSave" runat="server"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnAccept" Icon="Accept" runat="server" ToolTip="提交" Text="提交"
OnClick="btnAccept_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true" BodyPadding="10px"
runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtWeldingDailyCode" Label="焊接日报编号"
ShowRedStar="true" Required="true" runat="server" LabelWidth="120px" LabelAlign="Right" FocusOnPageLoad="true">
</f:TextBox>
<f:DropDownList ID="drpUnit" Label="单位名称" runat="server" Readonly="true"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px" LabelAlign="Right">
</f:DropDownList>
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程编号" Readonly="true"
LabelAlign="Right" EnableEdit="true" ShowRedStar="true" Required="true" LabelWidth="140px">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtWeldingDate" Label="焊接日期" runat="server"
DateFormatString="yyyy-MM-dd" ShowRedStar="true" Required="true" LabelWidth="120px"
LabelAlign="Right" OnTextChanged="WeldingDateText_OnTextChanged" AutoPostBack="true">
</f:DatePicker>
<f:TextBox ID="txtTabler" Label="填报人" Readonly="true" runat="server"
LabelWidth="120px" LabelAlign="Right">
</f:TextBox>
<f:DatePicker ID="txtTableDate" Label="填报日期" runat="server"
ShowRedStar="true" Required="true" LabelWidth="140px" LabelAlign="Right" DateFormatString="yyyy-MM-dd">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtRemark" Label="备注" runat="server" LabelWidth="120px">
</f:TextBox>
<f:Label ID="lbAmount" Label="超量焊工" runat="server" LabelWidth="120px"
Hidden="true" CssClass="customlabel">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接日报"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldTaskId,WeldJointId" EnableColumnLines="true" ForceFit="true"
AllowCellEditing="true" ClicksToEdit="1" DataIDField="WeldTaskId" AllowSorting="true" KeepCurrentSelection="true" AllowColumnLocking="true"
SortField="WeldJointNum" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" CheckBoxSelectOnly="true"
AllowPaging="false" IsDatabasePaging="false" PageSize="10000" EnableTextSelection="True" DisableUnselectableRows="true"
EnableBigData="true" >
<Columns>
<f:RenderField HeaderText="焊口序号" ColumnID="WeldJointNum"
DataField="WeldJointNum" SortField="WeldJointNum" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="140px">
</f:RenderField>
<f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="180px" ExpandUnusedSpace="true">
</f:RenderField>
<f:TemplateField ColumnID="tfPipeArea" Width="180px" HeaderText="管线划分" HeaderTextAlign="Center" Hidden="true"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbPipeArea" runat="server" Text='<%# ConvertPipeArea(Eval("PipeArea")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="180px">
</f:RenderField>
<f:RenderField HeaderText="可焊焊工号" ColumnID="CanWelderCode"
<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="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊接日报"
TitleToolTip="焊接日报" AutoScroll="true">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:HiddenField runat="server" ID="hdItemsString">
</f:HiddenField>
<f:HiddenField runat="server" ID="hdTablerId">
</f:HiddenField>
<f:DropDownList ID="drpJointAttribute" Label="焊口属性" AutoPostBack="true"
runat="server" ShowRedStar="true" Required="true" LabelWidth="100px" OnSelectedIndexChanged="drpJointAttribute_SelectedIndexChanged"
Width="180px" LabelAlign="Right">
</f:DropDownList>
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线号" AutoPostBack="true" LabelAlign="Right" OnTextChanged="drpJointAttribute_SelectedIndexChanged"></f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" ToolTip="保存" Text="保存" Icon="SystemSave" runat="server"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnAccept" Icon="Accept" runat="server" ToolTip="提交" Text="提交"
OnClick="btnAccept_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true" BodyPadding="10px"
runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtWeldingDailyCode" Label="焊接日报编号"
ShowRedStar="true" Required="true" runat="server" LabelWidth="120px" LabelAlign="Right" FocusOnPageLoad="true">
</f:TextBox>
<f:DropDownList ID="drpUnit" Label="单位名称" runat="server" Readonly="true"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px" LabelAlign="Right">
</f:DropDownList>
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程编号" Readonly="true"
LabelAlign="Right" EnableEdit="true" ShowRedStar="true" Required="true" LabelWidth="140px">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtWeldingDate" Label="焊接日期" runat="server"
DateFormatString="yyyy-MM-dd" ShowRedStar="true" Required="true" LabelWidth="120px"
LabelAlign="Right" OnTextChanged="WeldingDateText_OnTextChanged" AutoPostBack="true">
</f:DatePicker>
<f:TextBox ID="txtTabler" Label="填报人" Readonly="true" runat="server"
LabelWidth="120px" LabelAlign="Right">
</f:TextBox>
<f:DatePicker ID="txtTableDate" Label="填报日期" runat="server"
ShowRedStar="true" Required="true" LabelWidth="140px" LabelAlign="Right" DateFormatString="yyyy-MM-dd">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtRemark" Label="备注" runat="server" LabelWidth="120px">
</f:TextBox>
<f:Label ID="lbAmount" Label="超量焊工" runat="server" LabelWidth="120px"
Hidden="true" CssClass="customlabel">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="焊接日报"
EnableCollapse="false" runat="server" BoxFlex="1" DataKeyNames="WeldTaskId,WeldJointId" EnableColumnLines="true" ForceFit="true"
AllowCellEditing="true" ClicksToEdit="1" DataIDField="WeldTaskId" AllowSorting="true" KeepCurrentSelection="true" AllowColumnLocking="true"
SortField="WeldJointNum" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" CheckBoxSelectOnly="true"
EnableTextSelection="True" DisableUnselectableRows="true" PageSize="300">
<Columns>
<f:RenderField HeaderText="焊口序号" ColumnID="WeldJointNum"
DataField="WeldJointNum" SortField="WeldJointNum" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="140px">
</f:RenderField>
<f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="180px" ExpandUnusedSpace="true">
</f:RenderField>
<f:TemplateField ColumnID="tfPipeArea" Width="180px" HeaderText="管线划分" HeaderTextAlign="Center" Hidden="true"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbPipeArea" runat="server" Text='<%# ConvertPipeArea(Eval("PipeArea")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="180px">
</f:RenderField>
<f:RenderField HeaderText="可焊焊工号" ColumnID="CanWelderCode"
DataField="CanWelderCode" SortField="CanWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="300px">
</f:RenderField>
@@ -139,7 +137,7 @@
</f:DropDownList>
</Editor>
</f:RenderField>
<%-- <f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
<%-- <f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="110px">
</f:RenderField>
@@ -147,63 +145,63 @@
DataField="BackingWelderCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="110px">
</f:RenderField>--%>
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" Hidden="true"
DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="焊接类型" ColumnID="WeldTypeCode" Hidden="true"
DataField="WeldTypeCode" SortField="WeldTypeCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="达因" ColumnID="Size"
DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
Width="70px">
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="Dia" Hidden="true"
DataField="Dia" SortField="Dia" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
Width="70px">
</f:RenderField>
<f:RenderField HeaderText="DN公称直径" ColumnID="DNDia" Hidden="true"
DataField="DNDia" SortField="DNDia" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
Width="70px">
</f:RenderField>
<f:RenderField HeaderText="壁厚" ColumnID="Thickness" Hidden="true"
DataField="Thickness" SortField="Thickness" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="焊接方法" ColumnID="WeldingMethodCode" Hidden="true"
DataField="WeldingMethodCode" SortField="WeldingMethodCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="焊丝" ColumnID="WeldingWireCode" Hidden="true"
DataField="WeldingWireCode" FieldType="String"
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" Hidden="true"
DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="焊接类型" ColumnID="WeldTypeCode" Hidden="true"
DataField="WeldTypeCode" SortField="WeldTypeCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="达因" ColumnID="Size"
DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
Width="70px">
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="Dia" Hidden="true"
DataField="Dia" SortField="Dia" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
Width="70px">
</f:RenderField>
<f:RenderField HeaderText="DN公称直径" ColumnID="DNDia" Hidden="true"
DataField="DNDia" SortField="DNDia" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
Width="70px">
</f:RenderField>
<f:RenderField HeaderText="壁厚" ColumnID="Thickness" Hidden="true"
DataField="Thickness" SortField="Thickness" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="焊接方法" ColumnID="WeldingMethodCode" Hidden="true"
DataField="WeldingMethodCode" SortField="WeldingMethodCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="焊丝" ColumnID="WeldingWireCode" Hidden="true"
DataField="WeldingWireCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField HeaderText="焊条" ColumnID="WeldingRodCode" Hidden="true"
DataField="WeldingRodCode" FieldType="String"
DataField="WeldingRodCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField HeaderText="WeldJointId" ColumnID="WeldJointId" DataField="WeldJointId"
FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="盖面焊工ID" ColumnID="CoverWelderId" DataField="CoverWelderId"
FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="打底焊工ID" ColumnID="BackingWelderId" DataField="BackingWelderId"
FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:RenderField HeaderText="WeldJointId" ColumnID="WeldJointId" DataField="WeldJointId"
FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="盖面焊工ID" ColumnID="CoverWelderId" DataField="CoverWelderId"
FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="打底焊工ID" ColumnID="BackingWelderId" DataField="BackingWelderId"
FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="beforeedit" Handler="onGridBeforeEdit" />
<f:Listener Event="afteredit" Handler="onGridAfterEdit" />
</Listeners>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
<%-- <f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true"
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
<%-- <f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close"
IsModal="true" Width="1160px" Height="560px">
</f:Window>
@@ -215,7 +213,7 @@
</f:Menu>--%>
</form>
<script type="text/javascript">
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
@@ -227,7 +225,7 @@
var gridClientID = '<%= Grid1.ClientID %>';
var drpCoverWelderIdClientID = '<%= drpCoverWelderId.ClientID %>';
var drpBackingWelderIdClientID = '<%= drpBackingWelderId.ClientID %>';
function onGridBeforeEdit(event, value, params) {
var grid = F(gridClientID);
@@ -236,8 +234,8 @@
var backingWelderCode = grid.getCellValue(params.rowId, 'BackingWelderCode');
var canWelderList = canWelder.split(',');
if (params.columnId === 'CoverWelderCode') {
var drpCoverWelderId = F(drpCoverWelderIdClientID);
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+39 -8
View File
@@ -1,4 +1,5 @@
using BLL;
using FineUIPro.Web.HJGL.WeldingManage;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -248,6 +249,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
// tb = GetFilteredTable(Grid1.FilteredData, tb);
//var table = this.GetPagedDataTable(Grid1, dt);
Grid1.RecordCount = task.Count;
// var table = task.Skip(Grid1.PageSize * (Grid1.PageIndex)).Take(Grid1.PageSize).ToList();
Grid1.DataSource = task;
Grid1.DataBind();
@@ -622,6 +624,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
//}
#endregion
ChanggeState();//更新焊口属性
//更新焊口属性
if (string.IsNullOrEmpty(errlog))
{
@@ -1240,14 +1244,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
if (!string.IsNullOrEmpty(this.WeldingDailyId))
{
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
foreach (var item in GetWeldingDailyItem)
{
var daily= BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(WeldingDailyId);
BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(item.WeldJointId, (DateTime)daily.WeldingDate);//更改预制口实际时间和状态
PipelineService.UpdataDateByWeldJointId(item.WeldJointId);//更改安装口时间和状态
}
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
this.BindGrid(GetWeldingDailyItem); // 初始化页面
}
else
@@ -1256,7 +1253,21 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
}
private void ChanggeState()
{
if (!string.IsNullOrEmpty(this.WeldingDailyId))
{
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
foreach (var item in GetWeldingDailyItem)
{
var daily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(WeldingDailyId);
BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(item.WeldJointId, (DateTime)daily.WeldingDate);//更改预制口实际时间和状态
PipelineService.UpdataDateByWeldJointId(item.WeldJointId);//更改安装口时间和状态
}
}
}
protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
{
DataRowView row = e.DataItem as DataRowView;
@@ -1289,5 +1300,25 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
// }
//}
}
#region 分页选择下拉改变事件
/// <summary>
/// 分页选择下拉改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.WeldingDailyId))
{
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
this.BindGrid(GetWeldingDailyItem); // 初始化页面
}
else
{
this.BindGrid(null);
}
}
#endregion
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx
+11 -4
View File
@@ -29,9 +29,16 @@
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线号"
EmptyText="输入查询条件" Width="230px" LabelWidth="65px">
</f:TextBox>
EmptyText="输入查询条件" Width="180px" LabelWidth="65px">
</f:TextBox>
<f:CheckBox ID="ckNOEdit" ShowLabel="false" runat="server" Text="未录入" Label="未录入" DisplayType="Switch" Checked="true">
</f:CheckBox>
</Items>
</f:Toolbar>
<f:Toolbar runat="server" ToolbarAlign="Left" >
<Items>
<f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
</f:Button>
@@ -41,7 +48,7 @@
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="单位工程"
OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
EnableSingleClickExpand="true" AutoLeafIdentification="true"
EnableSingleClickExpand="false" AutoLeafIdentification="true"
EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
</f:Tree>
</Items>
@@ -80,7 +87,7 @@
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="WeldJointId"
AllowSorting="true" SortField="WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" EnableRowDoubleClickEvent="true"
EnableTextSelection="True" EnableRowDoubleClickEvent="true"
OnRowDoubleClick="Grid1_RowDoubleClick" OnRowDataBound="Grid1_RowDataBound">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
+64 -12
View File
@@ -1,4 +1,5 @@
using BLL;
using Microsoft.Office.Interop.Word;
using System;
using System.Collections.Generic;
using System.Data;
@@ -73,7 +74,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
foreach (var q in unitWork1)
{
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
int a = 0;
if (ckNOEdit.Checked)
{
string strSql = "SELECT distinct PipelineCode FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL AND UnitWorkId =@UnitWorkId AND WPQId IS NULL";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId));
SqlParameter[] parameter = listStr.ToArray();
System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
a = dt.Rows.Count;
}
else
{
a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
}
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
@@ -97,8 +113,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
foreach (var q in unitWork2)
{
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count();
int a = 0;
if (ckNOEdit.Checked)
{
string strSql = "SELECT distinct PipelineCode FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL AND UnitWorkId =@UnitWorkId AND WPQId IS NULL";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId));
SqlParameter[] parameter = listStr.ToArray();
System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
a = dt.Rows.Count;
}
else
{
a = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
select x).Count();
}
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
@@ -135,7 +168,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
private void BindNodes(TreeNode node)
{
BLL.PipelineService.BindTreeNodes(node, this.txtPipelineCode.Text.Trim(), this.CurrUser.LoginProjectId, pageSize);
BLL.PipelineService.BindTreeNodes(node,true, this.txtPipelineCode.Text.Trim(), this.CurrUser.LoginProjectId, pageSize);
}
#endregion
@@ -164,11 +197,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
if (tvControlItem.SelectedNode.CommandName == "管线")
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
this.BindGrid();
}
}
else if (tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.NodeID;
this.BindGrid();
}
}
@@ -188,8 +230,18 @@ namespace FineUIPro.Web.HJGL.WeldingManage
FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL ";
List<SqlParameter> listStr = new List<SqlParameter> { };
strSql += " AND PipelineId =@PipelineId";
listStr.Add(new SqlParameter("@PipelineId", tvControlItem.SelectedNodeID));
if (tvControlItem.SelectedNode.CommandName == "管线")
{
strSql += " AND PipelineId =@PipelineId";
listStr.Add(new SqlParameter("@PipelineId", tvControlItem.SelectedNodeID));
}
else if (tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2)
{
strSql += " AND UnitWorkId =@UnitWorkId";
listStr.Add(new SqlParameter("@UnitWorkId", tvControlItem.SelectedNodeID));
}
if (!string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()))
{
@@ -209,12 +261,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
SqlParameter[] parameter = listStr.ToArray();
DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
// 2.获取当前分页数据
Grid1.RecordCount = dt.Rows.Count;
var table = this.GetPagedDataTable(Grid1, dt);
Grid1.DataSource = dt;
Grid1.DataSource = table;
Grid1.DataBind();
}
#endregion
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.designer.cs
Generated
+41 -30
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage {
public partial class WeldingConDate {
namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class WeldingConDate
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtPipelineCode 控件。
/// </summary>
@@ -65,7 +67,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipelineCode;
/// <summary>
/// ckNOEdit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckNOEdit;
/// <summary>
/// hdUnitWorkId 控件。
/// </summary>
@@ -74,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdUnitWorkId;
/// <summary>
/// btnTreeFind 控件。
/// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnTreeFind;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar3 控件。
/// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// txtWeldJointCode 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldJointCode;
/// <summary>
/// rbInput 控件。
/// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbInput;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnAutoInput 控件。
/// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAutoInput;
/// <summary>
/// btnEdit 控件。
/// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnEdit;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Window3 控件。
/// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window3;
/// <summary>
/// Menu 控件。
/// </summary>
@@ -227,7 +238,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@@ -236,7 +247,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnView 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
+5 -2
View File
@@ -20,9 +20,12 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtWorkArea" runat="server" Label="区域" EmptyText="输入查询条件"
<%--<f:TextBox ID="txtWorkArea" runat="server" Label="区域" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="Tree_TextChanged" Width="280px" LabelWidth="50px">
</f:TextBox>
</f:TextBox>--%>
<f:Button ID="btnrefresh" ToolTip="同步NET" Icon="ArrowRefresh"
EnablePostBack="true" OnClick="btnrefresh_Click" runat="server">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+16 -10
View File
@@ -119,16 +119,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{
this.BindGrid();
Model.Parameter3D parameter3D = new Model.Parameter3D();
Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = "";
parameter3D.ButtonType = "0";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
// PipelineService.GetPipelinesByUnitWordId(tvControlItem.SelectedNodeID);
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
#endregion
@@ -312,6 +303,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
protected void btnrefresh_Click(object sender, EventArgs e)
{
Model.Parameter3D parameter3D = new Model.Parameter3D();
Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = "";
parameter3D.ButtonType = "0";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
// PipelineService.GetPipelinesByUnitWordId(tvControlItem.SelectedNodeID);
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
}
#endregion
#region 关闭弹出窗口及刷新页面
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.designer.cs
Generated
+2 -2
View File
@@ -60,13 +60,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtWorkArea 控件。
/// btnrefresh 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkArea;
protected global::FineUIPro.Button btnrefresh;
/// <summary>
/// tvControlItem 控件。