From 18b11605e1a958cede42c80cc4bb9e5c7fd52ceb Mon Sep 17 00:00:00 2001 From: jackchenyang <874821510@qq.com> Date: Sat, 11 May 2024 15:22:08 +0800 Subject: [PATCH] =?UTF-8?q?PMI=E5=A7=94=E6=89=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HJGL/.vs/HJGL/config/applicationhost.config | 2 +- HJGL/.vs/HJGL/v17/.suo | Bin 974336 -> 840704 bytes HJGL/BLL/Common/Const.cs | 9 + .../Pipeline_WeldJointService.cs | 1 + HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql | 12 +- .../BSFDB_2024.05.11View_Pipeline_WeldJoint.sql | 117 ++++ .../App_GlobalResources/Lan.Designer.cs | 27 + .../App_GlobalResources/Lan.resx | 9 + HJGL/FineUIPro.Web/FineUIPro.Web.csproj | 9 +- HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 34 +- .../WeldingProcess/PMI/PMIDelegation.aspx | 195 ++++++ .../WeldingProcess/PMI/PMIDelegation.aspx.cs | 406 ++++++++++++ .../PMI/PMIDelegation.aspx.designer.cs | 314 ++++++++++ .../WeldingManage/JointInfoEdit.aspx | 6 +- .../WeldingManage/JointInfoEdit.aspx.cs | 4 + .../JointInfoEdit.aspx.designer.cs | 131 ++-- HJGL/Model/Model.cs | 576 ++++++++++-------- 17 files changed, 1540 insertions(+), 312 deletions(-) create mode 100644 HJGL/DataBase/版本日志/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql create mode 100644 HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx create mode 100644 HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs create mode 100644 HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs 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 8d94192b454c026ba25738d10f1e0e3f41c78dbb..1c064634f27b6ca4a53c0d86c3c9e37a1081f160 100644 GIT binary patch delta 26733 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 delta 66799 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 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 {