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

20220923 焊接测试修改

Browse Source
This commit is contained in:
李鹏飞
2022-09-23 00:01:54 +08:00
parent 01ce3c0381
commit 337cbbebe6
18 changed files with 307 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
+20 -4
View File
@@ -53,10 +53,17 @@
<f:TextBox runat="server" Label="文件名称" ID="txtfilename" EmptyText="输入查询条件" Width="300px" LabelWidth="90px"
LabelAlign="right">
</f:TextBox>
<f:DropDownList runat="server" ID="DropImportType" Label="文件类别" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
<f:ListItem Text="ISO轴测图" Value="0" />
<f:ListItem Text="管道预制加工图" Value="3" />
</f:DropDownList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" OnClick="btnQuery_Click" Text="查询" Hidden="true">
</f:Button>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" OnClick="btnNew_Click" Hidden="true"
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" Text="新增" OnClick="btnNew_Click" Hidden="true"
EnablePostBack="true" runat="server">
</f:Button>
<f:Button ID="btnDelete" ToolTip="删除" Icon="Delete" Text="删除" OnClick="btnMenuDelete_Click" Hidden="true"
EnablePostBack="true" runat="server">
</f:Button>
</Items>
@@ -70,16 +77,22 @@
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="名称" ColumnID="FileName"
DataField="FileName" SortField="FileName" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="200px">
TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="版本" ColumnID="Version"
DataField="Version" SortField="Version" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="类型" ColumnID="FileType"
<f:RenderField HeaderText="格式" ColumnID="FileType"
DataField="FileType" SortField="FileType" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
TextAlign="Left" Width="70px">
</f:RenderField>
<f:TemplateField Width="90px" HeaderText="类型" HeaderTextAlign="Center"
TextAlign="Center" SortField="ImportType">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.HJGL_DataImportService.ConvertFileType(Eval("ImportType")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String"
HeaderText="专业" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
@@ -95,6 +108,9 @@
DataField="CreateDate" SortField="CreateDate" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="更新原因" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs
+11 -2
View File
@@ -17,6 +17,8 @@ namespace FineUIPro.Web.HJGL.DataImport
//this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.InitTreeMenu();//加载树
Funs.FineUIPleaseSelect(DropImportType);
GetButtonPower();
}
}
@@ -123,11 +125,13 @@ namespace FineUIPro.Web.HJGL.DataImport
if (tvControlItem.SelectedNodeID == "1" || tvControlItem.SelectedNodeID == "2")
{
this.btnNew.Hidden = true;
this.btnDelete.Hidden = true;
this.btnSearch.Hidden = true;
}
else
{
this.btnNew.Hidden = false;
this.btnDelete.Hidden = false;
this.btnSearch.Hidden = false;
@@ -150,7 +154,7 @@ namespace FineUIPro.Web.HJGL.DataImport
from ( select * from HJGL_DataImport a where not exists (select 1 from HJGL_DataImport b where a.FileName=b.FileName and a.UnitWorkId=b.UnitWorkId and a.Version<b.Version )) as Import
left join Base_DesignProfessional as Design on Design.DesignProfessionalId=Import.DesignProfessionalId
left join Person_Persons as Users on Users.PersonId=Import.CreateMan
where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.ImportType='0'";
where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.ImportType in ('0','3') ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
@@ -159,6 +163,11 @@ namespace FineUIPro.Web.HJGL.DataImport
strSql += " AND Import.FileName LIKE @FileName";
listStr.Add(new SqlParameter("@FileName", "%" + this.txtfilename.Text.Trim() + "%"));
}
if (DropImportType.SelectedValue != Const._Null)
{
strSql += " AND Import.ImportType=@ImportType";
listStr.Add(new SqlParameter("@ImportType", DropImportType.SelectedValue));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
// 2.获取当前分页数据
@@ -175,7 +184,7 @@ namespace FineUIPro.Web.HJGL.DataImport
from ( select * from HJGL_DataImport a where exists (select 1 from HJGL_DataImport b where a.FileName=b.FileName and a.UnitWorkId=b.UnitWorkId and a.Version<b.Version )) as Import
left join Base_DesignProfessional as Design on Design.DesignProfessionalId=Import.DesignProfessionalId
left join Person_Persons as Users on Users.PersonId=Import.CreateMan
where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.FileName=@FileName and Import.ImportType='0'";
where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.FileName=@FileName and Import.ImportType in ('0','3')";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.designer.cs
Generated
+27
View File
@@ -122,6 +122,15 @@ namespace FineUIPro.Web.HJGL.DataImport
/// </remarks>
protected global::FineUIPro.TextBox txtfilename;
/// <summary>
/// DropImportType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropImportType;
/// <summary>
/// btnSearch 控件。
/// </summary>
@@ -140,6 +149,24 @@ namespace FineUIPro.Web.HJGL.DataImport
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnDelete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator2 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx
+2 -1
View File
@@ -17,7 +17,8 @@
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="DropImportType" Label="文件类别" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
<f:ListItem Text="图纸" Value="0" />
<f:ListItem Text="ISO轴测图" Value="0" />
<f:ListItem Text="管道预制加工图" Value="3" />
</f:DropDownList>
<f:DropDownList ID="DropDesignProfessional" runat="server" Label="专业" ShowRedStar="true" AutoSelectFirstItem="true" LabelAlign="Right" AutoPostBack="true" LabelWidth="140px"></f:DropDownList>
</Items>
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
+22 -5
View File
@@ -45,7 +45,7 @@
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort"
EnableCheckBoxSelect="true" EnableMultiSelect="false" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick"
EnableCheckBoxSelect="true" EnableMultiSelect="true" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="right">
@@ -53,10 +53,17 @@
<f:TextBox runat="server" Label="文件名称" ID="txtfilename" EmptyText="输入查询条件" Width="300px" LabelWidth="90px"
LabelAlign="right">
</f:TextBox>
<f:DropDownList runat="server" ID="DropImportType" Label="文件类别" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
<f:ListItem Text="三维模型" Value="1" />
<f:ListItem Text="属性文件" Value="2" />
</f:DropDownList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" OnClick="btnQuery_Click" Text="查询" Hidden="true">
</f:Button>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" OnClick="btnNew_Click" Hidden="true"
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" Text="新增" OnClick="btnNew_Click" Hidden="true"
EnablePostBack="true" runat="server">
</f:Button>
<f:Button ID="btnDelete" ToolTip="删除" Icon="Delete" Text="删除" OnClick="btnMenuDelete_Click" Hidden="true"
EnablePostBack="true" runat="server">
</f:Button>
</Items>
@@ -70,16 +77,23 @@
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="名称" ColumnID="FileName"
DataField="FileName" SortField="FileName" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="200px">
TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="版本" ColumnID="Version"
DataField="Version" SortField="Version" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="类型" ColumnID="FileType"
<f:RenderField HeaderText="格式" ColumnID="FileType"
DataField="FileType" SortField="FileType" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="50px">
TextAlign="Left" Width="70px">
</f:RenderField>
<f:TemplateField Width="90px" HeaderText="类型" HeaderTextAlign="Center"
TextAlign="Center" SortField="ImportType">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.HJGL_DataImportService.ConvertFileType(Eval("ImportType")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String"
HeaderText="专业" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
@@ -95,6 +109,9 @@
DataField="CreateDate" SortField="CreateDate" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="更新原因" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs
+8
View File
@@ -17,6 +17,7 @@ namespace FineUIPro.Web.HJGL.DataImport
//this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.InitTreeMenu();//加载树
Funs.FineUIPleaseSelect(DropImportType);
GetButtonPower();
}
}
@@ -122,11 +123,13 @@ namespace FineUIPro.Web.HJGL.DataImport
if (tvControlItem.SelectedNodeID == "1" || tvControlItem.SelectedNodeID == "2")
{
this.btnNew.Hidden = true;
this.btnDelete.Hidden = true;
this.btnSearch.Hidden = true;
}
else
{
this.btnNew.Hidden = false;
this.btnDelete.Hidden = false;
this.btnSearch.Hidden = false;
@@ -158,6 +161,11 @@ namespace FineUIPro.Web.HJGL.DataImport
strSql += " AND Import.FileName LIKE @FileName";
listStr.Add(new SqlParameter("@FileName", "%" + this.txtfilename.Text.Trim() + "%"));
}
if (DropImportType.SelectedValue !=Const._Null)
{
strSql += " AND Import.ImportType=@ImportType";
listStr.Add(new SqlParameter("@ImportType", DropImportType.SelectedValue));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
// 2.获取当前分页数据
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.designer.cs
Generated
+27
View File
@@ -122,6 +122,15 @@ namespace FineUIPro.Web.HJGL.DataImport
/// </remarks>
protected global::FineUIPro.TextBox txtfilename;
/// <summary>
/// DropImportType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropImportType;
/// <summary>
/// btnSearch 控件。
/// </summary>
@@ -140,6 +149,24 @@ namespace FineUIPro.Web.HJGL.DataImport
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnDelete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator2 控件。
/// </summary>