From 1a33f115fd3d1b787973750950bf0b778cf85026 Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Mon, 15 May 2023 10:45:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E6=8A=A5?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + DataBase/版本日志/SGGLDB_WH_2023-05-15.sql | 2 + .../InspectionEquipmentService.cs | 3 + .../Comprehensive/InspectionEquipment.aspx | 3 + .../Comprehensive/InspectionEquipment.aspx.cs | 2 +- .../InspectionEquipmentDataIn.aspx.cs | 49 +++++------ .../InspectionEquipmentEdit.aspx | 7 +- .../InspectionEquipmentEdit.aspx.cs | 3 + .../InspectionEquipmentEdit.aspx.designer.cs | 79 ++++++++++-------- .../Excel/DataIn/设备材料报验导入模板.xls | Bin 19456 -> 21504 bytes SGGL/Model/Model.cs | 28 ++++++- 11 files changed, 111 insertions(+), 66 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-05-15.sql diff --git a/.gitignore b/.gitignore index a4b8d387..1ffcaf69 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /SGGL/FineUIPro.Web/File/Excel/Temp /SGGL/FineUIPro.Web/FileUpload/QRCodeFile /SGGL/FineUIPro.Web/FileUpload/DataBase/ConstructionStandardProject/2023-05 +/SGGL/FineUIPro.Web/FileUpload/CQMS/InspectionEquipment/2023-05 diff --git a/DataBase/版本日志/SGGLDB_WH_2023-05-15.sql b/DataBase/版本日志/SGGLDB_WH_2023-05-15.sql new file mode 100644 index 00000000..32a54b0a --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-05-15.sql @@ -0,0 +1,2 @@ +alter table [dbo].[Comprehensive_InspectionEquipment] add Unit nvarchar(50) null +GO \ No newline at end of file diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs index 9b1a20aa..aca4e48b 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs @@ -79,6 +79,7 @@ namespace BLL x.AttachUrl, x.Attribute, x.RemarkCode, + x.Unit, x.UsedPlace, x.EquipmentNO }; @@ -128,6 +129,7 @@ namespace BLL newInspectionEquipment.Specifications = inspectionEquipment.Specifications; newInspectionEquipment.Supplier = inspectionEquipment.Supplier; newInspectionEquipment.Counts = inspectionEquipment.Counts; + newInspectionEquipment.Unit = inspectionEquipment.Unit; newInspectionEquipment.SamplingCount = inspectionEquipment.SamplingCount; newInspectionEquipment.SamplingResult = inspectionEquipment.SamplingResult; newInspectionEquipment.InspectionDate = inspectionEquipment.InspectionDate; @@ -163,6 +165,7 @@ namespace BLL newInspectionEquipment.Specifications = inspectionEquipment.Specifications; newInspectionEquipment.Supplier = inspectionEquipment.Supplier; newInspectionEquipment.Counts = inspectionEquipment.Counts; + newInspectionEquipment.Unit = inspectionEquipment.Unit; newInspectionEquipment.SamplingCount = inspectionEquipment.SamplingCount; newInspectionEquipment.SamplingResult = inspectionEquipment.SamplingResult; newInspectionEquipment.InspectionDate = inspectionEquipment.InspectionDate; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx index 5cffb821..20d6a9c5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx @@ -73,6 +73,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs index 368b07c1..82481b82 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs @@ -30,7 +30,7 @@ namespace FineUIPro.Web.Comprehensive /// public void BindGrid() { - string strSql = @"select InspectionEquipmentId,ProjectId,C.UnitId,Status, U.UnitName,InspectionCode,CN.ProfessionalName,InspectionName,Specifications, + string strSql = @"select InspectionEquipmentId,ProjectId,C.UnitId,Status, U.UnitName,InspectionCode,CN.ProfessionalName,InspectionName,Specifications,Unit, Supplier,Counts,SamplingCount,(CASE WHEN SamplingResult=1 THEN '合格' WHEN SamplingResult=0 THEN '不合格' ELSE '' END) AS SamplingResult, InspectionDate,AttachUrl,Attribute,RemarkCode,UsedPlace,EquipmentNO from Comprehensive_InspectionEquipment C left join Base_Unit U on C.UnitId=U.UnitId diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs index 4f71c503..0064f3ed 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs @@ -127,7 +127,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive conn.Close(); conn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 12); + AddDatasetToSQL(ds.Tables[0], 13); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -204,30 +204,30 @@ namespace FineUIPro.Web.CQMS.Comprehensive } } - string row9 = pds.Rows[i][9].ToString().Trim(); - if (!string.IsNullOrEmpty(row9)) - { - if (row9 != "合格" && row9 != "不合格") - { - result += (i + 2).ToString() + "," + "本次抽检结果" + "," + "[" + row9 + "]错误！" + "|"; - } - } - - string row10 = pds.Rows[i][10].ToString(); + string row10 = pds.Rows[i][10].ToString().Trim(); if (!string.IsNullOrEmpty(row10)) { - try + if (row10 != "合格" && row10 != "不合格") { - DateTime date = Convert.ToDateTime(row10.Trim()); - } - catch (Exception) - { - result += (i + 2).ToString() + "," + "报验日期" + "," + "[" + row10 + "]错误！" + "|"; + result += (i + 2).ToString() + "," + "本次抽检结果" + "," + "[" + row10 + "]错误！" + "|"; } } string row11 = pds.Rows[i][11].ToString(); - if (string.IsNullOrEmpty(row11)) + if (!string.IsNullOrEmpty(row11)) + { + try + { + DateTime date = Convert.ToDateTime(row11.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "报验日期" + "," + "[" + row11 + "]错误！" + "|"; + } + } + + string row12 = pds.Rows[i][12].ToString(); + if (string.IsNullOrEmpty(row12)) { result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|"; } @@ -347,7 +347,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive conn.Close(); conn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 12); + AddDatasetToSQL2(ds.Tables[0], 13); } catch (Exception ex) { @@ -411,14 +411,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.Specifications = pds.Rows[i][5].ToString().Trim(); Ins.Supplier = pds.Rows[i][6].ToString().Trim(); Ins.Counts = pds.Rows[i][7].ToString().Trim(); - Ins.SamplingCount = pds.Rows[i][8].ToString().Trim(); - Ins.SamplingResult = pds.Rows[i][9].ToString().Trim() == "合格" ? "1" : "2"; + Ins.Unit = pds.Rows[i][8].ToString().Trim(); + Ins.SamplingCount = pds.Rows[i][9].ToString().Trim(); + Ins.SamplingResult = pds.Rows[i][10].ToString().Trim() == "合格" ? "1" : "2"; - if (!string.IsNullOrEmpty(pds.Rows[i][10].ToString().Trim())) + if (!string.IsNullOrEmpty(pds.Rows[i][11].ToString().Trim())) { - Ins.InspectionDate = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim()); + Ins.InspectionDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim()); } - Ins.RemarkCode = pds.Rows[i][11].ToString().Trim(); + Ins.RemarkCode = pds.Rows[i][12].ToString().Trim(); Ins.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionEquipment)); Ins.CompileMan = this.CurrUser.UserId; Ins.CompileDate = DateTime.Now.Date; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx index 0f66f28d..cd74971b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx @@ -31,16 +31,17 @@ - + - + + - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs index 96a92eaf..240f921c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs @@ -65,6 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.txtCounts.Text = Convert.ToString(inspectionEquipment.Counts); } + this.txtUnit.Text = inspectionEquipment.Unit; if (inspectionEquipment.SamplingCount != null) { this.txtSamplingCount.Text = Convert.ToString(inspectionEquipment.SamplingCount); @@ -254,6 +255,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive newInspectionEquipment.EquipmentNO = this.txtEquipmentNo.Text.Trim(); newInspectionEquipment.RemarkCode = this.txtRemarkCode.Text.Trim(); newInspectionEquipment.Counts = this.txtCounts.Text.Trim(); + newInspectionEquipment.Unit = this.txtUnit.Text.Trim(); newInspectionEquipment.SamplingCount = this.txtSamplingCount.Text.Trim(); newInspectionEquipment.UsedPlace = this.txtUsedPlace.Text.Trim(); @@ -378,6 +380,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive newInspectionEquipment.EquipmentNO = this.txtEquipmentNo.Text.Trim(); newInspectionEquipment.RemarkCode = this.txtRemarkCode.Text.Trim(); newInspectionEquipment.Counts = this.txtCounts.Text.Trim(); + newInspectionEquipment.Unit = this.txtUnit.Text.Trim(); newInspectionEquipment.SamplingCount = this.txtSamplingCount.Text.Trim(); newInspectionEquipment.UsedPlace = this.txtUsedPlace.Text.Trim(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs index 58934b6d..12391ea5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class InspectionEquipmentEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class InspectionEquipmentEdit { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpUnitId 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// txtInspectionCode 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtInspectionCode; - + /// /// txtEquipmentNo 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtEquipmentNo; - + /// /// drpCNProfessionalId 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// txtInspectionName 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtInspectionName; - + /// /// txtSpecifications 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSpecifications; - + /// /// txtSupplier 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSupplier; - + /// /// txtCounts 控件。 /// @@ -112,7 +110,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtCounts; - + + /// + /// txtUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUnit; + /// /// txtSamplingCount 控件。 /// @@ -121,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtSamplingCount; - + /// /// drpSamplingResult 控件。 /// @@ -130,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpSamplingResult; - + /// /// drpAttribute 控件。 /// @@ -139,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAttribute; - + /// /// txtInspectionDate 控件。 /// @@ -148,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtInspectionDate; - + /// /// txtRemarkCode 控件。 /// @@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtRemarkCode; - + /// /// txtUsedPlace 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUsedPlace; - + /// /// Panel2 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// drpAudit 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAudit; - + /// /// agree 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow agree; - + /// /// rblIsAgree 控件。 /// @@ -220,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsAgree; - + /// /// options 控件。 /// @@ -229,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow options; - + /// /// txtidea 控件。 /// @@ -238,7 +245,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtidea; - + /// /// Toolbar1 控件。 /// @@ -247,7 +254,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -256,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -265,7 +272,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -274,7 +281,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/设备材料报验导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/设备材料报验导入模板.xls index aeccac07b911dcf8726f0cb561df55af0ba4ebdb..528af38dca06b04beccbe3f587798894c36fb03d 100644 GIT binary patch literal 21504 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 literal 19456 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 diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 0c6e832c..49d11d29 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -17051,7 +17051,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_DesignProfessional_Base_DesignProfessional", Storage="_Base_DesignProfessional", ThisKey="CNProfessionalId", OtherKey="ToCN", DeleteRule="NO ACTION")] + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_DesignProfessional_Base_CNProfessional", Storage="_Base_DesignProfessional", ThisKey="CNProfessionalId", OtherKey="ToCN", DeleteRule="NO ACTION")] public EntitySet Base_DesignProfessional { get @@ -18556,7 +18556,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_DesignProfessional_Base_DesignProfessional", Storage="_Base_CNProfessional", ThisKey="ToCN", OtherKey="CNProfessionalId", IsForeignKey=true)] + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_DesignProfessional_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="ToCN", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional { get @@ -88153,6 +88153,8 @@ namespace Model private string _AuditMan; + private string _Unit; + private EntityRef _Base_CNProfessional; private EntityRef _Base_Project; @@ -88207,6 +88209,8 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); + partial void OnUnitChanging(string value); + partial void OnUnitChanged(); #endregion public Comprehensive_InspectionEquipment() @@ -88669,6 +88673,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NVarChar(50)")] + public string Unit + { + get + { + return this._Unit; + } + set + { + if ((this._Unit != value)) + { + this.OnUnitChanging(value); + this.SendPropertyChanging(); + this._Unit = value; + this.SendPropertyChanged("Unit"); + this.OnUnitChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_InspectionEquipment_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional {