From a2ff296c7c1d26b95bb08182c4d62cfb28664a89 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 10 Jun 2026 17:02:59 +0800 Subject: [PATCH] 1 --- DataBase/版本日志/SGGLDB_V2026-06-10-gf.sql | 106 ++ .../SitePerson/SitePerson_PersonService.cs | 1 + .../File/Excel/DataIn/人员信息模版.xls | Bin 20480 -> 21504 bytes .../HSSE/SitePerson/PersonIn.aspx.cs | 8 +- SGGL/Model/Model.cs | 1080 +++++------------ 5 files changed, 410 insertions(+), 785 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2026-06-10-gf.sql diff --git a/DataBase/版本日志/SGGLDB_V2026-06-10-gf.sql b/DataBase/版本日志/SGGLDB_V2026-06-10-gf.sql new file mode 100644 index 00000000..693e0aa6 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-06-10-gf.sql @@ -0,0 +1,106 @@ + +ALTER VIEW [dbo].[View_SitePerson_Person] +AS +/*ֳԱͼ*/ +SELECT SitePerson.ProjectId, + Project.ProjectCode, + Project.ProjectName, + SitePerson.SitePersonId, + persons.PersonId, + SitePerson.CardNo, + Persons.PersonName, + Persons.Sex, + (Case Persons.Sex WHEN '1' THEN '' WHEN '2' THEN 'Ů' ELSE '' END) AS SexName, + Persons.IdentityCard, + Persons.Address, + SitePerson.UnitId, + Persons.DepartId, + Persons.Birthday, + SitePerson.TeamGroupId, + SitePerson.WorkAreaId, + SitePerson.WorkPostId, + SitePerson.InTime, + SitePerson.OutTime, + SitePerson.OutResult, + Persons.Telephone, + Persons.PositionId, + Persons.PostTitleId, + Persons.PhotoUrl, + Unit.UnitCode, + Unit.UnitName, + TeamGroup.TeamGroupName, + Post.WorkPostName, + Position.PositionName, + Title.PostTitleName, + Depart.DepartName, + Post.PostType, + Post.IsHsse, + (SELECT COUNT(*) FROM EduTrain_TrainRecordDetail T + LEFT JOIN EduTrain_TrainRecord AS E ON T.TrainingId=E.TrainingId + WHERE T.PersonId=SitePerson.PersonId AND E.ProjectId=SitePerson.ProjectId AND T.CheckResult=1) AS TrainCount, + (SELECT COUNT(*) FROM Training_TestRecord R + WHERE R.TestManId=SitePerson.PersonId AND R.ProjectId=SitePerson.ProjectId and R.TestScores > ISNULL((SELECT TOP 1 PassingScore FROM Sys_TestRule),60)) AS TrainCount1, + (SELECT COUNT(*) FROM Training_TestRecord R1 + left join Training_TestPlan p1 on p1.TestPlanId=R1.TestPlanId + left join Training_Plan p2 on p2.PlanId=p1.PlanId + WHERE R1.TestManId=SitePerson.PersonId AND R1.ProjectId=SitePerson.ProjectId and R1.TestScores > ISNULL((SELECT TOP 1 PassingScore FROM Sys_TestRule),60) and p2.TrainTypeId='8920c9cc-fa92-49b2-9493-775a55da27bb' and R1.TestStartTime>=SitePerson.InTime) AS TrainCount2, --볡볡ѵԺϸ + SitePerson.AuditorId, + Persons.PersonName AS AuditorName, + SitePerson.AuditorDate, + Persons.IDCardUrl, + Persons.IsForeign, + case when Persons.IsForeign=1 then '' else '' end as IsForeignStr, + Persons.IdcardType, + BasicData1.dictName as IdcardTypeName, + Persons.IdcardStartDate, + Persons.IdcardEndDate, + Persons.IdcardForever, + case when Persons.IdcardForever='Y' then '' else '' end as IdcardForeverStr, + Persons.PoliticsStatus, + BasicData2.dictName as PoliticsStatusName, + Persons.IdcardAddress, + Persons.Nation, + BasicData3.dictName as NationName, + Persons.EduLevel, + BasicData4.dictName as EduLevelName, + Persons.MaritalStatus, + BasicData5.dictName as MaritalStatusName, + Persons.CountryCode, + Country.cname as CountryName, + Persons.ProvinceCode, + City.cname as ProvinceName, + Persons.PersonType, + (case when Persons.PersonType='2' then 'Ƹ' when Persons.PersonType='3' then '' else 'Ա' end) as IsOutsideStr, + --WorkArea.UnitWorkCode AS WorkAreaCode, + WorkAreaCode= STUFF((SELECT ',' + UnitWorkCode FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +SitePerson.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + --WorkArea.UnitWorkName AS WorkAreaName + WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +SitePerson.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + SitePerson.RealNameAddTime, + SitePerson.RealNameUpdateTime, + Persons.HeadImage, + SitePerson.States, + SitePerson.WelderCode, + Persons.YunMouState +FROM SitePerson_Person AS SitePerson +LEFT JOIN Person_Persons AS Persons ON SitePerson.PersonId=Persons.PersonId +LEFT JOIN Base_Project AS Project ON Project.ProjectId=SitePerson.ProjectId +LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = SitePerson.UnitId +LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=SitePerson.TeamGroupId +LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = SitePerson.WorkPostId +LEFT JOIN Base_Position AS Position ON Position.PositionId = Persons.PositionId +Left JOIN Base_PostTitle AS Title ON Title.PostTitleId = Persons.PostTitleId +Left JOIN Base_Depart AS Depart ON Depart.DepartId = Persons.DepartId +Left JOIN RealName_BasicData AS BasicData1 ON BasicData1.dictCode = Persons.IdcardType +Left JOIN RealName_BasicData AS BasicData2 ON BasicData2.dictCode = Persons.PoliticsStatus +Left JOIN RealName_BasicData AS BasicData3 ON BasicData3.dictCode = Persons.Nation +Left JOIN RealName_BasicData AS BasicData4 ON BasicData4.dictCode = Persons.EduLevel +Left JOIN RealName_BasicData AS BasicData5 ON BasicData5.dictCode = Persons.MaritalStatus +Left JOIN RealName_Country AS Country ON Country.CountryId = Persons.CountryCode +Left JOIN RealName_City AS City ON City.provinceCode = Persons.ProvinceCode and City.CountryId = Persons.CountryCode + + + + +GO + + diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs index ba9236e3..e6c42dc8 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs @@ -841,6 +841,7 @@ namespace BLL Isprint = "0", States = person.States, IsSafetyMonitoring = person.IsSafetyMonitoring, + WelderCode = person.WelderCode, IsCQMSCheck = person.IsCQMSCheck, }; diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls index d98e4ac41b5131685321a23a258a64fa41d4e0dc..33f6211fce22e237a6c97fe9422834436f623bde 100644 GIT binary patch literal 21504 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 F`aji+uiXFu literal 20480 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 C&o*@c diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs index 5ea2b913..c3142d9e 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs @@ -770,7 +770,7 @@ namespace FineUIPro.Web.HSSE.SitePerson string col33 = pds.Rows[i][33].ToString().Trim(); string col34 = pds.Rows[i][34].ToString().Trim(); string col35 = pds.Rows[i][35].ToString().Trim(); - + string col36 = pds.Rows[i][36].ToString().Trim(); if (!string.IsNullOrEmpty(col0))//卡号 { person.CardNo = col0; @@ -1023,6 +1023,10 @@ namespace FineUIPro.Web.HSSE.SitePerson //{ // person.IsCardUsedName = col35; //} + if (!string.IsNullOrEmpty(col36))//焊工号 + { + person.WelderCode = col36; + } person.PersonId = SQLHelper.GetNewID(typeof(Model.SitePerson_Person)); persons.Add(person); @@ -1135,6 +1139,8 @@ namespace FineUIPro.Web.HSSE.SitePerson //newPerson.Address = persons[i].Address; newPerson.OutTime = persons[i].OutTime; newPerson.OutResult = persons[i].OutResult; + newPerson.States = BLL.Const.State_1; + newPerson.WelderCode = persons[i].WelderCode; //newPerson.IsForeign = persons[i].IsForeign; //newPerson.IsOutside = persons[i].IsOutside; //newPerson.IsUsed = persons[i].IsUsedName == "是" ? true : false; diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 8f3f6bdb..4a96bea5 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -173,9 +173,6 @@ namespace Model partial void InsertBase_MaterialType(Base_MaterialType instance); partial void UpdateBase_MaterialType(Base_MaterialType instance); partial void DeleteBase_MaterialType(Base_MaterialType instance); - partial void InsertBase_MaterialUnit(Base_MaterialUnit instance); - partial void UpdateBase_MaterialUnit(Base_MaterialUnit instance); - partial void DeleteBase_MaterialUnit(Base_MaterialUnit instance); partial void InsertBase_Medium(Base_Medium instance); partial void UpdateBase_Medium(Base_Medium instance); partial void DeleteBase_Medium(Base_Medium instance); @@ -1022,9 +1019,6 @@ namespace Model partial void InsertMaterial_NoticeAndSupervision(Material_NoticeAndSupervision instance); partial void UpdateMaterial_NoticeAndSupervision(Material_NoticeAndSupervision instance); partial void DeleteMaterial_NoticeAndSupervision(Material_NoticeAndSupervision instance); - partial void InsertMaterialInAndOutRecord(MaterialInAndOutRecord instance); - partial void UpdateMaterialInAndOutRecord(MaterialInAndOutRecord instance); - partial void DeleteMaterialInAndOutRecord(MaterialInAndOutRecord instance); partial void InsertMeeting_AttendMeeting(Meeting_AttendMeeting instance); partial void UpdateMeeting_AttendMeeting(Meeting_AttendMeeting instance); partial void DeleteMeeting_AttendMeeting(Meeting_AttendMeeting instance); @@ -2353,14 +2347,6 @@ namespace Model } } - public System.Data.Linq.Table Base_MaterialUnit - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Base_Medium { get @@ -4625,14 +4611,6 @@ namespace Model } } - public System.Data.Linq.Table MaterialInAndOutRecord - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Meeting_AttendMeeting { get @@ -12475,7 +12453,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")] public string ApproveIdea { get @@ -22654,8 +22632,6 @@ namespace Model private string _UnitId; - private string _ProjectId; - private string _MaterialId; private string _ColorName; @@ -22666,6 +22642,8 @@ namespace Model private string _Remark; + private string _ProjectId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -22674,8 +22652,6 @@ namespace Model partial void OnMaterialColorIdChanged(); partial void OnUnitIdChanging(string value); partial void OnUnitIdChanged(); - partial void OnProjectIdChanging(string value); - partial void OnProjectIdChanged(); partial void OnMaterialIdChanging(string value); partial void OnMaterialIdChanged(); partial void OnColorNameChanging(string value); @@ -22686,6 +22662,8 @@ namespace Model partial void OnRGBChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); #endregion public Base_MaterialColor() @@ -22733,26 +22711,6 @@ namespace Model } } - [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="_MaterialId", DbType="NVarChar(50)")] public string MaterialId { @@ -22853,6 +22811,26 @@ namespace Model } } + [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(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -23036,140 +23014,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_MaterialUnit")] - public partial class Base_MaterialUnit : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _MaterialUnitId; - - private string _MaterialUnitName; - - private string _MaterialUnitCode; - - private string _Remark; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnMaterialUnitIdChanging(string value); - partial void OnMaterialUnitIdChanged(); - partial void OnMaterialUnitNameChanging(string value); - partial void OnMaterialUnitNameChanged(); - partial void OnMaterialUnitCodeChanging(string value); - partial void OnMaterialUnitCodeChanged(); - partial void OnRemarkChanging(string value); - partial void OnRemarkChanged(); - #endregion - - public Base_MaterialUnit() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnitId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string MaterialUnitId - { - get - { - return this._MaterialUnitId; - } - set - { - if ((this._MaterialUnitId != value)) - { - this.OnMaterialUnitIdChanging(value); - this.SendPropertyChanging(); - this._MaterialUnitId = value; - this.SendPropertyChanged("MaterialUnitId"); - this.OnMaterialUnitIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnitName", DbType="NVarChar(100)")] - public string MaterialUnitName - { - get - { - return this._MaterialUnitName; - } - set - { - if ((this._MaterialUnitName != value)) - { - this.OnMaterialUnitNameChanging(value); - this.SendPropertyChanging(); - this._MaterialUnitName = value; - this.SendPropertyChanged("MaterialUnitName"); - this.OnMaterialUnitNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnitCode", DbType="NVarChar(50)")] - public string MaterialUnitCode - { - get - { - return this._MaterialUnitCode; - } - set - { - if ((this._MaterialUnitCode != value)) - { - this.OnMaterialUnitCodeChanging(value); - this.SendPropertyChanging(); - this._MaterialUnitCode = value; - this.SendPropertyChanged("MaterialUnitCode"); - this.OnMaterialUnitCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")] - 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(); - } - } - } - - 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.Base_Medium")] public partial class Base_Medium : INotifyPropertyChanging, INotifyPropertyChanged { @@ -24964,6 +24808,8 @@ namespace Model private EntitySet _Base_ProjectSate; + private EntitySet _Base_Warehouse; + private EntitySet _HJGL_Batch_NDE; private EntitySet _HJGL_Batch_PointBatch; @@ -25248,8 +25094,6 @@ namespace Model private EntitySet _Sys_FlowOperate; - private EntitySet _Sys_Log; - private EntitySet _Sys_RoleItem; private EntitySet _Sys_UserRead; @@ -25396,6 +25240,7 @@ namespace Model this._Base_ProjectType = default(EntityRef); this._Base_Unit = default(EntityRef); this._Base_ProjectSate = new EntitySet(new Action(this.attach_Base_ProjectSate), new Action(this.detach_Base_ProjectSate)); + this._Base_Warehouse = new EntitySet(new Action(this.attach_Base_Warehouse), new Action(this.detach_Base_Warehouse)); this._HJGL_Batch_NDE = new EntitySet(new Action(this.attach_HJGL_Batch_NDE), new Action(this.detach_HJGL_Batch_NDE)); this._HJGL_Batch_PointBatch = new EntitySet(new Action(this.attach_HJGL_Batch_PointBatch), new Action(this.detach_HJGL_Batch_PointBatch)); this._Check_CheckColligation = new EntitySet(new Action(this.attach_Check_CheckColligation), new Action(this.detach_Check_CheckColligation)); @@ -25538,7 +25383,6 @@ namespace Model this._Sys_CodeRecords = new EntitySet(new Action(this.attach_Sys_CodeRecords), new Action(this.detach_Sys_CodeRecords)); this._Sys_CQMS_DataInTemp = new EntitySet(new Action(this.attach_Sys_CQMS_DataInTemp), new Action(this.detach_Sys_CQMS_DataInTemp)); this._Sys_FlowOperate = new EntitySet(new Action(this.attach_Sys_FlowOperate), new Action(this.detach_Sys_FlowOperate)); - this._Sys_Log = new EntitySet(new Action(this.attach_Sys_Log), new Action(this.detach_Sys_Log)); this._Sys_RoleItem = new EntitySet(new Action(this.attach_Sys_RoleItem), new Action(this.detach_Sys_RoleItem)); this._Sys_UserRead = new EntitySet(new Action(this.attach_Sys_UserRead), new Action(this.detach_Sys_UserRead)); this._Technical_TechnicalDisclose = new EntitySet(new Action(this.attach_Technical_TechnicalDisclose), new Action(this.detach_Technical_TechnicalDisclose)); @@ -26583,6 +26427,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_Warehouse_Project", Storage="_Base_Warehouse", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet Base_Warehouse + { + get + { + return this._Base_Warehouse; + } + set + { + this._Base_Warehouse.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Batch_NDECheck_Base_Project", Storage="_HJGL_Batch_NDE", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet HJGL_Batch_NDE { @@ -28429,19 +28286,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_Log_Base_Project", Storage="_Sys_Log", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] - public EntitySet Sys_Log - { - get - { - return this._Sys_Log; - } - set - { - this._Sys_Log.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_RoleItem_Base_Project", Storage="_Sys_RoleItem", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet Sys_RoleItem { @@ -28929,6 +28773,18 @@ namespace Model entity.Base_Project = null; } + private void attach_Base_Warehouse(Base_Warehouse entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_Base_Warehouse(Base_Warehouse entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_HJGL_Batch_NDE(HJGL_Batch_NDE entity) { this.SendPropertyChanging(); @@ -30633,18 +30489,6 @@ namespace Model entity.Base_Project = null; } - private void attach_Sys_Log(Sys_Log entity) - { - this.SendPropertyChanging(); - entity.Base_Project = this; - } - - private void detach_Sys_Log(Sys_Log entity) - { - this.SendPropertyChanging(); - entity.Base_Project = null; - } - private void attach_Sys_RoleItem(Sys_RoleItem entity) { this.SendPropertyChanging(); @@ -39175,6 +39019,8 @@ namespace Model private System.Nullable _ModifyTime; + private EntityRef _Base_Project; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -39199,6 +39045,7 @@ namespace Model public Base_Warehouse() { + this._Base_Project = default(EntityRef); OnCreated(); } @@ -39273,6 +39120,10 @@ namespace Model { if ((this._ProjectId != value)) { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnProjectIdChanging(value); this.SendPropertyChanging(); this._ProjectId = value; @@ -39362,6 +39213,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_Warehouse_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.Base_Warehouse.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.Base_Warehouse.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -61435,8 +61320,6 @@ namespace Model private string _SType; - private string _SourceDes; - private string _MeasurementRange; private string _Precision; @@ -61463,6 +61346,8 @@ namespace Model private string _Remark; + private string _SourceDes; + private EntityRef _Base_CNProfessional; private EntityRef _Base_Project; @@ -61517,8 +61402,6 @@ namespace Model partial void OnIsCheckOKChanged(); partial void OnSTypeChanging(string value); partial void OnSTypeChanged(); - partial void OnSourceDesChanging(string value); - partial void OnSourceDesChanged(); partial void OnMeasurementRangeChanging(string value); partial void OnMeasurementRangeChanged(); partial void OnPrecisionChanging(string value); @@ -61545,6 +61428,8 @@ namespace Model partial void OnCalibrationWarningChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); + partial void OnSourceDesChanging(string value); + partial void OnSourceDesChanged(); #endregion public Comprehensive_InspectionMachine() @@ -62007,26 +61892,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SourceDes", DbType="NVarChar(500)")] - public string SourceDes - { - get - { - return this._SourceDes; - } - set - { - if ((this._SourceDes != value)) - { - this.OnSourceDesChanging(value); - this.SendPropertyChanging(); - this._SourceDes = value; - this.SendPropertyChanged("SourceDes"); - this.OnSourceDesChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeasurementRange", DbType="NVarChar(50)")] public string MeasurementRange { @@ -62287,6 +62152,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SourceDes", DbType="NVarChar(500)")] + public string SourceDes + { + get + { + return this._SourceDes; + } + set + { + if ((this._SourceDes != value)) + { + this.OnSourceDesChanging(value); + this.SendPropertyChanging(); + this._SourceDes = value; + this.SendPropertyChanged("SourceDes"); + this.OnSourceDesChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_InspectionMachine_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional { @@ -101634,10 +101519,10 @@ namespace Model private string _TrainNumber; - private string _TrainNumberId; - private System.Nullable _TypeInt; + private string _TrainNumberId; + private string _CompileMan; private System.Nullable _CompileDate; @@ -101672,10 +101557,10 @@ namespace Model partial void OnReceiveDateChanged(); partial void OnTrainNumberChanging(string value); partial void OnTrainNumberChanged(); - partial void OnTrainNumberIdChanging(string value); - partial void OnTrainNumberIdChanged(); partial void OnTypeIntChanging(System.Nullable value); partial void OnTypeIntChanged(); + partial void OnTrainNumberIdChanging(string value); + partial void OnTrainNumberIdChanged(); partial void OnCompileManChanging(string value); partial void OnCompileManChanged(); partial void OnCompileDateChanging(System.Nullable value); @@ -101929,26 +101814,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")] - public string TrainNumberId - { - get - { - return this._TrainNumberId; - } - set - { - if ((this._TrainNumberId != value)) - { - this.OnTrainNumberIdChanging(value); - this.SendPropertyChanging(); - this._TrainNumberId = value; - this.SendPropertyChanged("TrainNumberId"); - this.OnTrainNumberIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")] public System.Nullable TypeInt { @@ -101969,6 +101834,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")] + public string TrainNumberId + { + get + { + return this._TrainNumberId; + } + set + { + if ((this._TrainNumberId != value)) + { + this.OnTrainNumberIdChanging(value); + this.SendPropertyChanging(); + this._TrainNumberId = value; + this.SendPropertyChanged("TrainNumberId"); + this.OnTrainNumberIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] public string CompileMan { @@ -113854,7 +113739,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")] public string Rectification { get @@ -113980,7 +113865,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(500)")] public string Measures { get @@ -165018,356 +164903,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.MaterialInAndOutRecord")] - public partial class MaterialInAndOutRecord : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _Id; - - private string _ProjectId; - - private string _GoodsCategoryId; - - private string _GoodsCategoryName; - - private string _MaterialModel; - - private System.Nullable _InOutDate; - - private string _UnitId; - - private string _InOrOut; - - private System.Nullable _Number; - - private string _MaterialUnitId; - - private string _Remark; - - private string _CompileMan; - - private System.Nullable _CompileDate; - - #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 OnProjectIdChanging(string value); - partial void OnProjectIdChanged(); - partial void OnGoodsCategoryIdChanging(string value); - partial void OnGoodsCategoryIdChanged(); - partial void OnGoodsCategoryNameChanging(string value); - partial void OnGoodsCategoryNameChanged(); - partial void OnMaterialModelChanging(string value); - partial void OnMaterialModelChanged(); - partial void OnInOutDateChanging(System.Nullable value); - partial void OnInOutDateChanged(); - partial void OnUnitIdChanging(string value); - partial void OnUnitIdChanged(); - partial void OnInOrOutChanging(string value); - partial void OnInOrOutChanged(); - partial void OnNumberChanging(System.Nullable value); - partial void OnNumberChanged(); - partial void OnMaterialUnitIdChanging(string value); - partial void OnMaterialUnitIdChanged(); - partial void OnRemarkChanging(string value); - partial void OnRemarkChanged(); - partial void OnCompileManChanging(string value); - partial void OnCompileManChanged(); - partial void OnCompileDateChanging(System.Nullable value); - partial void OnCompileDateChanged(); - #endregion - - public MaterialInAndOutRecord() - { - 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="_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="_GoodsCategoryId", DbType="NVarChar(50)")] - public string GoodsCategoryId - { - get - { - return this._GoodsCategoryId; - } - set - { - if ((this._GoodsCategoryId != value)) - { - this.OnGoodsCategoryIdChanging(value); - this.SendPropertyChanging(); - this._GoodsCategoryId = value; - this.SendPropertyChanged("GoodsCategoryId"); - this.OnGoodsCategoryIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GoodsCategoryName", DbType="NVarChar(100)")] - public string GoodsCategoryName - { - get - { - return this._GoodsCategoryName; - } - set - { - if ((this._GoodsCategoryName != value)) - { - this.OnGoodsCategoryNameChanging(value); - this.SendPropertyChanging(); - this._GoodsCategoryName = value; - this.SendPropertyChanged("GoodsCategoryName"); - this.OnGoodsCategoryNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialModel", DbType="NVarChar(100)")] - public string MaterialModel - { - get - { - return this._MaterialModel; - } - set - { - if ((this._MaterialModel != value)) - { - this.OnMaterialModelChanging(value); - this.SendPropertyChanging(); - this._MaterialModel = value; - this.SendPropertyChanged("MaterialModel"); - this.OnMaterialModelChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InOutDate", DbType="DateTime")] - public System.Nullable InOutDate - { - get - { - return this._InOutDate; - } - set - { - if ((this._InOutDate != value)) - { - this.OnInOutDateChanging(value); - this.SendPropertyChanging(); - this._InOutDate = value; - this.SendPropertyChanged("InOutDate"); - this.OnInOutDateChanged(); - } - } - } - - [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="_InOrOut", DbType="NVarChar(10)")] - public string InOrOut - { - get - { - return this._InOrOut; - } - set - { - if ((this._InOrOut != value)) - { - this.OnInOrOutChanging(value); - this.SendPropertyChanging(); - this._InOrOut = value; - this.SendPropertyChanged("InOrOut"); - this.OnInOrOutChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Number", DbType="Decimal(18,2)")] - public System.Nullable Number - { - get - { - return this._Number; - } - set - { - if ((this._Number != value)) - { - this.OnNumberChanging(value); - this.SendPropertyChanging(); - this._Number = value; - this.SendPropertyChanged("Number"); - this.OnNumberChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnitId", DbType="NVarChar(50)")] - public string MaterialUnitId - { - get - { - return this._MaterialUnitId; - } - set - { - if ((this._MaterialUnitId != value)) - { - this.OnMaterialUnitIdChanging(value); - this.SendPropertyChanging(); - this._MaterialUnitId = value; - this.SendPropertyChanged("MaterialUnitId"); - this.OnMaterialUnitIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")] - 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="_CompileMan", DbType="NVarChar(50)")] - public string CompileMan - { - get - { - return this._CompileMan; - } - set - { - if ((this._CompileMan != value)) - { - this.OnCompileManChanging(value); - this.SendPropertyChanging(); - this._CompileMan = value; - this.SendPropertyChanged("CompileMan"); - this.OnCompileManChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] - public System.Nullable CompileDate - { - get - { - return this._CompileDate; - } - set - { - if ((this._CompileDate != value)) - { - this.OnCompileDateChanging(value); - this.SendPropertyChanging(); - this._CompileDate = value; - this.SendPropertyChanged("CompileDate"); - this.OnCompileDateChanged(); - } - } - } - - 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.Meeting_AttendMeeting")] public partial class Meeting_AttendMeeting : INotifyPropertyChanging, INotifyPropertyChanged { @@ -167707,7 +167242,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")] public string AttentPerson { get @@ -198714,7 +198249,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string ProjectDescription { get @@ -198834,7 +198369,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string CalculationRule { get @@ -198894,7 +198429,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")] public string ConstructionSubcontractor { get @@ -199278,7 +198813,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")] public System.Nullable WorkPackageEstimate { get @@ -199583,6 +199118,16 @@ namespace Model private string _ProjectId; + private string _ContractId; + + private string _OrderCode; + + private System.Nullable _OrderInDate; + + private System.Nullable _OrderOutDate; + + private string _MaterialRequisitionUnit; + private System.Nullable _State; private string _InvoiceCode; @@ -199611,16 +199156,6 @@ namespace Model private string _CreateUser; - private string _ContractId; - - private System.Nullable _OrderInDate; - - private string _OrderCode; - - private System.Nullable _OrderOutDate; - - private string _MaterialRequisitionUnit; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -199629,6 +199164,16 @@ namespace Model partial void OnInvoiceIdChanged(); partial void OnProjectIdChanging(string value); partial void OnProjectIdChanged(); + partial void OnContractIdChanging(string value); + partial void OnContractIdChanged(); + partial void OnOrderCodeChanging(string value); + partial void OnOrderCodeChanged(); + partial void OnOrderInDateChanging(System.Nullable value); + partial void OnOrderInDateChanged(); + partial void OnOrderOutDateChanging(System.Nullable value); + partial void OnOrderOutDateChanged(); + partial void OnMaterialRequisitionUnitChanging(string value); + partial void OnMaterialRequisitionUnitChanged(); partial void OnStateChanging(System.Nullable value); partial void OnStateChanged(); partial void OnInvoiceCodeChanging(string value); @@ -199657,16 +199202,6 @@ namespace Model partial void OnCreateDateChanged(); partial void OnCreateUserChanging(string value); partial void OnCreateUserChanged(); - partial void OnContractIdChanging(string value); - partial void OnContractIdChanged(); - partial void OnOrderInDateChanging(System.Nullable value); - partial void OnOrderInDateChanged(); - partial void OnOrderCodeChanging(string value); - partial void OnOrderCodeChanged(); - partial void OnOrderOutDateChanging(System.Nullable value); - partial void OnOrderOutDateChanged(); - partial void OnMaterialRequisitionUnitChanging(string value); - partial void OnMaterialRequisitionUnitChanged(); #endregion public PHTGL_Invoice() @@ -199714,6 +199249,106 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")] + public string ContractId + { + get + { + return this._ContractId; + } + set + { + if ((this._ContractId != value)) + { + this.OnContractIdChanging(value); + this.SendPropertyChanging(); + this._ContractId = value; + this.SendPropertyChanged("ContractId"); + this.OnContractIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")] + public string OrderCode + { + get + { + return this._OrderCode; + } + set + { + if ((this._OrderCode != value)) + { + this.OnOrderCodeChanging(value); + this.SendPropertyChanging(); + this._OrderCode = value; + this.SendPropertyChanged("OrderCode"); + this.OnOrderCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")] + public System.Nullable OrderInDate + { + get + { + return this._OrderInDate; + } + set + { + if ((this._OrderInDate != value)) + { + this.OnOrderInDateChanging(value); + this.SendPropertyChanging(); + this._OrderInDate = value; + this.SendPropertyChanged("OrderInDate"); + this.OnOrderInDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")] + public System.Nullable OrderOutDate + { + get + { + return this._OrderOutDate; + } + set + { + if ((this._OrderOutDate != value)) + { + this.OnOrderOutDateChanging(value); + this.SendPropertyChanging(); + this._OrderOutDate = value; + this.SendPropertyChanged("OrderOutDate"); + this.OnOrderOutDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")] + public string MaterialRequisitionUnit + { + get + { + return this._MaterialRequisitionUnit; + } + set + { + if ((this._MaterialRequisitionUnit != value)) + { + this.OnMaterialRequisitionUnitChanging(value); + this.SendPropertyChanging(); + this._MaterialRequisitionUnit = value; + this.SendPropertyChanged("MaterialRequisitionUnit"); + this.OnMaterialRequisitionUnitChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")] public System.Nullable State { @@ -199994,106 +199629,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")] - public string ContractId - { - get - { - return this._ContractId; - } - set - { - if ((this._ContractId != value)) - { - this.OnContractIdChanging(value); - this.SendPropertyChanging(); - this._ContractId = value; - this.SendPropertyChanged("ContractId"); - this.OnContractIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")] - public System.Nullable OrderInDate - { - get - { - return this._OrderInDate; - } - set - { - if ((this._OrderInDate != value)) - { - this.OnOrderInDateChanging(value); - this.SendPropertyChanging(); - this._OrderInDate = value; - this.SendPropertyChanged("OrderInDate"); - this.OnOrderInDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")] - public string OrderCode - { - get - { - return this._OrderCode; - } - set - { - if ((this._OrderCode != value)) - { - this.OnOrderCodeChanging(value); - this.SendPropertyChanging(); - this._OrderCode = value; - this.SendPropertyChanged("OrderCode"); - this.OnOrderCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")] - public System.Nullable OrderOutDate - { - get - { - return this._OrderOutDate; - } - set - { - if ((this._OrderOutDate != value)) - { - this.OnOrderOutDateChanging(value); - this.SendPropertyChanging(); - this._OrderOutDate = value; - this.SendPropertyChanged("OrderOutDate"); - this.OnOrderOutDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")] - public string MaterialRequisitionUnit - { - get - { - return this._MaterialRequisitionUnit; - } - set - { - if ((this._MaterialRequisitionUnit != value)) - { - this.OnMaterialRequisitionUnitChanging(value); - this.SendPropertyChanging(); - this._MaterialRequisitionUnit = value; - this.SendPropertyChanged("MaterialRequisitionUnit"); - this.OnMaterialRequisitionUnitChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -201472,7 +201007,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewResults", DbType="NVarChar(1000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewResults", DbType="NVarChar(50)")] public string ReviewResults { get @@ -260584,8 +260119,6 @@ namespace Model private System.Nullable _LogSource; - private EntityRef _Base_Project; - private EntityRef _Person_Persons; #region 可扩展性方法定义 @@ -260620,7 +260153,6 @@ namespace Model public Sys_Log() { - this._Base_Project = default(EntityRef); this._Person_Persons = default(EntityRef); OnCreated(); } @@ -260760,10 +260292,6 @@ namespace Model { if ((this._ProjectId != value)) { - if (this._Base_Project.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnProjectIdChanging(value); this.SendPropertyChanging(); this._ProjectId = value; @@ -260873,40 +260401,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_Log_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] - public Base_Project Base_Project - { - get - { - return this._Base_Project.Entity; - } - set - { - Base_Project previousValue = this._Base_Project.Entity; - if (((previousValue != value) - || (this._Base_Project.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Base_Project.Entity = null; - previousValue.Sys_Log.Remove(this); - } - this._Base_Project.Entity = value; - if ((value != null)) - { - value.Sys_Log.Add(this); - this._ProjectId = value.ProjectId; - } - else - { - this._ProjectId = default(string); - } - this.SendPropertyChanged("Base_Project"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_Log_Person_Persons", Storage="_Person_Persons", ThisKey="UserId", OtherKey="PersonId", IsForeignKey=true)] public Person_Persons Person_Persons { @@ -276860,7 +276354,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(300)")] public string MaterialCode { get @@ -320551,6 +320045,8 @@ namespace Model private string _States; + private string _WelderCode; + private string _YunMouState; public View_SitePerson_Person() @@ -321661,6 +321157,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderCode", DbType="NVarChar(50)")] + public string WelderCode + { + get + { + return this._WelderCode; + } + set + { + if ((this._WelderCode != value)) + { + this._WelderCode = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YunMouState", DbType="NVarChar(50)")] public string YunMouState { @@ -325518,7 +325030,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")] public string Name { get @@ -326095,7 +325607,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] public string PackageContent { get @@ -326286,7 +325798,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] public string PackageContent { get @@ -331625,7 +331137,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] public string PackageContent { get @@ -333097,7 +332609,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] public string PackageContent { get @@ -342998,7 +342510,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")] public string ContractNo { get @@ -343018,7 +342530,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")] public string UnitWorks { get