diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index 4bef14a..b4c6b09 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 8d94192..1c06463 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/BLL/Common/Const.cs b/HJGL/BLL/Common/Const.cs index 35bb526..8f3f0c9 100644 --- a/HJGL/BLL/Common/Const.cs +++ b/HJGL/BLL/Common/Const.cs @@ -527,12 +527,21 @@ namespace BLL #endregion + + #region PMI 处理 + + public const string PMIDelegationId = "A6FB44C3-0920-4F77-862F-D814FD5E5D23"; + #endregion + + #region 热处理/硬度委托 /// /// 热处理委托及数据录入 /// public const string HotProessTrustMenuId = "90579BE7-E38C-4CD2-A3BC-755169FF3BB2"; + + /// /// 热处理反馈及硬度委托 /// diff --git a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs index d964084..7dd4fd5 100644 --- a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs +++ b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs @@ -145,6 +145,7 @@ namespace BLL newWeldJoint.PrepareTemp = weldJoint.PrepareTemp; newWeldJoint.Electricity = weldJoint.Electricity; newWeldJoint.Voltage = weldJoint.Voltage; + newWeldJoint.IsPMI= weldJoint.IsPMI; newWeldJoint.TestPackageNo = weldJoint.TestPackageNo; newWeldJoint.WeldingDailyCode = weldJoint.WeldingDailyCode; newWeldJoint.BackingWelderId = weldJoint.BackingWelderId; diff --git a/HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql b/HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql index f90a390..0fe3dc5 100644 --- a/HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql +++ b/HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql @@ -1,4 +1,6 @@ -create table PMI_Detections +use HJGLDB_ZJBSF +go +create table PMI_Delegation ( Id nvarchar(50) not null primary key, DelegationNo nvarchar(50) not null, @@ -10,7 +12,7 @@ create table PMI_Detections CreatedTime datetime default getdate() ) go -create table PMI_DetectionDetails +create table PMI_DelegationDetails ( Id nvarchar(50) not null primary key, PMIId nvarchar(50) not null, @@ -21,8 +23,10 @@ create table PMI_DetectionDetails ) go - - +-- ߺ Ƿ PMI +alter table Pipeline_WeldJoint add isPMI bit null +update Pipeline_WeldJoint set isPMI=0 +-- PMIίв˵ insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI','PMI detection management','',21,0,3,NUll,1) insert into Sys_Menu values(NEWID(),'PMIί','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) insert into Sys_Menu values(NEWID(),'PMI¼','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) \ No newline at end of file diff --git a/HJGL/DataBase/版本日志/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql b/HJGL/DataBase/版本日志/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql new file mode 100644 index 0000000..97535ae --- /dev/null +++ b/HJGL/DataBase/版本日志/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql @@ -0,0 +1,117 @@ +USE [HJGLDB_ZJBSF] +GO + +/****** Object: View [dbo].[View_Pipeline_WeldJoint] Script Date: 2024-5-11 14:44:42 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + +ALTER VIEW [dbo].[View_Pipeline_WeldJoint] +AS +/************Ϣͼ*****************/ +SELECT WeldJoint.WeldJointId, +WeldJoint.ProjectId, +WeldJoint.PipelineId, +WeldJoint.WeldJointCode, +dbo.Fun_GetParseInt(WeldJoint.WeldJointCode) AS ConvertWeldJoint, +WeldJoint.WeldTypeId, +WeldJoint.Material1Id, +WeldJoint.Material2Id, +WeldJoint.ANSISCH, +WeldJoint.Thickness, +WeldJoint.Dia, +WeldJoint.Size, +WeldJoint.JointAttribute, +WeldJoint.JointArea, +WeldJoint.WeldingMethodId, +WeldJoint.IsHotProess, +WeldJoint.WeldingLocationId, +WeldJoint.WeldMatId, +WeldJoint.WeldSilkId, +WeldJoint.GrooveTypeId, +WeldJoint.PipeSegment, +WeldJoint.PipeAssembly1Id, +WeldJoint.PipeAssembly2Id, +WeldJoint.PipeAssemblyCount, +WeldJoint.HeartNo1, +WeldJoint.HeartNo2, +WeldJoint.LastTemp, +WeldJoint.CellTemp, +WeldJoint.PrepareTemp, +WeldJoint.Electricity, +WeldJoint.SystemNumber, +WeldJoint.Remark, +WeldJoint.DoneDin, +WeldJoint.Voltage, +WeldJoint.TestPackageNo, +WeldJoint.WeldingDailyCode, +WeldJoint.WeldingDailyId, +WeldJoint.BackingWelderId, +WeldJoint.CoverWelderId, +WeldJoint.PipingClassId, +WeldJoint.Specification, +WeldJoint.CancelResult, +Project.ProjectCode, +Project.ProjectName, +Pipeline.PipelineCode, +Pipeline.InstallationId, +Pipeline.UnitId, +Pipeline.SingleNumber, +Pipeline.WorkAreaId, +WeldType.WeldTypeCode, +Material1.MaterialCode AS Material1Code, +Material2.MaterialCode AS Material2Code, +WeldingMethod.WeldingMethodCode, +WeldingLocation.WeldingLocationCode, +WeldMat.ConsumablesCode AS WeldMatCode, +--WeldSilk.ConsumablesCode AS WeldSilkCode, +'' AS WeldSilkCode, +GrooveType.GrooveTypeCode, +CASE WHEN WeldJoint.WeldingDailyId IS NULL THEN '' ELSE '' END AS Is_hjName, +CASE WHEN WeldJoint.IsHotProess=1 THEN '' ELSE '' END AS IsHotProessStr, +Components1.ComponentsCode AS ComponentsCode1, +Components2.ComponentsCode AS ComponentsCode2, +BackingWelder.WelderCode AS BackingWelderCode, +BackingWelder.WelderName AS BackingWelderName, +CoverWelder.WelderCode AS CoverWelderCode, +CoverWelder.WelderName AS CoverWelderName, +(CASE WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL + THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode + ELSE (ISNULL(CoverWelder.WelderCode,'') + ISNULL(BackingWelder.WelderCode,'')) END) AS WelderCode, -- + (CASE WHEN Material1.MaterialCode IS NOT NULL AND Material2.MaterialCode IS NOT NULL + THEN Material1.MaterialCode + '/' + Material2.MaterialCode + ELSE (ISNULL(Material1.MaterialCode,'') + ISNULL(Material2.MaterialCode,'')) END) AS MaterialCode, -- +pipingClass.PipingClassCode, +CONVERT(VARCHAR(100), WeldingDaily.WeldingDate, 23) AS WeldingDate, +WeldJoint.IsCancel, +WeldJoint.IsPMI, +WeldJoint.IsGoldJoint, +WeldJoint.WPQId,wps.WPQCode, +WeldJoint.DetectionType, +WeldJoint.PageNum +FROM Pipeline_WeldJoint AS WeldJoint +LEFT JOIN Base_Project AS Project ON Project.ProjectId=WeldJoint.ProjectId +LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId = WeldJoint.PipelineId +LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId +LEFT JOIN Base_Material AS Material1 ON Material1.MaterialId = WeldJoint.Material1Id +LEFT JOIN Base_Material AS Material2 ON Material2.MaterialId = WeldJoint.Material2Id +LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId=WeldJoint.WeldingMethodId +LEFT JOIN Base_WeldingLocation AS WeldingLocation ON WeldingLocation.WeldingLocationId=WeldJoint.WeldingLocationId +LEFT JOIN Base_Consumables AS WeldMat ON WeldMat.ConsumablesId=WeldJoint.WeldMatId +--LEFT JOIN Base_Consumables AS WeldSilk ON WeldSilk.ConsumablesId=WeldJoint.WeldSilkId +LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=WeldJoint.GrooveTypeId +LEFT JOIN Base_Components AS Components1 ON Components1.ComponentsId = WeldJoint.PipeAssembly1Id +LEFT JOIN Base_Components AS Components2 ON Components2.ComponentsId = WeldJoint.PipeAssembly2Id +LEFT JOIN Welder_Welder AS BackingWelder ON BackingWelder.WelderId=WeldJoint.BackingWelderId +LEFT JOIN Welder_Welder AS CoverWelder ON CoverWelder.WelderId=WeldJoint.CoverWelderId +LEFT JOIN Pipeline_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId +LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId +LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId=WeldJoint.WPQId + + +GO + + diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs index 753f470..8a3af65 100644 --- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs +++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs @@ -1221,6 +1221,15 @@ namespace Resources { } } + /// + /// 查找类似 检测日期 的本地化字符串。 + /// + internal static string DelegationDate { + get { + return ResourceManager.GetString("DelegationDate", resourceCulture); + } + } + /// /// 查找类似 删除 的本地化字符串。 /// @@ -1419,6 +1428,24 @@ namespace Resources { } } + /// + /// 查找类似 检测方法 的本地化字符串。 + /// + internal static string DetectionMethod { + get { + return ResourceManager.GetString("DetectionMethod", resourceCulture); + } + } + + /// + /// 查找类似 检测标准 的本地化字符串。 + /// + internal static string DetectionStandard { + get { + return ResourceManager.GetString("DetectionStandard", resourceCulture); + } + } + /// /// 查找类似 寸径 的本地化字符串。 /// diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx index 7c175f6..26be42b 100644 --- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx +++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx @@ -2106,4 +2106,13 @@ 首页 + + 检测日期 + + + 检测方法 + + + 检测标准 + \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index 26f5cad..c72257e 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -395,6 +395,7 @@ + @@ -4445,6 +4446,13 @@ DataInEdit.aspx + + PMIDelegation.aspx + ASPXCodeBehind + + + PMIDelegation.aspx + AItemEndCheck.aspx ASPXCodeBehind @@ -4856,7 +4864,6 @@ - diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 046bc87..f9b03fb 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -11,5 +11,37 @@ - + + + + + Login.aspx + SpecificPage + True + False + False + False + + + + + + + + + True + False + True + True + 0 + / + http://localhost:57613/ + False + False + + + + + + \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx new file mode 100644 index 0000000..ef73095 --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx @@ -0,0 +1,195 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PMIDelegation.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.PMI.PMIDelegation" %> + + + + + 热处理委托及数据录入 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs new file mode 100644 index 0000000..11562bd --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs @@ -0,0 +1,406 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.WeldingProcess.PMI +{ + public partial class PMIDelegation : PageBase + { + #region 定义项 + /// + /// PMI委托主键 + /// + public string PMIDelegationId + { + get + { + return (string)ViewState["PMIDelegationId"]; + } + set + { + ViewState["PMIDelegationId"] = value; + } + } + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + this.PMIDelegationId = string.Empty; + this.InitTreeMenu();//加载树 + } + } + #endregion + + #region 加载树 + /// + /// 加载树 + /// + private void InitTreeMenu() + { + string projectName = string.Empty; + var pro = BLL.Base_ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + if (pro != null) + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "[" + pro.ProjectCode + "]" + pro.ProjectName; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + + List trustLists = new List(); ///PMI委托单 + + if (!string.IsNullOrEmpty(this.txtSearchNo.Text.Trim())) + { + trustLists = (from x in Funs.DB.PMI_Delegation where x.ProjectId == CurrUser.LoginProjectId && x.DelegationNo.Contains(this.txtSearchNo.Text.Trim()) orderby x.DelegationNo select x).ToList(); + } + else + { + trustLists = (from x in Funs.DB.PMI_Delegation where x.ProjectId == CurrUser.LoginProjectId orderby x.DelegationNo select x).ToList(); + } + this.BindNodes(rootNode, trustLists); + } + } + #endregion + + #region 绑定树节点 + /// + /// 绑定树节点 + /// + /// + private void BindNodes(TreeNode node, List trustList) + { + foreach (var item in trustList) + { + TreeNode newNode = new TreeNode(); + newNode.Text = item.DelegationNo; + newNode.NodeID = item.Id; + newNode.ToolTip = item.DelegationNo; + newNode.CommandName = Resources.Lan.RequestSheetNumber; + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); + } + } + #endregion + + #region 点击TreeView + /// + /// 点击TreeView + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + if (this.tvControlItem.SelectedNodeID != "0") + { + this.PMIDelegationId = tvControlItem.SelectedNodeID; + this.BindGrid(); + } + } + #endregion + + #region DropDownList下拉选择事件 + /// + /// 项目下拉选择事件 + /// + /// + /// + protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) + { + this.InitTreeMenu(); + } + #endregion + + #region 数据绑定 + /// + /// 数据绑定 + /// + private void BindGrid() + { + string strSql = string.Empty; + List listStr = new List(); + this.SetTextTemp(); + this.PageInfoLoad(); ///页面输入提交信息 + + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + var result = Funs.DB.PMI_Delegation.FirstOrDefault(t=>t.Id==this.tvControlItem.SelectedNodeID); + if (result != null) + { + this.PMIDelegationId = result.Id; + strSql = @"SELECT * " + + @" FROM dbo.View_HotProess_TrustItem AS Trust" + + @" WHERE Trust.ProjectId= @ProjectId AND Trust.HotProessTrustId=@HotProessTrustId "; + + listStr.Add(new SqlParameter("@ProjectId", result != null ? result.ProjectId : this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@HotProessTrustId", this.PMIDelegationId)); + + if (!string.IsNullOrEmpty(this.txtIsoNo.Text.Trim())) + { + strSql += @" and Trust.PipelineCode like '%'+@PipelineCode+'%' "; + listStr.Add(new SqlParameter("@PipelineCode", this.txtIsoNo.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(); + } + } + } + + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + + #region 加载页面输入提交信息 + /// + /// 加载页面输入提交信息 + /// + private void PageInfoLoad() + { + var trust =Funs.DB.PMI_Delegation.FirstOrDefault(t=>t.Id==this.PMIDelegationId); + if (trust != null) + { + this.txtDelegationNo.Text = trust.DelegationNo; + if (trust.DelegationDate.HasValue) + { + this.txtDelegationDate.Text = string.Format("{0:yyyy-MM-dd}", trust.DelegationDate); + } + if (!string.IsNullOrEmpty(trust.InstallationId)) + { + this.txtInstallationName.Text = BLL.Project_InstallationService.GetProject_InstallationNameByInstallationId(trust.InstallationId); + } + if (!string.IsNullOrEmpty(trust.UnitId)) + { + this.txtUnitName.Text = BLL.Base_UnitService.GetUnitNameByUnitId(trust.UnitId); + } + this.txtDetectionMethod.Text = "PMI光谱分析"; + this.txtDetectionStandard.Text = trust.DetectionStandard; + if (!string.IsNullOrEmpty(trust.Tabler)) + { + this.txtTabler.Text = BLL.Sys_UserService.GetUserNameByUserId(trust.Tabler); + } + this.txtRemark.Text = trust.Remark; + } + } + #endregion + + #region 清空文本 + /// + /// 清空文本 + /// + private void SetTextTemp() + { + this.txtDelegationNo.Text = string.Empty; + this.txtDelegationDate.Text = string.Empty; + this.txtInstallationName.Text = string.Empty; + this.txtUnitName.Text = string.Empty; + this.txtDetectionMethod.Text = string.Empty; + this.txtDetectionStandard.Text = string.Empty; + this.txtTabler.Text = string.Empty; + this.txtRemark.Text = string.Empty; + } + #endregion + #endregion + + #region 分页排序 + #region 页索引改变事件 + /// + /// 页索引改变事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + #endregion + + #region 排序 + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + #endregion + + #region 分页选择下拉改变事件 + /// + /// 分页选择下拉改变事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + #endregion + + #region PMI委托 维护事件 + /// + /// 增加PMI委托 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnAdd)) + { + this.SetTextTemp(); + string window = String.Format("PMIDelegationEdit.aspx?PMIDelegationId={0}", string.Empty, "新增 - "); + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.PMIDelegationId) + + Window1.GetShowReference(window)); + } + else + { + ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + } + } + + #region 编辑PMI委托 + /// + /// 编辑PMI委托 + /// + /// + /// + protected void btnEdit_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HotProessTrustMenuId, Const.BtnSave)) + { + var trustManage = Funs.DB.PMI_Delegation.FirstOrDefault (t=>t.Id==this.PMIDelegationId); + if (trustManage != null) + { + string window = String.Format("HotProessTrustEdit.aspx?HotProessTrustId={0}", this.PMIDelegationId, "编辑 - "); + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.PMIDelegationId) + + Window1.GetShowReference(window)); + } + else + { + ShowNotify(Resources.Lan.PleaseSelectModifyHotProessTrust, MessageBoxIcon.Warning); + } + } + else + { + ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + } + } + #endregion + + #region 删除PMI委托 + /// + /// 删除PMI委托 + /// + /// + /// + protected void btnDelete_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnDelete)) + { + var trustManage =Funs.DB.PMI_Delegation.FirstOrDefault (t=>t.Id==this.PMIDelegationId); + if (trustManage != null) + { + //删除主表数据 + Funs.DB.PMI_Delegation.DeleteOnSubmit(trustManage); + //删除 明细表 + + Funs.DB.SubmitChanges(); + Alert.ShowInTop(Resources.Lan.DeletedSuccessfully, MessageBoxIcon.Success); + this.InitTreeMenu(); + SetTextTemp(); + this.Grid1.DataSource = null; + this.Grid1.DataBind(); + } + else + { + ShowNotify(Resources.Lan.PleaseSelectDeleteHotProessTrust, MessageBoxIcon.Warning); + } + } + else + { + ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + return; + } + } + #endregion + #endregion + + #region 关闭弹出窗口及刷新页面 + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + this.InitTreeMenu(); + this.BindGrid(); + + } + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void Tree_TextChanged(object sender, EventArgs e) + { + this.InitTreeMenu(); + } + #endregion + #endregion + + #region 右键编辑热处理报告 + /// + /// 热处理报告 + /// + /// + /// + protected void btnMenuHotProessReport_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HotProessTrustMenuId, Const.BtnSave)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HotProessReport.aspx?HotProessTrustItemId={0}", this.Grid1.SelectedRowID, "编辑热处理报告 - "))); + } + else + { + Alert.ShowInTop(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + } + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs new file mode 100644 index 0000000..7b36fc3 --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs @@ -0,0 +1,314 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WeldingProcess.PMI +{ + + + public partial class PMIDelegation + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtSearchNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSearchNo; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// Id 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField Id; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnEdit; + + /// + /// btnDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDelete; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtDelegationNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtDelegationNo; + + /// + /// txtDelegationDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtDelegationDate; + + /// + /// txtInstallationName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtInstallationName; + + /// + /// txtUnitName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtUnitName; + + /// + /// txtDetectionMethod 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtDetectionMethod; + + /// + /// txtDetectionStandard 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtDetectionStandard; + + /// + /// txtTabler 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTabler; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtRemark; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// txtIsoNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtIsoNo; + + /// + /// ToolbarFill2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill2; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuHotProessReport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuHotProessReport; + } +} diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx index 2c7eff2..9124302 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx @@ -137,11 +137,13 @@ - + - + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs index 32d7690..67f4019 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs @@ -329,6 +329,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { this.drpIsHotProess.SelectedValue = BLL.Const._False; } + //是否PMI处理 + ckbIsPMI.Checked = (jointInfo.IsPMI.HasValue && jointInfo.IsPMI.Value) ? true : false; if (jointInfo.IsCancel == true) { @@ -501,6 +503,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { newJointInfo.IsCancel = true; } + //是否PMI处理 + newJointInfo.IsPMI = ckbIsPMI.Checked; if (ckbIsGoldJoint.Checked == true) { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs index d07bd20..e47bd9b 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WeldingProcess.WeldingManage { - - - public partial class JointInfoEdit { - +namespace FineUIPro.Web.WeldingProcess.WeldingManage +{ + + + public partial class JointInfoEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// Toolbar1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// btnSave 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// txtWeldJointCode 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWeldJointCode; - + /// /// drpPipingClass 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpPipingClass; - + /// /// drpWeldType 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpWeldType; - + /// /// txtPipeSegment 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPipeSegment; - + /// /// drpMaterial1 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpMaterial1; - + /// /// drpMaterial2 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpMaterial2; - + /// /// drpWeldingMethod 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpWeldingMethod; - + /// /// drpJointAttribute 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpJointAttribute; - + /// /// txtSize 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtSize; - + /// /// drpANSISCH 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpANSISCH; - + /// /// txtDia 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtDia; - + /// /// txtThickness 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtThickness; - + /// /// txtSpecification 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSpecification; - + /// /// drpGrooveType 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpGrooveType; - + /// /// drpWeldingLocation 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpWeldingLocation; - + /// /// drpWPS 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpWPS; - + /// /// btnSelectWps 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSelectWps; - + /// /// txtPageNum 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPageNum; - + /// /// drpIsHotProess 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpIsHotProess; - + /// /// txtTestPackageNo 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTestPackageNo; - + /// /// txtSystemNumber 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSystemNumber; - + /// /// txtHeartNo1 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtHeartNo1; - + /// /// txtHeartNo2 控件。 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtHeartNo2; - + /// /// drpPipeAssembly1 控件。 /// @@ -272,7 +274,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpPipeAssembly1; - + /// /// drpPipeAssembly2 控件。 /// @@ -281,7 +283,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpPipeAssembly2; - + /// /// drpWeldSilk 控件。 /// @@ -290,7 +292,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpWeldSilk; - + /// /// drpWeldMat 控件。 /// @@ -299,7 +301,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpWeldMat; - + /// /// txtPrepareTemp 控件。 /// @@ -308,7 +310,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPrepareTemp; - + /// /// ckbIsGoldJoint 控件。 /// @@ -317,7 +319,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckbIsGoldJoint; - + /// /// drpNDTType 控件。 /// @@ -326,7 +328,16 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpNDTType; - + + /// + /// ckbIsPMI 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckbIsPMI; + /// /// ckbIsCancel 控件。 /// @@ -335,7 +346,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckbIsCancel; - + /// /// txtCancelResult 控件。 /// @@ -344,7 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCancelResult; - + /// /// btnCancel 控件。 /// @@ -353,7 +364,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnCancel; - + /// /// txtRemark 控件。 /// @@ -362,7 +373,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtRemark; - + /// /// SimpleForm2 控件。 /// @@ -371,7 +382,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm2; - + /// /// txtReport 控件。 /// @@ -380,7 +391,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtReport; - + /// /// txtPoint 控件。 /// @@ -389,7 +400,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtPoint; - + /// /// ddlTrustFlag 控件。 /// @@ -398,7 +409,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label ddlTrustFlag; - + /// /// ddlCheckFlag 控件。 /// @@ -407,7 +418,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label ddlCheckFlag; - + /// /// lbUnitName 控件。 /// @@ -416,7 +427,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbUnitName; - + /// /// lbInstallationName 控件。 /// @@ -425,7 +436,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbInstallationName; - + /// /// txtWorkAreaId 控件。 /// @@ -434,7 +445,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtWorkAreaId; - + /// /// txtPipelineCode 控件。 /// @@ -443,7 +454,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtPipelineCode; - + /// /// txtSingleNumber 控件。 /// @@ -452,7 +463,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtSingleNumber; - + /// /// ddlReportCode 控件。 /// @@ -461,7 +472,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label ddlReportCode; - + /// /// txtReportDate 控件。 /// @@ -470,7 +481,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtReportDate; - + /// /// ddlJointStatus 控件。 /// @@ -479,7 +490,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label ddlJointStatus; - + /// /// txtBackingWelder 控件。 /// @@ -488,7 +499,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtBackingWelder; - + /// /// txtBackingWelderName 控件。 /// @@ -497,7 +508,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtBackingWelderName; - + /// /// txtCoverWelder 控件。 /// @@ -506,7 +517,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtCoverWelder; - + /// /// txtCoverWelderName 控件。 /// diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index d329974..31fa6d6 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -173,12 +173,12 @@ namespace Model partial void InsertPipeline_WeldJoint(Pipeline_WeldJoint instance); partial void UpdatePipeline_WeldJoint(Pipeline_WeldJoint instance); partial void DeletePipeline_WeldJoint(Pipeline_WeldJoint instance); - partial void InsertPMI_DetectionDetails(PMI_DetectionDetails instance); - partial void UpdatePMI_DetectionDetails(PMI_DetectionDetails instance); - partial void DeletePMI_DetectionDetails(PMI_DetectionDetails instance); - partial void InsertPMI_Detections(PMI_Detections instance); - partial void UpdatePMI_Detections(PMI_Detections instance); - partial void DeletePMI_Detections(PMI_Detections instance); + partial void InsertPMI_Delegation(PMI_Delegation instance); + partial void UpdatePMI_Delegation(PMI_Delegation instance); + partial void DeletePMI_Delegation(PMI_Delegation instance); + partial void InsertPMI_DelegationDetails(PMI_DelegationDetails instance); + partial void UpdatePMI_DelegationDetails(PMI_DelegationDetails instance); + partial void DeletePMI_DelegationDetails(PMI_DelegationDetails instance); partial void InsertProject_Installation(Project_Installation instance); partial void UpdateProject_Installation(Project_Installation instance); partial void DeleteProject_Installation(Project_Installation instance); @@ -670,19 +670,19 @@ namespace Model } } - public System.Data.Linq.Table PMI_DetectionDetails + public System.Data.Linq.Table PMI_Delegation { get { - return this.GetTable(); + return this.GetTable(); } } - public System.Data.Linq.Table PMI_Detections + public System.Data.Linq.Table PMI_DelegationDetails { get { - return this.GetTable(); + return this.GetTable(); } } @@ -19375,6 +19375,8 @@ namespace Model private string _ANSISCH; + private System.Nullable _IsPMI; + private EntitySet _Batch_BatchTrustItem; private EntitySet _Batch_PointBatchItem; @@ -19513,6 +19515,8 @@ namespace Model partial void OnPageNumChanged(); partial void OnANSISCHChanging(string value); partial void OnANSISCHChanged(); + partial void OnIsPMIChanging(System.Nullable value); + partial void OnIsPMIChanged(); #endregion public Pipeline_WeldJoint() @@ -20547,6 +20551,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")] + public System.Nullable IsPMI + { + get + { + return this._IsPMI; + } + set + { + if ((this._IsPMI != value)) + { + this.OnIsPMIChanging(value); + this.SendPropertyChanging(); + this._IsPMI = value; + this.SendPropertyChanged("IsPMI"); + this.OnIsPMIChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Batch_BatchTrustItem_Pipeline_WeldJoint", Storage="_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")] public EntitySet Batch_BatchTrustItem { @@ -21151,8 +21175,286 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PMI_DetectionDetails")] - public partial class PMI_DetectionDetails : INotifyPropertyChanging, INotifyPropertyChanged + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PMI_Delegation")] + public partial class PMI_Delegation : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _DelegationNo; + + private System.Nullable _DelegationDate; + + private string _ProjectId; + + private string _InstallationId; + + private string _UnitId; + + private string _DetectionStandard; + + private string _Remark; + + private System.Nullable _CreatedTime; + + private string _Tabler; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnDelegationNoChanging(string value); + partial void OnDelegationNoChanged(); + partial void OnDelegationDateChanging(System.Nullable value); + partial void OnDelegationDateChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnInstallationIdChanging(string value); + partial void OnInstallationIdChanged(); + partial void OnUnitIdChanging(string value); + partial void OnUnitIdChanged(); + partial void OnDetectionStandardChanging(string value); + partial void OnDetectionStandardChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnCreatedTimeChanging(System.Nullable value); + partial void OnCreatedTimeChanged(); + partial void OnTablerChanging(string value); + partial void OnTablerChanged(); + #endregion + + public PMI_Delegation() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegationNo", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string DelegationNo + { + get + { + return this._DelegationNo; + } + set + { + if ((this._DelegationNo != value)) + { + this.OnDelegationNoChanging(value); + this.SendPropertyChanging(); + this._DelegationNo = value; + this.SendPropertyChanged("DelegationNo"); + this.OnDelegationNoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegationDate", DbType="DateTime")] + public System.Nullable DelegationDate + { + get + { + return this._DelegationDate; + } + set + { + if ((this._DelegationDate != value)) + { + this.OnDelegationDateChanging(value); + this.SendPropertyChanging(); + this._DelegationDate = value; + this.SendPropertyChanged("DelegationDate"); + this.OnDelegationDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="NVarChar(50)")] + public string InstallationId + { + get + { + return this._InstallationId; + } + set + { + if ((this._InstallationId != value)) + { + this.OnInstallationIdChanging(value); + this.SendPropertyChanging(); + this._InstallationId = value; + this.SendPropertyChanged("InstallationId"); + this.OnInstallationIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] + public string UnitId + { + get + { + return this._UnitId; + } + set + { + if ((this._UnitId != value)) + { + this.OnUnitIdChanging(value); + this.SendPropertyChanging(); + this._UnitId = value; + this.SendPropertyChanged("UnitId"); + this.OnUnitIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetectionStandard", DbType="NVarChar(50)")] + public string DetectionStandard + { + get + { + return this._DetectionStandard; + } + set + { + if ((this._DetectionStandard != value)) + { + this.OnDetectionStandardChanging(value); + this.SendPropertyChanging(); + this._DetectionStandard = value; + this.SendPropertyChanged("DetectionStandard"); + this.OnDetectionStandardChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")] + public System.Nullable CreatedTime + { + get + { + return this._CreatedTime; + } + set + { + if ((this._CreatedTime != value)) + { + this.OnCreatedTimeChanging(value); + this.SendPropertyChanging(); + this._CreatedTime = value; + this.SendPropertyChanged("CreatedTime"); + this.OnCreatedTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")] + public string Tabler + { + get + { + return this._Tabler; + } + set + { + if ((this._Tabler != value)) + { + this.OnTablerChanging(value); + this.SendPropertyChanging(); + this._Tabler = value; + this.SendPropertyChanged("Tabler"); + this.OnTablerChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PMI_DelegationDetails")] + public partial class PMI_DelegationDetails : INotifyPropertyChanging, INotifyPropertyChanged { private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); @@ -21187,7 +21489,7 @@ namespace Model partial void OnCreatedTimeChanged(); #endregion - public PMI_DetectionDetails() + public PMI_DelegationDetails() { OnCreated(); } @@ -21333,236 +21635,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PMI_Detections")] - public partial class PMI_Detections : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _Id; - - private string _DelegationNo; - - private System.Nullable _DelegationDate; - - private string _InstallationId; - - private string _UnitId; - - private string _DetectionStandard; - - private string _Remark; - - private System.Nullable _CreatedTime; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnIdChanging(string value); - partial void OnIdChanged(); - partial void OnDelegationNoChanging(string value); - partial void OnDelegationNoChanged(); - partial void OnDelegationDateChanging(System.Nullable value); - partial void OnDelegationDateChanged(); - partial void OnInstallationIdChanging(string value); - partial void OnInstallationIdChanged(); - partial void OnUnitIdChanging(string value); - partial void OnUnitIdChanged(); - partial void OnDetectionStandardChanging(string value); - partial void OnDetectionStandardChanged(); - partial void OnRemarkChanging(string value); - partial void OnRemarkChanged(); - partial void OnCreatedTimeChanging(System.Nullable value); - partial void OnCreatedTimeChanged(); - #endregion - - public PMI_Detections() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string Id - { - get - { - return this._Id; - } - set - { - if ((this._Id != value)) - { - this.OnIdChanging(value); - this.SendPropertyChanging(); - this._Id = value; - this.SendPropertyChanged("Id"); - this.OnIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegationNo", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] - public string DelegationNo - { - get - { - return this._DelegationNo; - } - set - { - if ((this._DelegationNo != value)) - { - this.OnDelegationNoChanging(value); - this.SendPropertyChanging(); - this._DelegationNo = value; - this.SendPropertyChanged("DelegationNo"); - this.OnDelegationNoChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegationDate", DbType="DateTime")] - public System.Nullable DelegationDate - { - get - { - return this._DelegationDate; - } - set - { - if ((this._DelegationDate != value)) - { - this.OnDelegationDateChanging(value); - this.SendPropertyChanging(); - this._DelegationDate = value; - this.SendPropertyChanged("DelegationDate"); - this.OnDelegationDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="NVarChar(50)")] - public string InstallationId - { - get - { - return this._InstallationId; - } - set - { - if ((this._InstallationId != value)) - { - this.OnInstallationIdChanging(value); - this.SendPropertyChanging(); - this._InstallationId = value; - this.SendPropertyChanged("InstallationId"); - this.OnInstallationIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] - public string UnitId - { - get - { - return this._UnitId; - } - set - { - if ((this._UnitId != value)) - { - this.OnUnitIdChanging(value); - this.SendPropertyChanging(); - this._UnitId = value; - this.SendPropertyChanged("UnitId"); - this.OnUnitIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetectionStandard", DbType="NVarChar(50)")] - public string DetectionStandard - { - get - { - return this._DetectionStandard; - } - set - { - if ((this._DetectionStandard != value)) - { - this.OnDetectionStandardChanging(value); - this.SendPropertyChanging(); - this._DetectionStandard = value; - this.SendPropertyChanged("DetectionStandard"); - this.OnDetectionStandardChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")] - public string Remark - { - get - { - return this._Remark; - } - set - { - if ((this._Remark != value)) - { - this.OnRemarkChanging(value); - this.SendPropertyChanging(); - this._Remark = value; - this.SendPropertyChanged("Remark"); - this.OnRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")] - public System.Nullable CreatedTime - { - get - { - return this._CreatedTime; - } - set - { - if ((this._CreatedTime != value)) - { - this.OnCreatedTimeChanging(value); - this.SendPropertyChanging(); - this._CreatedTime = value; - this.SendPropertyChanged("CreatedTime"); - this.OnCreatedTimeChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Project_Installation")] public partial class Project_Installation : INotifyPropertyChanging, INotifyPropertyChanged { @@ -39304,6 +39376,8 @@ namespace Model private System.Nullable _IsCancel; + private System.Nullable _IsPMI; + private System.Nullable _IsGoldJoint; private string _WPQId; @@ -40438,6 +40512,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsPMI", DbType="Bit")] + public System.Nullable IsPMI + { + get + { + return this._IsPMI; + } + set + { + if ((this._IsPMI != value)) + { + this._IsPMI = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsGoldJoint", DbType="Bit")] public System.Nullable IsGoldJoint {