diff --git a/DataBase/版本日志/SGGLDB_V2026-06-10-gf.sql b/DataBase/版本日志/SGGLDB_V2026-06-10-gf.sql new file mode 100644 index 00000000..b6665845 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-06-10-gf.sql @@ -0,0 +1,111 @@ + +update Sys_Menu set Url='CQMS/PersonManage/WelderManage.aspx' where MenuId='1908E4C9-4A63-4A6C-6666-DA4910C2A8C7' +update Sys_Menu set SortIndex=11 where MenuId='1C6F9CA9-FDAC-4CE5-A19C-5536538851E1' +update Sys_Menu set Url='CQMS/PersonManage/CheckerManage.aspx' where MenuId='13F11D51-1B54-400F-BDBB-36685BC94819' +GO + +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/BaseInfo/PostTitleService.cs b/SGGL/BLL/BaseInfo/PostTitleService.cs index bfa43f49..0668fe8e 100644 --- a/SGGL/BLL/BaseInfo/PostTitleService.cs +++ b/SGGL/BLL/BaseInfo/PostTitleService.cs @@ -117,6 +117,26 @@ namespace BLL return PostTitleName; } + + /// + /// 根据职称ID得到职称名称 + /// + /// + /// + public static string getPostTitleNameById(Model.SGGLDB db, string PostTitleId) + { + string PostTitleName = string.Empty; + if (!string.IsNullOrEmpty(PostTitleId)) + { + var q = db.Base_PostTitle.FirstOrDefault(e => e.PostTitleId == PostTitleId); + if (q != null) + { + PostTitleName = q.PostTitleName; + } + } + + return PostTitleName; + } #endregion #region 表下拉框 diff --git a/SGGL/BLL/BaseInfo/WorkPostService.cs b/SGGL/BLL/BaseInfo/WorkPostService.cs index 73ab1e44..432acb51 100644 --- a/SGGL/BLL/BaseInfo/WorkPostService.cs +++ b/SGGL/BLL/BaseInfo/WorkPostService.cs @@ -309,6 +309,34 @@ namespace BLL return workPostName; } + + /// + /// 根据多岗位ID得到岗位名称字符串 + /// + /// + /// + public static string getWorkPostNamesWorkPostIds(Model.SGGLDB db, object workPostIds) + { + string workPostName = string.Empty; + if (workPostIds != null) + { + string[] ids = workPostIds.ToString().Split(','); + foreach (string id in ids) + { + var q = db.Base_WorkPost.FirstOrDefault(e => e.WorkPostId == id); + if (q != null) + { + workPostName += q.WorkPostName + ","; + } + } + if (workPostName != string.Empty) + { + workPostName = workPostName.Substring(0, workPostName.Length - 1); ; + } + } + + return workPostName; + } #endregion } } \ No newline at end of file diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs index ba9236e3..bb831001 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs @@ -841,7 +841,9 @@ namespace BLL Isprint = "0", States = person.States, IsSafetyMonitoring = person.IsSafetyMonitoring, + WelderCode = person.WelderCode, IsCQMSCheck = person.IsCQMSCheck, + IsWeldAudit = true, }; if (newPerson.WorkPostId == Const.WorkPost_Welder) diff --git a/SGGL/BLL/Person/Person_ShuntService.cs b/SGGL/BLL/Person/Person_ShuntService.cs index 4085b9b4..de559300 100644 --- a/SGGL/BLL/Person/Person_ShuntService.cs +++ b/SGGL/BLL/Person/Person_ShuntService.cs @@ -15,15 +15,7 @@ namespace BLL get; set; } - - /// - /// 定义变量 - /// - private static IQueryable getDataLists = from x in Funs.DB.Person_Persons - where x.PersonId != Const.sysglyId && x.PersonId != Const.hfnbdId && x.UnitId == Const.UnitId_SEDIN - && x.DepartId == Const.Depart_constructionId - && x.CurrentProjectId == null && (!x.IsOffice.HasValue || x.IsOffice == false) - select x; + /// /// 数据列表 @@ -38,7 +30,12 @@ namespace BLL /// public static IEnumerable getListData(string workPostId, string postTitleId, string name, string certificateId, Grid Grid1) { - IQueryable getDataList = getDataLists; + Model.SGGLDB db = Funs.DB; + IQueryable getDataList = from x in db.Person_Persons + where x.PersonId != Const.sysglyId && x.PersonId != Const.hfnbdId && x.UnitId == Const.UnitId_SEDIN + && x.DepartId == Const.Depart_constructionId + && x.CurrentProjectId == null && (!x.IsOffice.HasValue || x.IsOffice == false) + select x; if (!string.IsNullOrEmpty(workPostId) && workPostId != Const._Null) { getDataList = getDataList.Where(e => e.WorkPostId == workPostId); @@ -62,8 +59,8 @@ namespace BLL { return null; } - getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); - return from x in getDataList + var queryData = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize).ToList(); + return from x in queryData select new { x.PersonId, @@ -118,12 +115,55 @@ namespace BLL } } + /// + /// + /// + /// + /// + /// + public static string getCurrentProjectName(Model.SGGLDB db, string PersonId) + { + var getItem = (from x in db.SitePerson_PersonItem + where x.PersonId == PersonId + orderby x.InTime descending + select x).FirstOrDefault(); + if (getItem != null) + { + string name = string.Empty; + var project = db.Base_Project.FirstOrDefault(e => e.ProjectId == getItem.ProjectId); + if (project != null) + { + name = project.ShortName; + } + return name; + } + else + { + return null; + } + } + /// /// /// /// /// /// + public static string getCurrentProjectWorkPostName(Model.SGGLDB db, string PersonId) + { + var getItem = (from x in db.SitePerson_PersonItem + where x.PersonId == PersonId + orderby x.InTime descending + select x).FirstOrDefault(); + if (getItem != null) + { + return WorkPostService.getWorkPostNamesWorkPostIds(db, getItem.WorkPostId); + } + else + { + return null; + } + } public static string getCurrentProjectWorkPostName(string PersonId) { var getItem = (from x in Funs.DB.SitePerson_PersonItem diff --git a/SGGL/BLL/SysManage/RoleService.cs b/SGGL/BLL/SysManage/RoleService.cs index 53050916..51e907c6 100644 --- a/SGGL/BLL/SysManage/RoleService.cs +++ b/SGGL/BLL/SysManage/RoleService.cs @@ -151,6 +151,34 @@ return roleName; } + /// + /// 得到角色名称字符串 + /// + /// + /// + public static string getRoleNamesRoleIds(Model.SGGLDB db, object roleIds) + { + string roleName = string.Empty; + if (roleIds != null) + { + string[] roles = roleIds.ToString().Split(','); + foreach (string roleId in roles) + { + var q = db.Sys_Role.FirstOrDefault(x => x.RoleId == roleId); + if (q != null && !roleName.Contains(q.RoleName)) + { + roleName += q.RoleName + ","; + } + } + if (roleName != string.Empty) + { + roleName = roleName.Substring(0, roleName.Length - 1); ; + } + } + + return roleName; + } + /// /// 角色下拉框 /// diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls index d98e4ac4..33f6211f 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index f41730d4..dd0f9e5d 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -17182,7 +17182,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs index cdd7ea8a..3ba9a950 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs @@ -37,7 +37,7 @@ namespace FineUIPro.Web.HJGL.PersonManage Model.SitePerson_Person welder = BLL.SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, this.tvControlItem.SelectedNodeID); if (welder != null) { - //this.btnEdit.Hidden = false; + this.btnEdit.Hidden = false; //this.btnNew.Hidden = false; //this.btnDelete.Hidden = false; this.txtWelderCode.Text = welder.WelderCode; @@ -47,29 +47,33 @@ namespace FineUIPro.Web.HJGL.PersonManage { this.drpUnitId.Text = UnitService.GetUnitNameByUnitId(welder.UnitId); } - //this.rblSex.Text = welder.Sex == "1" ? "男" : "女"; - //if (welder.Birthday.HasValue) - //{ - // this.txtBirthday.Text = string.Format("{0:yyyy-MM-dd}", welder.Birthday); - //} - this.txtCertificateCode.Text = welder.CertificateCode; - //if (string.IsNullOrEmpty(welder.CertificateCode)) - //{ - // this.txtCertificateCode.Text = welder.IdentityCard; - //} - if (welder.CertificateLimitTime.HasValue) + Model.Person_Persons person = BLL.Person_PersonsService.GetPerson_PersonsById(welder.PersonId); + if (person != null) { - this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", welder.CertificateLimitTime); + this.rblSex.Text = person.Sex == "1" ? "男" : "女"; + if (person.Birthday.HasValue) + { + this.txtBirthday.Text = string.Format("{0:yyyy-MM-dd}", person.Birthday); + } + this.txtCertificateCode.Text = welder.CertificateCode; + if (string.IsNullOrEmpty(welder.CertificateCode)) + { + this.txtCertificateCode.Text = welder.CertificateCode; + } + if (welder.CertificateLimitTime.HasValue) + { + this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", welder.CertificateLimitTime); + } + this.txtWelderLevel.Text = welder.WelderLevel; + if (welder.States == Const.State_1) + { + cbIsOnDuty.Checked = true; + } + else + { + cbIsOnDuty.Checked = false; + } } - this.txtWelderLevel.Text = welder.WelderLevel; - //if (welder.IsUsed == true) - //{ - // cbIsOnDuty.Checked = true; - //} - //else - //{ - // cbIsOnDuty.Checked = false; - //} } else { diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs index 5ea2b913..4b17fc1b 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,9 @@ 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.IsWeldAudit = true; //newPerson.IsForeign = persons[i].IsForeign; //newPerson.IsOutside = persons[i].IsOutside; //newPerson.IsUsed = persons[i].IsUsedName == "是" ? true : false; diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml index ecd49324..a01be0df 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml @@ -7,22 +7,19 @@ - - - + + - - + - - - + + @@ -35,7 +32,7 @@ - + @@ -44,7 +41,6 @@ - diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 616c58fa..41256529 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 { @@ -113902,7 +113787,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 @@ -114028,7 +113913,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 @@ -165066,356 +164951,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 { @@ -167755,7 +167290,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 @@ -198762,7 +198297,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 @@ -198882,7 +198417,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 @@ -198942,7 +198477,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 @@ -199326,7 +198861,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 @@ -199631,6 +199166,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; @@ -199659,16 +199204,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); @@ -199677,6 +199212,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); @@ -199705,16 +199250,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() @@ -199762,6 +199297,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 { @@ -200042,106 +199677,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; @@ -201520,7 +201055,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 @@ -260632,8 +260167,6 @@ namespace Model private System.Nullable _LogSource; - private EntityRef _Base_Project; - private EntityRef _Person_Persons; #region 可扩展性方法定义 @@ -260668,7 +260201,6 @@ namespace Model public Sys_Log() { - this._Base_Project = default(EntityRef); this._Person_Persons = default(EntityRef); OnCreated(); } @@ -260808,10 +260340,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; @@ -260921,40 +260449,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 { @@ -276908,7 +276402,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 @@ -320623,6 +320117,8 @@ namespace Model private string _States; + private string _WelderCode; + private string _YunMouState; public View_SitePerson_Person() @@ -321733,6 +321229,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 { @@ -325590,7 +325102,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 @@ -326167,7 +325679,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 @@ -326358,7 +325870,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 @@ -331697,7 +331209,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 @@ -333169,7 +332681,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 @@ -343070,7 +342582,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 @@ -343090,7 +342602,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