gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20260609 焊口切换项目

Browse Source
This commit is contained in:
毕文静
2026-06-09 16:52:52 +08:00
parent 275081ee41
commit 6235fe8f3c
5 changed files with 147 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx
+22 -17
View File
@@ -30,10 +30,15 @@
EnableCollapse="true" Width="300px" Title="焊口信息" ShowBorder="true" Layout="VBox" EnableCollapse="true" Width="300px" Title="焊口信息" ShowBorder="true" Layout="VBox"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft"> ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar6" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="显示项目" Width="250px" LabelWidth="80px" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelAlign="Right"></f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:TextBox ID="txtIsono" runat="server" Label="管线" EmptyText="输入查询条件" AutoPostBack="true" <f:TextBox ID="txtIsono" runat="server" Label="管线" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="Tree_TextChanged" Width="210px" LabelWidth="50px"> OnTextChanged="Tree_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox> </f:TextBox>
<f:HiddenField runat="server" ID="hdPageMax"></f:HiddenField> <f:HiddenField runat="server" ID="hdPageMax"></f:HiddenField>
</Items> </Items>
@@ -74,7 +79,7 @@
</f:Button> </f:Button>
<f:Button ID="btnFileName" Text="文档名" ToolTip="文档名" Icon="TableEdit" runat="server" OnClick="btnFileName_Click"> <f:Button ID="btnFileName" Text="文档名" ToolTip="文档名" Icon="TableEdit" runat="server" OnClick="btnFileName_Click">
</f:Button> </f:Button>
<f:HiddenField ID="hdColumn" runat="server"></f:HiddenField> <f:HiddenField ID="hdColumn" runat="server"></f:HiddenField>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
@@ -118,7 +123,7 @@
<f:RadioItem Text="全部" Value="0" Selected="true" /> <f:RadioItem Text="全部" Value="0" Selected="true" />
<f:RadioItem Text="合格" Value="1" /> <f:RadioItem Text="合格" Value="1" />
</f:RadioButtonList> </f:RadioButtonList>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
@@ -152,7 +157,7 @@
<f:ListItem Text="待返修" Value="待返修" /> <f:ListItem Text="待返修" Value="待返修" />
<f:ListItem Text="待重检" Value="待重检" /> <f:ListItem Text="待重检" Value="待重检" />
</f:DropDownList> </f:DropDownList>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
<Items> <Items>
@@ -161,13 +166,13 @@
EnableColumnLines="true" ClicksToEdit="2" DataIDField="JOT_ID" AllowSorting="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="JOT_ID" AllowSorting="true"
SortField="JOTY_Group,Sort1,Sort2,Sort3,Sort4,Sort5" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" SortField="JOTY_Group,Sort1,Sort2,Sort3,Sort4,Sort5" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" OnRowCommand="Grid1_RowCommand" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" OnRowCommand="Grid1_RowCommand"
EnableTextSelection="True" AutoScroll="true" EnableRowDoubleClickEvent="true" EnableTextSelection="True" AutoScroll="true" EnableRowDoubleClickEvent="true"
OnRowDoubleClick="Grid1_RowDoubleClick" OnRowDataBound="Grid1_RowDataBound" > OnRowDoubleClick="Grid1_RowDoubleClick" OnRowDataBound="Grid1_RowDataBound">
<Columns> <Columns>
<%--<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" <%--<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center"
TextAlign="Center" />--%> TextAlign="Center" />--%>
<f:CheckBoxField ColumnID="ckbIsSelected" Width="80px" RenderAsStaticField="false" TextAlign="Center" <f:CheckBoxField ColumnID="ckbIsSelected" Width="80px" RenderAsStaticField="false" TextAlign="Center"
AutoPostBack="true" CommandName="IsSelected" DataField="JOT_ID" HeaderText="选择删除" HeaderTextAlign="Center" Locked="true"/> AutoPostBack="true" CommandName="IsSelected" DataField="JOT_ID" HeaderText="选择删除" HeaderTextAlign="Center" Locked="true" />
<f:WindowField ColumnID="JOT_JointNo" HeaderTextAlign="Center" TextAlign="Left" Width="100px" <f:WindowField ColumnID="JOT_JointNo" HeaderTextAlign="Center" TextAlign="Left" Width="100px"
WindowID="Window1" HeaderText="焊口代号" DataTextField="JOT_JointNo" DataIFrameUrlFields="JOT_ID" WindowID="Window1" HeaderText="焊口代号" DataTextField="JOT_JointNo" DataIFrameUrlFields="JOT_ID"
DataIFrameUrlFormatString="JointInfoEdit.aspx?JOT_ID={0}" Title="焊口代号" ToolTip="着色表示该焊口已热处理或所在批已封，不能删除和修改！" DataIFrameUrlFormatString="JointInfoEdit.aspx?JOT_ID={0}" Title="焊口代号" ToolTip="着色表示该焊口已热处理或所在批已封，不能删除和修改！"
@@ -301,25 +306,25 @@
<f:RenderField HeaderText="焊接电压" ColumnID="JOT_Voltage" DataField="JOT_Voltage" SortField="JOT_Voltage" <f:RenderField HeaderText="焊接电压" ColumnID="JOT_Voltage" DataField="JOT_Voltage" SortField="JOT_Voltage"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="是否特殊" ColumnID="IsSpecialName" DataField="IsSpecialName" <f:RenderField HeaderText="是否特殊" ColumnID="IsSpecialName" DataField="IsSpecialName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="RT检测结果" ColumnID="RT_States" DataField="RT_States" <f:RenderField HeaderText="RT检测结果" ColumnID="RT_States" DataField="RT_States"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="UT检测结果" ColumnID="UT_States" DataField="UT_States" <f:RenderField HeaderText="UT检测结果" ColumnID="UT_States" DataField="UT_States"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="MT检测结果" ColumnID="MT_States" DataField="MT_States" <f:RenderField HeaderText="MT检测结果" ColumnID="MT_States" DataField="MT_States"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="PT检测结果" ColumnID="PT_States" DataField="PT_States" <f:RenderField HeaderText="PT检测结果" ColumnID="PT_States" DataField="PT_States"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="PAUT检测结果" ColumnID="PAUT_States" DataField="PAUT_States" <f:RenderField HeaderText="PAUT检测结果" ColumnID="PAUT_States" DataField="PAUT_States"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="热处理结果反馈" ColumnID="HotProessResult" DataField="HotProessResult" <f:RenderField HeaderText="热处理结果反馈" ColumnID="HotProessResult" DataField="HotProessResult"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField> </f:RenderField>
</Columns> </Columns>
@@ -371,7 +376,7 @@
Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Width="1024px" Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Width="1024px"
Height="620px"> Height="620px">
</f:Window> </f:Window>
<f:Window ID="Window8" Title="更改日报信息" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window8" Title="更改日报信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window8_Close" Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window8_Close"
Width="600px" Height="300px"> Width="600px" Height="300px">
</f:Window> </f:Window>
@@ -385,8 +390,8 @@
runat="server" Text="编辑" Icon="TableEdit"> runat="server" Text="编辑" Icon="TableEdit">
</f:MenuButton> </f:MenuButton>
<f:MenuButton ID="btnMenuCopy" OnClick="btnMenuCopy_Click" EnablePostBack="true" <f:MenuButton ID="btnMenuCopy" OnClick="btnMenuCopy_Click" EnablePostBack="true"
runat="server" Text="增口" Icon="PageCopy"> runat="server" Text="增口" Icon="PageCopy">
</f:MenuButton> </f:MenuButton>
<f:MenuButton ID="btnMenuUpdate" OnClick="btnMenuUpdate_Click" EnablePostBack="true" <f:MenuButton ID="btnMenuUpdate" OnClick="btnMenuUpdate_Click" EnablePostBack="true"
runat="server" Text="更改日报信息" Icon="TableEdit"> runat="server" Text="更改日报信息" Icon="TableEdit">
</f:MenuButton> </f:MenuButton>
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
+54 -20
View File
@@ -14,6 +14,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
public partial class JointInfo : PageBase public partial class JointInfo : PageBase
{ {
/// <summary>
/// 项目id
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
/// <summary> /// <summary>
/// 定义集合 /// 定义集合
/// </summary> /// </summary>
@@ -30,6 +45,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (!IsPostBack) if (!IsPostBack)
{ {
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.drpProjectId.DataTextField = "ProjectCode";
this.drpProjectId.DataValueField = "ProjectId";
this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUser(this.CurrUser.UserId, "1");
this.drpProjectId.DataBind();
Funs.FineUIPleaseSelect(this.drpProjectId);
this.ProjectId = this.CurrUser.LoginProjectId;
this.drpProjectId.SelectedValue = this.ProjectId;
this.InitTreeMenu();//加载树 this.InitTreeMenu();//加载树
Funs.FineUIPleaseSelect(this.drpRTState); Funs.FineUIPleaseSelect(this.drpRTState);
Funs.FineUIPleaseSelect(this.drpUTState); Funs.FineUIPleaseSelect(this.drpUTState);
@@ -113,8 +137,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
rootNode.NodeID = "0"; rootNode.NodeID = "0";
rootNode.Expanded = true; rootNode.Expanded = true;
this.tvControlItem.Nodes.Add(rootNode); this.tvControlItem.Nodes.Add(rootNode);
// var joints = from x in Funs.DB.HJGL_PW_JointInfo where x.ProjectId == this.CurrUser.LoginProjectId select x; var iso = from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.ProjectId select x;
var iso = from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.CurrUser.LoginProjectId select x;
if (!string.IsNullOrEmpty(this.txtIsono.Text)) if (!string.IsNullOrEmpty(this.txtIsono.Text))
{ {
iso = iso.Where(e => e.ISO_IsoNo.Contains(this.txtIsono.Text.Trim())); iso = iso.Where(e => e.ISO_IsoNo.Contains(this.txtIsono.Text.Trim()));
@@ -202,7 +225,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
,(CASE WHEN IsSpecial=1 THEN '是' ELSE '否' END) AS IsSpecialName ,(CASE WHEN IsSpecial=1 THEN '是' ELSE '否' END) AS IsSpecialName
FROM HJGL_View_JointInfo WHERE ProjectId= @ProjectId"; FROM HJGL_View_JointInfo WHERE ProjectId= @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
if (rbIsHj.SelectedValue == "0") if (rbIsHj.SelectedValue == "0")
{ {
strSql += " AND ISO_ID =@ISO_ID"; strSql += " AND ISO_ID =@ISO_ID";
@@ -350,7 +373,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param> /// <param name="e"></param>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{ {
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify)) if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
{ {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointInfoEdit.aspx?JOT_ID={0}", Grid1.SelectedRowID, "编辑 - "))); PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointInfoEdit.aspx?JOT_ID={0}", Grid1.SelectedRowID, "编辑 - ")));
} }
@@ -367,12 +390,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param> /// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e) protected void btnNew_Click(object sender, EventArgs e)
{ {
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnAdd)) if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnAdd))
{ {
var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(tvControlItem.SelectedNodeID); var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(tvControlItem.SelectedNodeID);
if (isoInfo != null) if (isoInfo != null)
{ {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointInfoEdit.aspx?ISO_ID={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointInfoEdit.aspx?ISO_ID={0}&&projectId={1}", this.tvControlItem.SelectedNodeID,this.ProjectId, "新增 - ")));
} }
else else
{ {
@@ -392,13 +415,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param> /// <param name="e"></param>
protected void btnBatchAdd_Click(object sender, EventArgs e) protected void btnBatchAdd_Click(object sender, EventArgs e)
{ {
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnAdd)) if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnAdd))
{ {
var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(tvControlItem.SelectedNodeID); var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(tvControlItem.SelectedNodeID);
if (isoInfo != null) if (isoInfo != null)
{ {
this.hdPageMax.Text = "1"; this.hdPageMax.Text = "1";
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointInfoBatchEdit.aspx?ISO_ID={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointInfoBatchEdit.aspx?ISO_ID={0}&&projectId={1}", this.tvControlItem.SelectedNodeID,this.ProjectId, "新增 - ")));
} }
else else
{ {
@@ -418,7 +441,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param> /// <param name="e"></param>
protected void btnMenuEdit_Click(object sender, EventArgs e) protected void btnMenuEdit_Click(object sender, EventArgs e)
{ {
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify)) if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
{ {
if (Grid1.SelectedRowIndexArray.Length == 0) if (Grid1.SelectedRowIndexArray.Length == 0)
{ {
@@ -435,7 +458,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void btnMenuUpdate_Click(object sender, EventArgs e) protected void btnMenuUpdate_Click(object sender, EventArgs e)
{ {
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify)) if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
{ {
if (Grid1.SelectedRowIndexArray.Length == 0) if (Grid1.SelectedRowIndexArray.Length == 0)
{ {
@@ -486,7 +509,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param> /// <param name="e"></param>
protected void btnMenuDelete_Click(object sender, EventArgs e) protected void btnMenuDelete_Click(object sender, EventArgs e)
{ {
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnDelete)) if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnDelete))
{ {
if (Grid1.SelectedRowIndexArray.Length == 0) if (Grid1.SelectedRowIndexArray.Length == 0)
{ {
@@ -526,7 +549,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
BLL.HJGL_BO_BatchDetailService.DeleteBatchDetail(rowID); //删除批明细 BLL.HJGL_BO_BatchDetailService.DeleteBatchDetail(rowID); //删除批明细
BLL.HJGL_PW_JointInfoService.DeleteJointInfo(rowID); BLL.HJGL_PW_JointInfoService.DeleteJointInfo(rowID);
var jot = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(rowID); var jot = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(rowID);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除焊口[" + jot.JOT_JointNo + "]"); BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.ProjectId, this.CurrUser.UserId, "删除焊口[" + jot.JOT_JointNo + "]");
} }
else else
{ {
@@ -596,8 +619,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Directory.CreateDirectory(filePath); Directory.CreateDirectory(filePath);
} }
string ReportFileName = filePath + "out.xlsx"; string ReportFileName = filePath + "out.xlsx";
var project = Base_ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); var project = Base_ProjectService.GetProjectByProjectId(this.ProjectId);
var isoList = from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.CurrUser.LoginProjectId select x; var isoList = from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.ProjectId select x;
if (isoList != null && isoList.Count() > 0) if (isoList != null && isoList.Count() > 0)
{ {
int rowIndex = 0; int rowIndex = 0;
@@ -878,7 +901,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (q != null) if (q != null)
{ {
string projectName = string.Empty; string projectName = string.Empty;
var project = BLL.Base_ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); var project = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId);
if (project != null) if (project != null)
{ {
projectName = project.ProjectName; projectName = project.ProjectName;
@@ -1074,6 +1097,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.InitTreeMenu(); this.InitTreeMenu();
this.BindGrid(); this.BindGrid();
} }
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.drpProjectId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpProjectId.SelectedValue))
{
this.ProjectId = this.drpProjectId.SelectedValue;
InitTreeMenu();
BindGrid();
}
}
#endregion #endregion
#region 判断是否可删除 #region 判断是否可删除
@@ -1130,7 +1163,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var iso = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(this.tvControlItem.SelectedNodeID); var iso = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(this.tvControlItem.SelectedNodeID);
if (iso != null) if (iso != null)
{ {
var set = BLL.Project_SysSetService.GetSysSetBySetId("4", this.CurrUser.LoginProjectId); var set = BLL.Project_SysSetService.GetSysSetBySetId("4", this.ProjectId);
if (set != null && set.IsAuto == true) ///是PDMS格式 if (set != null && set.IsAuto == true) ///是PDMS格式
{ {
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("JointInfoOut2.aspx?ISO_ID={0}", this.tvControlItem.SelectedNodeID, "导出 - "))); PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("JointInfoOut2.aspx?ISO_ID={0}", this.tvControlItem.SelectedNodeID, "导出 - ")));
@@ -1275,7 +1308,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </summary> /// </summary>
private void CopyData() private void CopyData()
{ {
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify)) if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
{ {
if (Grid1.SelectedRowIndexArray.Length == 0) if (Grid1.SelectedRowIndexArray.Length == 0)
{ {
@@ -1328,7 +1361,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param> /// <param name="e"></param>
protected void btnBatchDel_Click(object sender, EventArgs e) protected void btnBatchDel_Click(object sender, EventArgs e)
{ {
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnDelete)) if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnDelete))
{ {
// 第一次点击：只打开复选框 // 第一次点击：只打开复选框
if (this.Grid1.Columns[0].Hidden) if (this.Grid1.Columns[0].Hidden)
@@ -1373,7 +1406,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
db.SubmitChanges(); db.SubmitChanges();
BLL.HJGL_BO_BatchDetailService.DeleteBatchDetail(rowID); //删除批明细 BLL.HJGL_BO_BatchDetailService.DeleteBatchDetail(rowID); //删除批明细
BLL.HJGL_PW_JointInfoService.DeleteJointInfo(rowID); BLL.HJGL_PW_JointInfoService.DeleteJointInfo(rowID);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除焊口信息"); BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.ProjectId, this.CurrUser.UserId, "删除焊口信息");
} }
else else
{ {
@@ -1452,7 +1485,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param> /// <param name="e"></param>
protected void btnBatchModify_Click(object sender, EventArgs e) protected void btnBatchModify_Click(object sender, EventArgs e)
{ {
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnModify)) if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnModify))
{ {
var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(tvControlItem.SelectedNodeID); var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(tvControlItem.SelectedNodeID);
if (isoInfo != null) if (isoInfo != null)
@@ -1469,5 +1502,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
} }
} }
} }
} }
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.designer.cs
Generated
+18
View File
@@ -59,6 +59,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks> /// </remarks>
protected global::FineUIPro.Panel panelLeftRegion; protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar6;
/// <summary>
/// drpProjectId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectId;
/// <summary> /// <summary>
/// Toolbar1 控件。 /// Toolbar1 控件。
/// </summary> /// </summary>
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.cs
+22 -6
View File
@@ -7,6 +7,21 @@
public partial class JointInfoBatchEdit : PageBase public partial class JointInfoBatchEdit : PageBase
{ {
#region 定义项 #region 定义项
/// <summary>
/// 项目id
/// </summary>
private string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
/// <summary> /// <summary>
/// 管线主键 /// 管线主键
/// </summary> /// </summary>
@@ -34,6 +49,7 @@
if (!IsPostBack) if (!IsPostBack)
{ {
this.ISO_ID = Request.Params["ISO_ID"]; this.ISO_ID = Request.Params["ISO_ID"];
this.ProjectId = Request.Params["projectId"];
///初始化下拉框 ///初始化下拉框
this.LoadDropDownList(); this.LoadDropDownList();
///初始化显示信息 ///初始化显示信息
@@ -100,7 +116,7 @@
this.drpInstallationId.DataTextField = "Text"; this.drpInstallationId.DataTextField = "Text";
this.drpInstallationId.DataValueField = "Value"; this.drpInstallationId.DataValueField = "Value";
this.drpInstallationId.DataSource = BLL.Project_InstallationService.GetInstallationList(this.CurrUser.LoginProjectId); this.drpInstallationId.DataSource = BLL.Project_InstallationService.GetInstallationList(this.ProjectId);
this.drpInstallationId.DataBind(); this.drpInstallationId.DataBind();
Funs.FineUIPleaseSelect(this.drpInstallationId); Funs.FineUIPleaseSelect(this.drpInstallationId);
@@ -233,7 +249,7 @@
/// <param name="e"></param> /// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e) protected void btnSave_Click(object sender, EventArgs e)
{ {
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnSave)) if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnSave))
{ {
if (this.drpInstallationId.SelectedValue == BLL.Const._Null) if (this.drpInstallationId.SelectedValue == BLL.Const._Null)
{ {
@@ -284,7 +300,7 @@
} }
Model.HJGL_PW_JointInfo newJointInfo = new Model.HJGL_PW_JointInfo(); Model.HJGL_PW_JointInfo newJointInfo = new Model.HJGL_PW_JointInfo();
newJointInfo.ProjectId = this.CurrUser.LoginProjectId; newJointInfo.ProjectId = this.ProjectId;
newJointInfo.ISO_ID = this.ISO_ID; newJointInfo.ISO_ID = this.ISO_ID;
newJointInfo.JOT_JointNo = this.txtJointNo.Text.Trim(); newJointInfo.JOT_JointNo = this.txtJointNo.Text.Trim();
newJointInfo.JOT_JointDesc = this.txtJointDesc.Text.Trim(); newJointInfo.JOT_JointDesc = this.txtJointDesc.Text.Trim();
@@ -409,7 +425,7 @@
// newJointInfo.JOT_JointNo = this.txtJointNo.Text.Trim() + Convert.ToString(i); // newJointInfo.JOT_JointNo = this.txtJointNo.Text.Trim() + Convert.ToString(i);
//} //}
newJointInfo.JOT_JointNo = this.txtJointNo.Text.Trim() + Convert.ToString(i); newJointInfo.JOT_JointNo = this.txtJointNo.Text.Trim() + Convert.ToString(i);
if (!BLL.HJGL_PW_JointInfoService.IsExistJointInfoCode(this.CurrUser.LoginProjectId, newJointInfo.JOT_JointNo, this.ISO_ID, null)) if (!BLL.HJGL_PW_JointInfoService.IsExistJointInfoCode(this.ProjectId, newJointInfo.JOT_JointNo, this.ISO_ID, null))
{ {
try try
{ {
@@ -445,7 +461,7 @@
THEN ISNULL(TRY_CAST(SUBSTRING(JOT_JointNo,2,len(JOT_JointNo)-1) as int),0) ELSE 0 END) THEN ISNULL(TRY_CAST(SUBSTRING(JOT_JointNo,2,len(JOT_JointNo)-1) as int),0) ELSE 0 END)
WHERE JOT_ID='" + newJointInfo.JOT_ID + "'"; WHERE JOT_ID='" + newJointInfo.JOT_ID + "'";
SQLHelper.ExecutSql(strSort); SQLHelper.ExecutSql(strSort);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "添加焊口信息！"); BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.ProjectId, this.CurrUser.UserId, "添加焊口信息！");
} }
catch catch
{ {
@@ -475,7 +491,7 @@
{ {
if (!string.IsNullOrEmpty(this.txtJointNoS.Text.Trim()) && !string.IsNullOrEmpty(this.ISO_ID)) if (!string.IsNullOrEmpty(this.txtJointNoS.Text.Trim()) && !string.IsNullOrEmpty(this.ISO_ID))
{ {
var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJointNoAndIsoId(this.txtJointNoS.Text.Trim(), this.ISO_ID, this.CurrUser.LoginProjectId); var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJointNoAndIsoId(this.txtJointNoS.Text.Trim(), this.ISO_ID, this.ProjectId);
if (jointInfo != null) if (jointInfo != null)
{ {
//this.txtJointNo.Text = jointInfo.JOT_JointNo; //this.txtJointNo.Text = jointInfo.JOT_JointNo;
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
+31 -7
View File
@@ -10,6 +10,21 @@
public partial class JointInfoEdit : PageBase public partial class JointInfoEdit : PageBase
{ {
#region 定义项 #region 定义项
/// <summary>
/// 项目id
/// </summary>
private string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
/// <summary> /// <summary>
/// 管线主键 /// 管线主键
/// </summary> /// </summary>
@@ -52,11 +67,13 @@
{ {
this.JOT_ID = Request.Params["JOT_ID"]; this.JOT_ID = Request.Params["JOT_ID"];
this.ISO_ID = Request.Params["ISO_ID"]; this.ISO_ID = Request.Params["ISO_ID"];
this.ProjectId = Request.Params["projectId"];
///初始化下拉框 ///初始化下拉框
this.LoadDropDownList(); this.LoadDropDownList();
var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(this.JOT_ID); var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(this.JOT_ID);
if (jointInfo != null) if (jointInfo != null)
{ {
this.ProjectId = jointInfo.ProjectId;
this.ISO_ID = jointInfo.ISO_ID; this.ISO_ID = jointInfo.ISO_ID;
// 初始化显示信息 // 初始化显示信息
this.LoadShowInfo(jointInfo); this.LoadShowInfo(jointInfo);
@@ -172,7 +189,7 @@
this.drpInstallationId.DataTextField = "Text"; this.drpInstallationId.DataTextField = "Text";
this.drpInstallationId.DataValueField = "Value"; this.drpInstallationId.DataValueField = "Value";
this.drpInstallationId.DataSource = BLL.Project_InstallationService.GetInstallationList(this.CurrUser.LoginProjectId); this.drpInstallationId.DataSource = BLL.Project_InstallationService.GetInstallationList(this.ProjectId);
this.drpInstallationId.DataBind(); this.drpInstallationId.DataBind();
Funs.FineUIPleaseSelect(this.drpInstallationId); Funs.FineUIPleaseSelect(this.drpInstallationId);
@@ -378,6 +395,7 @@
{ {
if (jointInfo != null) if (jointInfo != null)
{ {
this.ProjectId = jointInfo.ProjectId;
this.txtJointNo.Text = jointInfo.JOT_JointNo; this.txtJointNo.Text = jointInfo.JOT_JointNo;
this.txtJointDesc.Text = jointInfo.JOT_JointDesc; this.txtJointDesc.Text = jointInfo.JOT_JointDesc;
if (!string.IsNullOrEmpty(jointInfo.DReportID)) if (!string.IsNullOrEmpty(jointInfo.DReportID))
@@ -490,6 +508,12 @@
this.txtRemark.Text = jointInfo.JOT_Remark; this.txtRemark.Text = jointInfo.JOT_Remark;
if (!string.IsNullOrEmpty(jointInfo.InstallationId)) if (!string.IsNullOrEmpty(jointInfo.InstallationId))
{ {
this.drpInstallationId.Items.Clear();
this.drpInstallationId.DataTextField = "Text";
this.drpInstallationId.DataValueField = "Value";
this.drpInstallationId.DataSource = BLL.Project_InstallationService.GetInstallationList(this.ProjectId);
this.drpInstallationId.DataBind();
Funs.FineUIPleaseSelect(this.drpInstallationId);
this.drpInstallationId.SelectedValue = jointInfo.InstallationId; this.drpInstallationId.SelectedValue = jointInfo.InstallationId;
} }
if (!string.IsNullOrEmpty(jointInfo.NDTR_ID)) if (!string.IsNullOrEmpty(jointInfo.NDTR_ID))
@@ -601,16 +625,16 @@
/// <param name="e"></param> /// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e) protected void btnSave_Click(object sender, EventArgs e)
{ {
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnSave)) if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnSave))
{ {
if (BLL.HJGL_PW_JointInfoService.IsExistJointInfoCode(this.CurrUser.LoginProjectId, this.txtJointNo.Text.Trim(), this.ISO_ID, this.JOT_ID)) if (BLL.HJGL_PW_JointInfoService.IsExistJointInfoCode(this.ProjectId, this.txtJointNo.Text.Trim(), this.ISO_ID, this.JOT_ID))
{ {
Alert.ShowInTop("该管线焊口号已存在！", MessageBoxIcon.Warning); Alert.ShowInTop("该管线焊口号已存在！", MessageBoxIcon.Warning);
return; return;
} }
Model.HJGL_PW_JointInfo newJointInfo = new Model.HJGL_PW_JointInfo(); Model.HJGL_PW_JointInfo newJointInfo = new Model.HJGL_PW_JointInfo();
newJointInfo.ProjectId = this.CurrUser.LoginProjectId; newJointInfo.ProjectId =this.ProjectId;
newJointInfo.ISO_ID = this.ISO_ID; newJointInfo.ISO_ID = this.ISO_ID;
newJointInfo.JOT_JointNo = this.txtJointNo.Text.Trim(); newJointInfo.JOT_JointNo = this.txtJointNo.Text.Trim();
newJointInfo.JOT_JointDesc = this.txtJointDesc.Text.Trim(); newJointInfo.JOT_JointDesc = this.txtJointDesc.Text.Trim();
@@ -769,7 +793,7 @@
newJointInfo.JOT_ID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_JointInfo)); newJointInfo.JOT_ID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_JointInfo));
this.JOT_ID = newJointInfo.JOT_ID; this.JOT_ID = newJointInfo.JOT_ID;
BLL.HJGL_PW_JointInfoService.AddJointInfo(newJointInfo); BLL.HJGL_PW_JointInfoService.AddJointInfo(newJointInfo);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "添加[" + this.txtISONO.Text + "]管线下，焊口[" + newJointInfo.JOT_JointNo + "]！"); BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.ProjectId, this.CurrUser.UserId, "添加[" + this.txtISONO.Text + "]管线下，焊口[" + newJointInfo.JOT_JointNo + "]！");
} }
catch catch
{ {
@@ -822,7 +846,7 @@
{ {
BLL.HJGL_PW_JointInfoService.UpdateJointNoAddG(this.JOT_ID, this.ddlJointAttribute.SelectedValue, Const.Add); BLL.HJGL_PW_JointInfoService.UpdateJointNoAddG(this.JOT_ID, this.ddlJointAttribute.SelectedValue, Const.Add);
} }
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "修改[" + this.txtISONO.Text + "]管线下，焊口[" + newJointInfo.JOT_JointNo + "]！"); BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.ProjectId, this.CurrUser.UserId, "修改[" + this.txtISONO.Text + "]管线下，焊口[" + newJointInfo.JOT_JointNo + "]！");
} }
// 更新排序字段 // 更新排序字段
string strSort = @"UPDATE dbo.HJGL_PW_JointInfo SET string strSort = @"UPDATE dbo.HJGL_PW_JointInfo SET
@@ -1083,7 +1107,7 @@
{ {
if (!string.IsNullOrEmpty(this.txtJointNoS.Text.Trim()) && !string.IsNullOrEmpty(this.ISO_ID)) if (!string.IsNullOrEmpty(this.txtJointNoS.Text.Trim()) && !string.IsNullOrEmpty(this.ISO_ID))
{ {
var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJointNoAndIsoId(this.txtJointNoS.Text.Trim(), this.ISO_ID, this.CurrUser.LoginProjectId); var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJointNoAndIsoId(this.txtJointNoS.Text.Trim(), this.ISO_ID, this.ProjectId);
if (jointInfo != null) if (jointInfo != null)
{ {
//this.txtJointNo.Text = jointInfo.JOT_JointNo; //this.txtJointNo.Text = jointInfo.JOT_JointNo;