diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-22-wq.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-22-wq.sql index 81ea6225..22597002 100644 --- a/DataBase/版本日志/SGGLDB_WH_2024-05-22-wq.sql +++ b/DataBase/版本日志/SGGLDB_WH_2024-05-22-wq.sql @@ -26,6 +26,6 @@ CREATE TABLE dbo.Division_SubProjects( CONSTRAINT [PK_Division_SubProjects] PRIMARY KEY CLUSTERED ( [DivisionId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] ) ON [PRIMARY] GO \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-23-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-23-bwj.sql new file mode 100644 index 00000000..1269914b --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-05-23-bwj.sql @@ -0,0 +1,31 @@ + +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('193BB4A7-B5F2-4A01-8E98-8010D073CA7A','4E0030F6-EF5E-40A6-939F-C29BC4D7CEE1','޸',1) +go + +--ȥʹò˵ +update Sys_Menu set IsUsed=0 where MenuId='27DE7248-C4FF-4288-BBAC-11CB8741AD67' --ר֤嵥 +update Sys_Menu set IsUsed=0 where MenuId='F910062E-98B0-486F-A8BD-D5B0035F808F'--֪ͨ +update Sys_Menu set IsUsed=0 where MenuId='F057C207-4549-48AE-B838-A1920E5709D8' --ϵ +update Sys_Menu set IsUsed=0 where MenuId='06958288-96F4-4291-909A-FFC2FC76814D'--ΥԱ¼ +update Sys_Menu set IsUsed=0 where MenuId='3EF6E488-21D2-47BB-AA33-4FB0E9FED606' --¼ӦԤ +update Sys_Menu set IsUsed=0 where MenuId='E1BBA25B-DAE5-4CFF-B72A-6C6044917D2B'--Ŀĵ +update Sys_Menu set IsUsed=0 where SuperMenu='E1BBA25B-DAE5-4CFF-B72A-6C6044917D2B' +update Sys_Menu set IsUsed=0 where SuperMenu='4EBDBF0A-53FC-4B86-BE6E-D6C16985A613' +update Sys_Menu set IsUsed=0 where MenuId='B2DA78EF-EECA-4AF4-9FAC-ECCFF1D6E459' --¼ +go + +update License_HSETechnical set TechnicalManId = (select userName from sys_user where UserId = TechnicalManId) +go +update License_HSETechnical set PartTechnicalManIds = (STUFF(( SELECT ',' + UserName FROM Sys_User +where PATINDEX('%,' + RTRIM(Sys_User.UserId) + ',%',',' + License_HSETechnical.PartTechnicalManIds + ',')>0 +ORDER BY PATINDEX('%,' + RTRIM(License_HSETechnical.HSETechnicalId) + ',%',',' + License_HSETechnical.PartTechnicalManIds + ',') +FOR XML PATH('')), 1, 1,'')) +go + +update Sys_Menu set IsUsed=0 where MenuId='D5DD5EBD-A5F2-4A43-BA4C-E9A242B43684' --HSE +go +--HSEݲ밲ȫ쵼С +--insert into Meeting_SafetyLeaderGroupMeeting(SafetyLeaderGroupMeetingId,ProjectId,SafetyLeaderGroupMeetingCode,SafetyLeaderGroupMeetingName,SafetyLeaderGroupMeetingDate,CompileMan,SafetyLeaderGroupMeetingContents,CompileDate,States,AttentPersonNum,MeetingHours,MeetingHostMan,AttentPerson,MeetingPlace,UnitId,MeetingHostManId,AttentPersonIds) +--select MonthMeetingId,ProjectId,MonthMeetingCode,MonthMeetingName,MonthMeetingDate,CompileMan,MonthMeetingContents,CompileDate,States,AttentPersonNum,MeetingHours,MeetingHostMan,AttentPerson,MeetingPlace,UnitId,MeetingHostManId,AttentPersonIds from Meeting_MonthMeeting +--go diff --git a/SGGL/BLL/BoSheng/BOSHENGService.cs b/SGGL/BLL/BoSheng/BOSHENGService.cs index 302d6d13..c782cfe5 100644 --- a/SGGL/BLL/BoSheng/BOSHENGService.cs +++ b/SGGL/BLL/BoSheng/BOSHENGService.cs @@ -1,4 +1,5 @@ using FineUIPro; +using Model; using System; using System.Collections; using System.Linq; @@ -22,7 +23,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getUnits = from x in db.Bo_Sheng_Unit + private static IQueryable getUnits = from x in db.Bo_Sheng_Unit where (x.DeleteTag == "False" || x.DeleteTag == null) select x; @@ -173,7 +174,7 @@ namespace BLL IsOutName = x.IsOut == "1" ? "是" : "否", x.LeaveDate, x.IsBlackList, - IsBlackListName =x.IsBlackList == "1" ? "是" : "否", + IsBlackListName = x.IsBlackList == "1" ? "是" : "否", x.AgreementId, x.HasInsurance, x.DeviceNumber, @@ -184,6 +185,7 @@ namespace BLL x.UploadTime, }; } + #endregion #region 获取培训记录列表 @@ -238,7 +240,7 @@ namespace BLL x.RecordName, x.TrainType, x.PaperMode, - PaperModeName = x.PaperMode=="0"? "使用原卷" : "重新出卷", + PaperModeName = x.PaperMode == "0" ? "使用原卷" : "重新出卷", x.TrainMode, x.TrainPrincipal, x.TrainStartDate, @@ -291,7 +293,7 @@ namespace BLL /// 页码 /// 每页数量 /// - public static IEnumerable getTrainPersonListData(string projectId,string departName, string name, string identifyID, Grid Grid1) + public static IEnumerable getTrainPersonListData(string projectId, string departName, string name, string identifyID, Grid Grid1) { IQueryable getDataList = getTrainPersons.Where(x => x.ProjectId == projectId); if (!string.IsNullOrEmpty(departName)) @@ -335,7 +337,7 @@ namespace BLL x.SignInType, x.TrainPeriod, x.State, - StateName= x.State=="0"? "正常" : "补签", + StateName = x.State == "0" ? "正常" : "补签", x.TotalScore, x.PassScore, x.Score, @@ -369,8 +371,8 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getExams = from x in db.Bo_Sheng_Exam - where (x.DeleteTag == "False" || x.DeleteTag == null) + private static IQueryable getExams = from x in db.Bo_Sheng_Exam + where (x.DeleteTag == "False" || x.DeleteTag == null) select x; /// @@ -379,7 +381,7 @@ namespace BLL /// 页码 /// 每页数量 /// - public static IEnumerable getExamListData(string projectId, string qsnCode,string qsnContent, Grid Grid1) + public static IEnumerable getExamListData(string projectId, string qsnCode, string qsnContent, Grid Grid1) { IQueryable getDataList = getExams.Where(x => x.ProjectId == projectId); @@ -414,7 +416,7 @@ namespace BLL x.QsnFileName, x.QsnAnswer, x.QsnCategory, - QsnCategoryName= x.QsnCategory=="3"? "图片题" : (x.QsnCategory == "2"? "多媒体题" : "文字题"), + QsnCategoryName = x.QsnCategory == "3" ? "图片题" : (x.QsnCategory == "2" ? "多媒体题" : "文字题"), x.QsnKind, QsnKindName = x.QsnKind == "3" ? "判断" : (x.QsnCategory == "2" ? "多选" : "单选"), x.QsnImportant, @@ -439,8 +441,8 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getPersonTrainRecords = from x in db.Bo_Sheng_PersonTrainRecord - where (x.DeleteTag == "False" || x.DeleteTag == null) + private static IQueryable getPersonTrainRecords = from x in db.Bo_Sheng_PersonTrainRecord + where (x.DeleteTag == "False" || x.DeleteTag == null) select x; /// @@ -508,5 +510,49 @@ namespace BLL }; } #endregion + + /// + /// 根据主键获取博晟人员信息 + /// + /// + /// + public static Model.Bo_Sheng_Person GetBoPersonById(string id) + { + return Funs.DB.Bo_Sheng_Person.FirstOrDefault(e => e.ID == id); + } + + /// + /// 修改博晟人员信息 + /// + /// + /// + public static void UpdateBoPerson(Bo_Sheng_Person person) + { + Model.Bo_Sheng_Person newPerson = Funs.DB.Bo_Sheng_Person.FirstOrDefault(e => e.ID == person.ID); + if (newPerson != null) + { + newPerson.Name = person.Name; + newPerson.DepartName = person.DepartName; + newPerson.IdentifyID = person.IdentifyID; + newPerson.Sex = person.Sex; + newPerson.BirthDay = person.BirthDay; + newPerson.Station = person.Station; + newPerson.Address = person.Address; + newPerson.Police = person.Police; + newPerson.ValidPeriodStart = person.ValidPeriodStart; + newPerson.ValidPeriodEnd = person.ValidPeriodEnd; + newPerson.Telephone = person.Telephone; + newPerson.JobNumber = person.JobNumber; + newPerson.NewAddress = person.NewAddress; + newPerson.RegisterDate = person.RegisterDate; + newPerson.CategoryLevel = person.CategoryLevel; + newPerson.EntranceDate = person.EntranceDate; + newPerson.LeaveDate = person.LeaveDate; + newPerson.IsOut = person.IsOut; + newPerson.IsBlackList = person.IsBlackList; + newPerson.UploadTime = person.UploadTime; + Funs.DB.SubmitChanges(); + } + } } } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index f1bc27e2..35d4ddf2 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -2637,6 +2637,13 @@ namespace BLL + #endregion + + #region 博晟培训考试 + /// + /// 人员信息 + /// + public const string BoPersonMenuId = "4E0030F6-EF5E-40A6-939F-C29BC4D7CEE1"; #endregion #endregion diff --git a/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx b/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx index 3981bd7b..954102cd 100644 --- a/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx +++ b/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx @@ -18,7 +18,7 @@ runat="server" BoxFlex="1" DataKeyNames="ID" AllowPaging="true" IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" DataIDField="ID" AllowSorting="true" SortField="Name" EnableTextSelection="True" - SortDirection="ASC" EnableColumnLines="true" OnSort="Grid1_Sort"> + SortDirection="ASC" EnableColumnLines="true" OnSort="Grid1_Sort" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"> @@ -109,7 +109,10 @@ FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="上传时间" HeaderTextAlign="Center" TextAlign="Center"> - + + + + @@ -121,7 +124,28 @@ - + + + + + + diff --git a/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.cs b/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.cs index 640b052b..1dc310c4 100644 --- a/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.cs @@ -16,6 +16,7 @@ namespace FineUIPro.Web.BoSheng { if (!IsPostBack) { + GetButtonPower(); Funs.DropDownPageSize(this.ddlPageSize); //this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); //this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); @@ -90,5 +91,61 @@ namespace FineUIPro.Web.BoSheng this.GridBind(); } #endregion + + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + this.GridBind(); + } + + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + var person = BLL.BOSHENGService.GetBoPersonById(id); + if (person != null) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("BoPersonEdit.aspx?id={0}", id, "编辑 - "))); + } + } + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.BoPersonMenuId); + if (buttonList.Count > 0) + { + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuEdit.Hidden = false; + } + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.designer.cs b/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.designer.cs index bd0e1732..7741bcbe 100644 --- a/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.designer.cs @@ -137,5 +137,32 @@ namespace FineUIPro.Web.BoSheng { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; } } diff --git a/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx b/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx new file mode 100644 index 00000000..1d35e155 --- /dev/null +++ b/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx @@ -0,0 +1,96 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BoPersonEdit.aspx.cs" Inherits="FineUIPro.Web.BoSheng.BoPersonEdit" %> + + + + + + + 修改博晟人员信息 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.cs new file mode 100644 index 00000000..ada42750 --- /dev/null +++ b/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.cs @@ -0,0 +1,127 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.BoSheng +{ + public partial class BoPersonEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string Id + { + get + { + return (string)ViewState["Id"]; + } + set + { + ViewState["Id"] = value; + } + } + #endregion + + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.Id = Request.Params["id"]; + if (!string.IsNullOrEmpty(this.Id)) + { + Model.Bo_Sheng_Person person = BLL.BOSHENGService.GetBoPersonById(this.Id); + if (person != null) + { + this.txtName.Text = person.Name; + this.txtDepartName.Text = person.DepartName; + this.txtIdentifyID.Text = person.IdentifyID; + this.rblSex.SelectedValue = person.Sex; + this.txtBirthDay.Text = person.BirthDay.HasValue ? string.Format("{0:yyyy-MM-dd}", person.BirthDay) : ""; + this.txtStation.Text = person.Station; + this.txtAddress.Text = person.Address; + this.txtPolice.Text = person.Police; + this.txtValidPeriodStart.Text = string.Format("{0:yyyy-MM-dd}", person.ValidPeriodStart); + this.txtValidPeriodEnd.Text = string.Format("{0:yyyy-MM-dd}", person.ValidPeriodEnd); + this.txtTelephone.Text = person.Telephone; + this.txtJobNumber.Text = person.JobNumber; + this.txtNewAddress.Text = person.NewAddress; + this.txtRegisterDate.Text = person.RegisterDate.HasValue ? string.Format("{0:yyyy-MM-dd HH:mm:ss}", person.RegisterDate) : ""; + this.txtCategoryLevel.Text = person.CategoryLevel; + this.txtEntranceDate.Text = person.EntranceDate.HasValue ? string.Format("{0:yyyy-MM-dd HH:mm:ss}", person.EntranceDate) : ""; + this.txtLeaveDate.Text = person.LeaveDate.HasValue ? string.Format("{0:yyyy-MM-dd hh:mm:ss}", person.LeaveDate) : ""; + if (person.IsOut == "1") + { + this.cbIsOutName.Checked = true; + } + if (person.IsBlackList == "1") + { + this.cbIsBlackListName.Checked = true; + } + this.txtUploadTime.Text = person.UploadTime.HasValue ? string.Format("{0:yyyy-MM-dd HH:mm:ss}", person.UploadTime) : ""; + } + } + } + } + + + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + Model.Bo_Sheng_Person person = BLL.BOSHENGService.GetBoPersonById(this.Id); + if (person != null) + { + person.ID = this.Id; + person.Name = this.txtName.Text.Trim(); + person.DepartName = this.txtDepartName.Text.Trim(); + person.IdentifyID = this.txtIdentifyID.Text.Trim(); + person.Sex = this.rblSex.SelectedValue; + person.BirthDay = Funs.GetNewDateTime(this.txtBirthDay.Text.Trim()); + person.Station = this.txtStation.Text.Trim(); + person.Address = this.txtAddress.Text.Trim(); + person.Police = this.txtPolice.Text.Trim(); + person.ValidPeriodStart =this.txtValidPeriodStart.Text.Trim(); + person.ValidPeriodEnd = this.txtValidPeriodEnd.Text.Trim(); + person.Telephone = this.txtTelephone.Text.Trim(); + person.JobNumber = this.txtJobNumber.Text.Trim(); + person.NewAddress = this.txtNewAddress.Text.Trim(); + if (!string.IsNullOrEmpty(this.txtRegisterDate.Text)) + { + person.RegisterDate = Convert.ToDateTime(this.txtRegisterDate.Text); + } + person.CategoryLevel = this.txtCategoryLevel.Text.Trim(); + if (!string.IsNullOrEmpty(this.txtEntranceDate.Text)) + { + person.EntranceDate = Convert.ToDateTime(this.txtEntranceDate.Text); + } + if (!string.IsNullOrEmpty(this.txtLeaveDate.Text)) + { + person.LeaveDate = Convert.ToDateTime(this.txtLeaveDate.Text); + } + person.IsOut = this.cbIsOutName.Checked? "1" : "0"; + person.IsBlackList = this.cbIsBlackListName.Checked ? "1" : "0"; + if (!string.IsNullOrEmpty(this.txtUploadTime.Text)) + { + person.UploadTime = Convert.ToDateTime(this.txtUploadTime.Text); + } + BLL.BOSHENGService.UpdateBoPerson(person); + ShowNotify("修改成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.designer.cs new file mode 100644 index 00000000..3c90296c --- /dev/null +++ b/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.designer.cs @@ -0,0 +1,258 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.BoSheng { + + + public partial class BoPersonEdit { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtName; + + /// + /// txtDepartName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDepartName; + + /// + /// txtIdentifyID 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtIdentifyID; + + /// + /// rblSex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rblSex; + + /// + /// txtBirthDay 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtBirthDay; + + /// + /// txtStation 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtStation; + + /// + /// txtAddress 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAddress; + + /// + /// txtPolice 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPolice; + + /// + /// txtValidPeriodStart 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtValidPeriodStart; + + /// + /// txtValidPeriodEnd 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtValidPeriodEnd; + + /// + /// txtTelephone 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTelephone; + + /// + /// txtJobNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtJobNumber; + + /// + /// txtNewAddress 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtNewAddress; + + /// + /// txtRegisterDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtRegisterDate; + + /// + /// txtCategoryLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCategoryLevel; + + /// + /// txtEntranceDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEntranceDate; + + /// + /// cbIsOutName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox cbIsOutName; + + /// + /// txtLeaveDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtLeaveDate; + + /// + /// cbIsBlackListName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox cbIsBlackListName; + + /// + /// txtUploadTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtUploadTime; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx b/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx index dadefa25..280f9fd3 100644 --- a/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx +++ b/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx @@ -30,6 +30,8 @@ + +
diff --git a/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.cs b/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.cs index ef141882..e8a3cd9b 100644 --- a/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.cs +++ b/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.cs @@ -90,5 +90,17 @@ namespace FineUIPro.Web.BoSheng this.GridBind(); } #endregion + + #region 同步培训记录 + /// + /// 同步培训记录 + /// + /// + /// + protected void btnRefresh_Click(object sender, EventArgs e) + { + BOSHENGMonitorService.AddData(null, null); + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.designer.cs b/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.designer.cs index adc89545..7bb4074a 100644 --- a/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.designer.cs @@ -93,6 +93,15 @@ namespace FineUIPro.Web.BoSheng { /// protected global::FineUIPro.Button btnOut; + /// + /// btnRefresh 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnRefresh; + /// /// labNumber 控件。 /// diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 1e2448d5..6faf9b3a 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -249,6 +249,7 @@ + @@ -581,6 +582,8 @@ + + @@ -6645,6 +6648,13 @@ BoExam.aspx + + BoPersonEdit.aspx + ASPXCodeBehind + + + BoPersonEdit.aspx + BoPersonTrainRecord.aspx ASPXCodeBehind @@ -8472,6 +8482,19 @@ ControlPoint.aspx + + DivisionSubProjects.aspx + + + DivisionSubProjects.aspx + + + DivisionSubProjectsEdit.aspx + ASPXCodeBehind + + + DivisionSubProjectsEdit.aspx + PointCropping.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index b8cc84be..b52b49a8 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true false diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx index db7589f0..bec5b9c3 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx @@ -154,9 +154,9 @@ - - + --%> /// /// - protected void btnUploadResources_Click(object sender, EventArgs e) - { - if (string.IsNullOrEmpty(this.PunishNoticeId)) - { - this.PunishNoticeId = SQLHelper.GetNewID(typeof(Model.Check_RectifyNotices)); - } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PunishNotice&menuId=" + Const.ProjectPunishNoticeMenuId, this.PunishNoticeId))); - } + //protected void btnUploadResources_Click(object sender, EventArgs e) + //{ + // if (string.IsNullOrEmpty(this.PunishNoticeId)) + // { + // this.PunishNoticeId = SQLHelper.GetNewID(typeof(Model.Check_RectifyNotices)); + // } + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PunishNotice&menuId=" + Const.ProjectPunishNoticeMenuId, this.PunishNoticeId))); + //} /// /// 通知单上传附件资源 diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.designer.cs index fb00bd49..708499e1 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.designer.cs @@ -237,15 +237,6 @@ namespace FineUIPro.Web.HSSE.Check { /// protected global::FineUIPro.Button btnPunishNoticeUrl; - /// - /// btnAttachUrl 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx index d70ef9e8..2ea4e605 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx @@ -166,9 +166,9 @@ - - + --%> /// /// - protected void btnUploadResources_Click(object sender, EventArgs e) - { + //protected void btnUploadResources_Click(object sender, EventArgs e) + //{ - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PunishNotice&menuId=" + Const.ProjectPunishNoticeMenuId, this.PunishNoticeId))); - } + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PunishNotice&menuId=" + Const.ProjectPunishNoticeMenuId, this.PunishNoticeId))); + //} /// /// 通知单上传附件资源 diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.designer.cs index 378c4a31..5b1f42f0 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.designer.cs @@ -309,15 +309,6 @@ namespace FineUIPro.Web.HSSE.Check { /// protected global::FineUIPro.Button btnPunishNoticeUrl; - /// - /// btnAttachUrl 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx index 3079f984..4ac3428f 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx @@ -71,7 +71,7 @@ - + @@ -123,9 +123,9 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.cs index 7b7b2350..07c780d2 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.cs @@ -88,11 +88,11 @@ namespace FineUIPro.Web.HSSE.Check { this.txtSignMan.Text = user1.UserName; } - Model.Sys_User user2 = BLL.UserService.GetUserByUserId(punishNotice.ApproveMan); - if (user2 != null) - { - this.txtApproveMan.Text = user2.UserName; - } + //Model.Sys_User user2 = BLL.UserService.GetUserByUserId(punishNotice.ApproveMan); + //if (user2 != null) + //{ + // this.txtApproveMan.Text = user2.UserName; + //} if (punishNotice.PunishMoney != null) { this.txtPunishMoney.Text = Convert.ToString(punishNotice.PunishMoney); @@ -144,10 +144,10 @@ namespace FineUIPro.Web.HSSE.Check /// /// /// - protected void btnUploadResources_Click(object sender, EventArgs e) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PunishNotice&type=-1&menuId=" + BLL.Const.ProjectPunishNoticeMenuId, this.PunishNoticeId))); - } + //protected void btnUploadResources_Click(object sender, EventArgs e) + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PunishNotice&type=-1&menuId=" + BLL.Const.ProjectPunishNoticeMenuId, this.PunishNoticeId))); + //} /// /// 通知单上传附件资源 diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.designer.cs index e39743d1..193398b0 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.designer.cs @@ -192,15 +192,6 @@ namespace FineUIPro.Web.HSSE.Check { /// protected global::FineUIPro.Button btnPunishNoticeUrl; - /// - /// btnAttachUrl 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx index 1160a2e6..42acd00a 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx @@ -37,17 +37,19 @@ - + <%----%> + - - - + --%> + + diff --git a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs index 14862eb8..44c5882f 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs @@ -65,7 +65,7 @@ namespace FineUIPro.Web.HSSE.License if (!string.IsNullOrEmpty(hseTechnical.UnitId)) { this.drpUnitId.SelectedValue = hseTechnical.UnitId; - UserService.InitUserProjectIdUnitIdDropDownList(this.drpTechnicalMan, this.ProjectId, this.drpUnitId.SelectedValue, true); + //UserService.InitUserProjectIdUnitIdDropDownList(this.drpTechnicalMan, this.ProjectId, this.drpUnitId.SelectedValue, true); TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroupId, this.ProjectId, this.drpUnitId.SelectedValue, true); } if (!string.IsNullOrEmpty(hseTechnical.TeamGroupId)) @@ -74,11 +74,13 @@ namespace FineUIPro.Web.HSSE.License } if (!string.IsNullOrEmpty(hseTechnical.TechnicalManId)) { - this.drpTechnicalMan.SelectedValue = hseTechnical.TechnicalManId; + //this.drpTechnicalMan.SelectedValue = hseTechnical.TechnicalManId; + this.txtTechnicalMan.Text = hseTechnical.TechnicalManId; } if (!string.IsNullOrEmpty(hseTechnical.PartTechnicalManIds)) { - this.drpPartTechnicalMans.SelectedValueArray = hseTechnical.PartTechnicalManIds.Split(','); + this.txtPartTechnicalMans.Text = hseTechnical.PartTechnicalManIds; + //this.drpPartTechnicalMans.SelectedValueArray = hseTechnical.PartTechnicalManIds.Split(','); } this.txtPartTechnicalManNames.Text = hseTechnical.PartTechnicalManNames; this.txtWorkContents.Text = hseTechnical.WorkContents; @@ -108,7 +110,7 @@ namespace FineUIPro.Web.HSSE.License { UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true); //参加人员 - UserService.InitUserDropDownList(this.drpPartTechnicalMans, this.ProjectId, true); + //UserService.InitUserDropDownList(this.drpPartTechnicalMans, this.ProjectId, true); } #region 保存 @@ -160,10 +162,11 @@ namespace FineUIPro.Web.HSSE.License { hSETechnical.TeamGroupId = this.drpTeamGroupId.SelectedValue; } - if (this.drpTechnicalMan.SelectedValue != BLL.Const._Null) - { - hSETechnical.TechnicalManId = this.drpTechnicalMan.SelectedValue; - } + //if (this.drpTechnicalMan.SelectedValue != BLL.Const._Null) + //{ + //hSETechnical.TechnicalManId = this.drpTechnicalMan.SelectedValue; + //} + hSETechnical.TechnicalManId = this.txtTechnicalMan.Text.Trim(); hSETechnical.WorkContents = this.txtWorkContents.Text.Trim(); hSETechnical.Address = this.txtAddress.Text.Trim(); hSETechnical.CompileMan = this.CurrUser.UserId; @@ -175,19 +178,20 @@ namespace FineUIPro.Web.HSSE.License } ///组成员 - string partInManIds = string.Empty; - foreach (var item in this.drpPartTechnicalMans.SelectedValueArray) - { - var user = BLL.UserService.GetUserByUserId(item); - if (user != null) - { - partInManIds += user.UserId + ","; - } - } - if (!string.IsNullOrEmpty(partInManIds)) - { - hSETechnical.PartTechnicalManIds = partInManIds.Substring(0, partInManIds.LastIndexOf(",")); - } + //string partInManIds = string.Empty; + //foreach (var item in this.drpPartTechnicalMans.SelectedValueArray) + //{ + // var user = BLL.UserService.GetUserByUserId(item); + // if (user != null) + // { + // partInManIds += user.UserId + ","; + // } + //} + //if (!string.IsNullOrEmpty(partInManIds)) + //{ + // hSETechnical.PartTechnicalManIds = partInManIds.Substring(0, partInManIds.LastIndexOf(",")); + //} + hSETechnical.PartTechnicalManIds = this.txtPartTechnicalMans.Text.Trim(); hSETechnical.PartTechnicalManNames = this.txtPartTechnicalManNames.Text.Trim(); if (!string.IsNullOrEmpty(this.HSETechnicalId)) @@ -232,24 +236,24 @@ namespace FineUIPro.Web.HSSE.License protected void drpUnitId_SelectedIndexChanged(object sender, EventArgs e) { this.drpTeamGroupId.Items.Clear(); - this.drpTechnicalMan.Items.Clear(); + //this.drpTechnicalMan.Items.Clear(); if (this.drpUnitId.SelectedValue != BLL.Const._Null) { - UserService.InitUserProjectIdUnitIdDropDownList(this.drpTechnicalMan, this.ProjectId, this.drpUnitId.SelectedValue, true); + //UserService.InitUserProjectIdUnitIdDropDownList(this.drpTechnicalMan, this.ProjectId, this.drpUnitId.SelectedValue, true); TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroupId, this.ProjectId, this.drpUnitId.SelectedValue, true); } else { Funs.FineUIPleaseSelect(this.drpTeamGroupId); - Funs.FineUIPleaseSelect(this.drpTechnicalMan); + //Funs.FineUIPleaseSelect(this.drpTechnicalMan); } this.drpTeamGroupId.SelectedIndex = 0; - this.drpTechnicalMan.SelectedIndex = 0; + //this.drpTechnicalMan.SelectedIndex = 0; } - protected void drpPartTechnicalMans_SelectedIndexChanged(object sender, EventArgs e) - { - this.drpPartTechnicalMans.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpPartTechnicalMans.SelectedValueArray); - } + //protected void drpPartTechnicalMans_SelectedIndexChanged(object sender, EventArgs e) + //{ + // this.drpPartTechnicalMans.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpPartTechnicalMans.SelectedValueArray); + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.designer.cs index 9b9a0857..d64ec59b 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.designer.cs @@ -76,13 +76,13 @@ namespace FineUIPro.Web.HSSE.License { protected global::FineUIPro.DropDownList drpTeamGroupId; /// - /// drpTechnicalMan 控件。 + /// txtTechnicalMan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpTechnicalMan; + protected global::FineUIPro.TextBox txtTechnicalMan; /// /// lbHid 控件。 @@ -94,13 +94,13 @@ namespace FineUIPro.Web.HSSE.License { protected global::FineUIPro.Label lbHid; /// - /// drpPartTechnicalMans 控件。 + /// txtPartTechnicalMans 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpPartTechnicalMans; + protected global::FineUIPro.TextBox txtPartTechnicalMans; /// /// txtPartTechnicalManNames 控件。 diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx index ae61c5fb..ba4b146c 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx @@ -58,12 +58,12 @@ - - + --%> protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx index 39b3e05f..d6dc52f8 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx @@ -59,12 +59,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.cs index befb9db9..d7160ba1 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.cs @@ -78,20 +78,20 @@ namespace FineUIPro.Web.HSSE.Meeting } #endregion - protected void btnAttachUrl1_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(this.AttendMeetingId)) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.AttendMeetingId, BLL.Const.ProjectAttendMeetingMenuId))); - } - } + //protected void btnAttachUrl1_Click(object sender, EventArgs e) + //{ + // if (!string.IsNullOrEmpty(this.AttendMeetingId)) + // { + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.AttendMeetingId, BLL.Const.ProjectAttendMeetingMenuId))); + // } + //} - protected void btnAttachUrl2_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(this.AttendMeetingId)) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.AttendMeetingId, BLL.Const.ProjectAttendMeetingMenuId))); - } - } + //protected void btnAttachUrl2_Click(object sender, EventArgs e) + //{ + // if (!string.IsNullOrEmpty(this.AttendMeetingId)) + // { + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.AttendMeetingId, BLL.Const.ProjectAttendMeetingMenuId))); + // } + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.designer.cs index 477ee12b..bd7d485e 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.designer.cs @@ -129,24 +129,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx index f76c2896..b6572644 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx @@ -75,12 +75,12 @@ - - + --%> protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx index 4aa02312..6a21b7dd 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx @@ -73,12 +73,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs index 4d92941c..ec1634db 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs @@ -84,14 +84,14 @@ namespace FineUIPro.Web.HSSE.Meeting } #endregion - protected void btnAttachUrl1_Click(object sender, EventArgs e) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId))); - } + //protected void btnAttachUrl1_Click(object sender, EventArgs e) + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId))); + //} - protected void btnAttachUrl2_Click(object sender, EventArgs e) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId))); - } + //protected void btnAttachUrl2_Click(object sender, EventArgs e) + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId))); + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.designer.cs index a176fca1..4151ed0e 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.designer.cs @@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx index cab19f70..bf8b8b0f 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx @@ -73,12 +73,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.cs index a3a70c97..08ee2fd1 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.cs @@ -195,23 +195,23 @@ namespace FineUIPro.Web.HSSE.Meeting } #endregion - protected void btnAttachUrl1_Click(object sender, EventArgs e) - { - if (string.IsNullOrEmpty(this.MonthMeetingId)) - { - SaveData(Const.BtnSave); - } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.MonthMeetingId, Const.ProjectMonthMeetingMenuId))); - } + //protected void btnAttachUrl1_Click(object sender, EventArgs e) + //{ + // if (string.IsNullOrEmpty(this.MonthMeetingId)) + // { + // SaveData(Const.BtnSave); + // } + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.MonthMeetingId, Const.ProjectMonthMeetingMenuId))); + //} - protected void btnAttachUrl2_Click(object sender, EventArgs e) - { - if (string.IsNullOrEmpty(this.MonthMeetingId)) - { - SaveData(Const.BtnSave); - } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.MonthMeetingId, Const.ProjectMonthMeetingMenuId))); - } + //protected void btnAttachUrl2_Click(object sender, EventArgs e) + //{ + // if (string.IsNullOrEmpty(this.MonthMeetingId)) + // { + // SaveData(Const.BtnSave); + // } + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.MonthMeetingId, Const.ProjectMonthMeetingMenuId))); + //} /// /// 计算参会人数 diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.designer.cs index a4c3f748..ca05a371 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.designer.cs @@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx index 92a6e322..0fe85a2e 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx @@ -71,12 +71,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.cs index 1f53012c..77ae5eb6 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.cs @@ -85,20 +85,20 @@ namespace FineUIPro.Web.HSSE.Meeting } #endregion - protected void btnAttachUrl1_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(this.MonthMeetingId)) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.MonthMeetingId, BLL.Const.ProjectMonthMeetingMenuId))); - } - } + //protected void btnAttachUrl1_Click(object sender, EventArgs e) + //{ + // if (!string.IsNullOrEmpty(this.MonthMeetingId)) + // { + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.MonthMeetingId, BLL.Const.ProjectMonthMeetingMenuId))); + // } + //} - protected void btnAttachUrl2_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(this.MonthMeetingId)) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.MonthMeetingId, BLL.Const.ProjectMonthMeetingMenuId))); - } - } + //protected void btnAttachUrl2_Click(object sender, EventArgs e) + //{ + // if (!string.IsNullOrEmpty(this.MonthMeetingId)) + // { + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.MonthMeetingId, BLL.Const.ProjectMonthMeetingMenuId))); + // } + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.designer.cs index efba2588..57e0bc7c 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.designer.cs @@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx index 663f3272..25601351 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx @@ -63,12 +63,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.cs index 0bf72b55..29bad072 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.cs @@ -185,23 +185,23 @@ namespace FineUIPro.Web.HSSE.Meeting } #endregion - protected void btnAttachUrl1_Click(object sender, EventArgs e) - { - if (string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId)) - { - SaveData(Const.BtnSave); - } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.SafetyLeaderGroupMeetingId, Const.ProjectSafetyLeaderGroupMeetingMenuId))); - } + //protected void btnAttachUrl1_Click(object sender, EventArgs e) + //{ + // if (string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId)) + // { + // SaveData(Const.BtnSave); + // } + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.SafetyLeaderGroupMeetingId, Const.ProjectSafetyLeaderGroupMeetingMenuId))); + //} - protected void btnAttachUrl2_Click(object sender, EventArgs e) - { - if (string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId)) - { - SaveData(Const.BtnSave); - } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.SafetyLeaderGroupMeetingId, Const.ProjectSafetyLeaderGroupMeetingMenuId))); - } + //protected void btnAttachUrl2_Click(object sender, EventArgs e) + //{ + // if (string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId)) + // { + // SaveData(Const.BtnSave); + // } + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.SafetyLeaderGroupMeetingId, Const.ProjectSafetyLeaderGroupMeetingMenuId))); + //} /// /// 计算参会人数 diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.designer.cs index 867b6d31..114b7a60 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.designer.cs @@ -147,24 +147,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx index 2c616e17..248f20dc 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx @@ -61,12 +61,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.cs index 81a1f9e6..35be83b8 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.cs @@ -82,20 +82,20 @@ namespace FineUIPro.Web.HSSE.Meeting } #endregion - protected void btnAttachUrl1_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId)) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.SafetyLeaderGroupMeetingId, BLL.Const.ProjectSafetyLeaderGroupMeetingMenuId))); - } - } + //protected void btnAttachUrl1_Click(object sender, EventArgs e) + //{ + // if (!string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId)) + // { + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.SafetyLeaderGroupMeetingId, BLL.Const.ProjectSafetyLeaderGroupMeetingMenuId))); + // } + //} - protected void btnAttachUrl2_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId)) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.SafetyLeaderGroupMeetingId, BLL.Const.ProjectSafetyLeaderGroupMeetingMenuId))); - } - } + //protected void btnAttachUrl2_Click(object sender, EventArgs e) + //{ + // if (!string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId)) + // { + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.SafetyLeaderGroupMeetingId, BLL.Const.ProjectSafetyLeaderGroupMeetingMenuId))); + // } + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.designer.cs index f5a28569..b77b338b 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.designer.cs @@ -147,24 +147,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx index 1b03c7dc..c83b35d6 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx @@ -73,12 +73,12 @@ - - + --%> /// 计算参会人数 diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx.designer.cs index 4aeea242..741598c6 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx.designer.cs @@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx index 3481d664..6e38895d 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx @@ -72,12 +72,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.cs index fb09655e..743f4027 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.cs @@ -86,20 +86,20 @@ namespace FineUIPro.Web.HSSE.Meeting } #endregion - protected void btnAttachUrl1_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(this.SpecialMeetingId)) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.SpecialMeetingId, BLL.Const.ProjectSpecialMeetingMenuId))); - } - } + //protected void btnAttachUrl1_Click(object sender, EventArgs e) + //{ + // if (!string.IsNullOrEmpty(this.SpecialMeetingId)) + // { + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.SpecialMeetingId, BLL.Const.ProjectSpecialMeetingMenuId))); + // } + //} - protected void btnAttachUrl2_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(this.SpecialMeetingId)) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.SpecialMeetingId, BLL.Const.ProjectSpecialMeetingMenuId))); - } - } + //protected void btnAttachUrl2_Click(object sender, EventArgs e) + //{ + // if (!string.IsNullOrEmpty(this.SpecialMeetingId)) + // { + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.SpecialMeetingId, BLL.Const.ProjectSpecialMeetingMenuId))); + // } + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.designer.cs index 0e6281ac..26ce6028 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.designer.cs @@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx index a28c9e2b..05dac76d 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx @@ -71,12 +71,12 @@ - - + --%> /// 计算参会人数 diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx.designer.cs index 85783798..0ba623dd 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx.designer.cs @@ -156,24 +156,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// btnSave 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx index cda38078..6744a8f8 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx @@ -70,12 +70,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.cs index 00097028..271eb1db 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.cs @@ -83,20 +83,20 @@ namespace FineUIPro.Web.HSSE.Meeting } } #endregion - protected void btnAttachUrl1_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(this.WeekMeetingId)) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.WeekMeetingId, BLL.Const.ProjectWeekMeetingMenuId))); - } - } + //protected void btnAttachUrl1_Click(object sender, EventArgs e) + //{ + // if (!string.IsNullOrEmpty(this.WeekMeetingId)) + // { + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.WeekMeetingId, BLL.Const.ProjectWeekMeetingMenuId))); + // } + //} - protected void btnAttachUrl2_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(this.WeekMeetingId)) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.WeekMeetingId, BLL.Const.ProjectWeekMeetingMenuId))); - } - } + //protected void btnAttachUrl2_Click(object sender, EventArgs e) + //{ + // if (!string.IsNullOrEmpty(this.WeekMeetingId)) + // { + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.WeekMeetingId, BLL.Const.ProjectWeekMeetingMenuId))); + // } + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.designer.cs index 73a7105e..3b3abfe9 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.designer.cs @@ -156,24 +156,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// btnClose 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs index 4a5bac14..464c3574 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs @@ -583,6 +583,7 @@ namespace FineUIPro.Web.HSSE.SitePerson if (!string.IsNullOrEmpty(person.PersonId)) { + #region 特岗人员资质 ////更新特岗人员资质 var personQuality = BLL.PersonQualityService.GetPersonQualityByPersonId(person.PersonId); if (personQuality != null) @@ -616,6 +617,40 @@ namespace FineUIPro.Web.HSSE.SitePerson newPersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text); BLL.PersonQualityService.AddPersonQuality(newPersonQuality); } + #endregion + + #region 安管人员资质 + var safePersonQuality = BLL.SafePersonQualityService.GetSafePersonQualityByPersonId(person.PersonId); + if (safePersonQuality!=null) + { + if (this.drpCertificate.SelectedValue != BLL.Const._Null) + { + safePersonQuality.CertificateName = this.drpCertificate.SelectedItem.Text; + } + safePersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim(); + safePersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text); + safePersonQuality.CompileMan = this.CurrUser.UserId; + safePersonQuality.CompileDate = DateTime.Now; + BLL.SafePersonQualityService.UpdateSafePersonQuality(safePersonQuality); + } + else + { + Model.QualityAudit_SafePersonQuality newSafePersonQuality = new Model.QualityAudit_SafePersonQuality + { + SafePersonQualityId = SQLHelper.GetNewID(typeof(Model.QualityAudit_SafePersonQuality)), + PersonId = person.PersonId, + CompileMan = this.CurrUser.UserId, + CompileDate = DateTime.Now + }; + if (this.drpCertificate.SelectedValue != BLL.Const._Null) + { + newSafePersonQuality.CertificateName = this.drpCertificate.SelectedItem.Text; + } + newSafePersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim(); + newSafePersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text); + BLL.SafePersonQualityService.AddSafePersonQuality(newSafePersonQuality); + } + #endregion } if (string.IsNullOrEmpty(this.txtOutTime.Text.Trim())) { diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml index 1544f676..c2b8a0b5 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml @@ -22,7 +22,6 @@ - @@ -66,9 +65,7 @@ - - @@ -77,9 +74,7 @@ - - @@ -119,7 +114,6 @@ - @@ -163,7 +157,6 @@ - @@ -174,12 +167,4 @@ - - - - - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_Personal.xml b/SGGL/FineUIPro.Web/common/Menu_Personal.xml index a9d07855..2854ffd9 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Personal.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Personal.xml @@ -6,7 +6,4 @@ - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml index e7b8b8fa..b1a26ee1 100644 --- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml +++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml @@ -46,12 +46,12 @@ - - - - + + + + @@ -71,9 +71,7 @@ - - diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index d3859428..91d9fd84 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -1,21 +1,3 @@  - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 69859890..ed44c8fe 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -83,8 +83,4 @@ - - - - \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index d0770579..bf474018 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -713,6 +713,9 @@ namespace Model partial void InsertDigData_HSEDataCollectSubmission(DigData_HSEDataCollectSubmission instance); partial void UpdateDigData_HSEDataCollectSubmission(DigData_HSEDataCollectSubmission instance); partial void DeleteDigData_HSEDataCollectSubmission(DigData_HSEDataCollectSubmission instance); + partial void InsertDivision_SubProjects(Division_SubProjects instance); + partial void UpdateDivision_SubProjects(Division_SubProjects instance); + partial void DeleteDivision_SubProjects(Division_SubProjects instance); partial void InsertDoc_DocManage(Doc_DocManage instance); partial void UpdateDoc_DocManage(Doc_DocManage instance); partial void DeleteDoc_DocManage(Doc_DocManage instance); @@ -1469,9 +1472,6 @@ namespace Model partial void InsertManager_Month_CheckC(Manager_Month_CheckC instance); partial void UpdateManager_Month_CheckC(Manager_Month_CheckC instance); partial void DeleteManager_Month_CheckC(Manager_Month_CheckC instance); - partial void InsertManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); - partial void UpdateManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); - partial void DeleteManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); partial void InsertManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void UpdateManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void DeleteManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); @@ -2030,9 +2030,6 @@ namespace Model partial void InsertReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void UpdateReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void DeleteReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); - partial void InsertReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); - partial void UpdateReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); - partial void DeleteReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); partial void InsertReport_CqmsTarget(Report_CqmsTarget instance); partial void UpdateReport_CqmsTarget(Report_CqmsTarget instance); partial void DeleteReport_CqmsTarget(Report_CqmsTarget instance); @@ -4531,6 +4528,14 @@ namespace Model } } + public System.Data.Linq.Table Division_SubProjects + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Doc_DocManage { get @@ -6555,14 +6560,6 @@ namespace Model } } - public System.Data.Linq.Table Manager_Month_ComplianceObligations - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Manager_Month_ComplianceObligationsC { get @@ -8051,14 +8048,6 @@ namespace Model } } - public System.Data.Linq.Table Report_CQMS_ProblemHandle - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Report_CqmsTarget { get @@ -21668,6 +21657,8 @@ namespace Model private string _CodeRule; + private EntitySet _Doc_DocManage; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -21684,6 +21675,7 @@ namespace Model public Base_DocType() { + this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); OnCreated(); } @@ -21767,6 +21759,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Doc_DocManage", ThisKey="DocTypeId", OtherKey="DocTypeId", DeleteRule="NO ACTION")] + public EntitySet Doc_DocManage + { + get + { + return this._Doc_DocManage; + } + set + { + this._Doc_DocManage.Assign(value); + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -21786,6 +21791,18 @@ namespace Model this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } } + + private void attach_Doc_DocManage(Doc_DocManage entity) + { + this.SendPropertyChanging(); + entity.Base_DocType = this; + } + + private void detach_Doc_DocManage(Doc_DocManage entity) + { + this.SendPropertyChanging(); + entity.Base_DocType = null; + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_EmergencyType")] @@ -98396,10 +98413,10 @@ namespace Model private string _AuditMan; - private string _Measure; - private string _Problem; + private string _Measure; + private System.Nullable _RemarkCode; private EntityRef _Sys_User; @@ -98448,10 +98465,10 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnMeasureChanging(string value); - partial void OnMeasureChanged(); partial void OnProblemChanging(string value); partial void OnProblemChanged(); + partial void OnMeasureChanging(string value); + partial void OnMeasureChanged(); partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -98821,27 +98838,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(500)")] - public string Measure - { - get - { - return this._Measure; - } - set - { - if ((this._Measure != value)) - { - this.OnMeasureChanging(value); - this.SendPropertyChanging(); - this._Measure = value; - this.SendPropertyChanged("Measure"); - this.OnMeasureChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(50)")] public string Problem { get @@ -98861,6 +98858,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(100)")] + public string Measure + { + get + { + return this._Measure; + } + set + { + if ((this._Measure != value)) + { + this.OnMeasureChanging(value); + this.SendPropertyChanging(); + this._Measure = value; + this.SendPropertyChanged("Measure"); + this.OnMeasureChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] public System.Nullable RemarkCode { @@ -121743,6 +121760,476 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Division_SubProjects")] + public partial class Division_SubProjects : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _DivisionId; + + private string _ProjectId; + + private string _ParentId; + + private System.Nullable _DivisionLevel; + + private string _EngineeringCode; + + private string _EngineeringName; + + private string _SubEngineeringCode; + + private string _SubEngineeringName; + + private string _BranchEngineeringCode; + + private string _BranchEngineeringName; + + private string _SubBranchEngineeringName; + + private string _ProEngineeringCode; + + private string _ProEngineeringName; + + private string _ProEngineeringNum; + + private string _Remark; + + private string _AddUser; + + private System.Nullable _OperateTime; + + private System.Nullable _Sort; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnDivisionIdChanging(string value); + partial void OnDivisionIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnParentIdChanging(string value); + partial void OnParentIdChanged(); + partial void OnDivisionLevelChanging(System.Nullable value); + partial void OnDivisionLevelChanged(); + partial void OnEngineeringCodeChanging(string value); + partial void OnEngineeringCodeChanged(); + partial void OnEngineeringNameChanging(string value); + partial void OnEngineeringNameChanged(); + partial void OnSubEngineeringCodeChanging(string value); + partial void OnSubEngineeringCodeChanged(); + partial void OnSubEngineeringNameChanging(string value); + partial void OnSubEngineeringNameChanged(); + partial void OnBranchEngineeringCodeChanging(string value); + partial void OnBranchEngineeringCodeChanged(); + partial void OnBranchEngineeringNameChanging(string value); + partial void OnBranchEngineeringNameChanged(); + partial void OnSubBranchEngineeringNameChanging(string value); + partial void OnSubBranchEngineeringNameChanged(); + partial void OnProEngineeringCodeChanging(string value); + partial void OnProEngineeringCodeChanged(); + partial void OnProEngineeringNameChanging(string value); + partial void OnProEngineeringNameChanged(); + partial void OnProEngineeringNumChanging(string value); + partial void OnProEngineeringNumChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnOperateTimeChanging(System.Nullable value); + partial void OnOperateTimeChanged(); + partial void OnSortChanging(System.Nullable value); + partial void OnSortChanged(); + #endregion + + public Division_SubProjects() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DivisionId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string DivisionId + { + get + { + return this._DivisionId; + } + set + { + if ((this._DivisionId != value)) + { + this.OnDivisionIdChanging(value); + this.SendPropertyChanging(); + this._DivisionId = value; + this.SendPropertyChanged("DivisionId"); + this.OnDivisionIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(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="_ParentId", DbType="VarChar(50)")] + public string ParentId + { + get + { + return this._ParentId; + } + set + { + if ((this._ParentId != value)) + { + this.OnParentIdChanging(value); + this.SendPropertyChanging(); + this._ParentId = value; + this.SendPropertyChanged("ParentId"); + this.OnParentIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DivisionLevel", DbType="Int")] + public System.Nullable DivisionLevel + { + get + { + return this._DivisionLevel; + } + set + { + if ((this._DivisionLevel != value)) + { + this.OnDivisionLevelChanging(value); + this.SendPropertyChanging(); + this._DivisionLevel = value; + this.SendPropertyChanged("DivisionLevel"); + this.OnDivisionLevelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EngineeringCode", DbType="VarChar(50)")] + public string EngineeringCode + { + get + { + return this._EngineeringCode; + } + set + { + if ((this._EngineeringCode != value)) + { + this.OnEngineeringCodeChanging(value); + this.SendPropertyChanging(); + this._EngineeringCode = value; + this.SendPropertyChanged("EngineeringCode"); + this.OnEngineeringCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EngineeringName", DbType="VarChar(50)")] + public string EngineeringName + { + get + { + return this._EngineeringName; + } + set + { + if ((this._EngineeringName != value)) + { + this.OnEngineeringNameChanging(value); + this.SendPropertyChanging(); + this._EngineeringName = value; + this.SendPropertyChanged("EngineeringName"); + this.OnEngineeringNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubEngineeringCode", DbType="VarChar(50)")] + public string SubEngineeringCode + { + get + { + return this._SubEngineeringCode; + } + set + { + if ((this._SubEngineeringCode != value)) + { + this.OnSubEngineeringCodeChanging(value); + this.SendPropertyChanging(); + this._SubEngineeringCode = value; + this.SendPropertyChanged("SubEngineeringCode"); + this.OnSubEngineeringCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubEngineeringName", DbType="VarChar(50)")] + public string SubEngineeringName + { + get + { + return this._SubEngineeringName; + } + set + { + if ((this._SubEngineeringName != value)) + { + this.OnSubEngineeringNameChanging(value); + this.SendPropertyChanging(); + this._SubEngineeringName = value; + this.SendPropertyChanged("SubEngineeringName"); + this.OnSubEngineeringNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BranchEngineeringCode", DbType="VarChar(50)")] + public string BranchEngineeringCode + { + get + { + return this._BranchEngineeringCode; + } + set + { + if ((this._BranchEngineeringCode != value)) + { + this.OnBranchEngineeringCodeChanging(value); + this.SendPropertyChanging(); + this._BranchEngineeringCode = value; + this.SendPropertyChanged("BranchEngineeringCode"); + this.OnBranchEngineeringCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BranchEngineeringName", DbType="VarChar(50)")] + public string BranchEngineeringName + { + get + { + return this._BranchEngineeringName; + } + set + { + if ((this._BranchEngineeringName != value)) + { + this.OnBranchEngineeringNameChanging(value); + this.SendPropertyChanging(); + this._BranchEngineeringName = value; + this.SendPropertyChanged("BranchEngineeringName"); + this.OnBranchEngineeringNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubBranchEngineeringName", DbType="VarChar(50)")] + public string SubBranchEngineeringName + { + get + { + return this._SubBranchEngineeringName; + } + set + { + if ((this._SubBranchEngineeringName != value)) + { + this.OnSubBranchEngineeringNameChanging(value); + this.SendPropertyChanging(); + this._SubBranchEngineeringName = value; + this.SendPropertyChanged("SubBranchEngineeringName"); + this.OnSubBranchEngineeringNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProEngineeringCode", DbType="VarChar(50)")] + public string ProEngineeringCode + { + get + { + return this._ProEngineeringCode; + } + set + { + if ((this._ProEngineeringCode != value)) + { + this.OnProEngineeringCodeChanging(value); + this.SendPropertyChanging(); + this._ProEngineeringCode = value; + this.SendPropertyChanged("ProEngineeringCode"); + this.OnProEngineeringCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProEngineeringName", DbType="VarChar(50)")] + public string ProEngineeringName + { + get + { + return this._ProEngineeringName; + } + set + { + if ((this._ProEngineeringName != value)) + { + this.OnProEngineeringNameChanging(value); + this.SendPropertyChanging(); + this._ProEngineeringName = value; + this.SendPropertyChanged("ProEngineeringName"); + this.OnProEngineeringNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProEngineeringNum", DbType="VarChar(50)")] + public string ProEngineeringNum + { + get + { + return this._ProEngineeringNum; + } + set + { + if ((this._ProEngineeringNum != value)) + { + this.OnProEngineeringNumChanging(value); + this.SendPropertyChanging(); + this._ProEngineeringNum = value; + this.SendPropertyChanged("ProEngineeringNum"); + this.OnProEngineeringNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(150)")] + 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="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperateTime", DbType="DateTime")] + public System.Nullable OperateTime + { + get + { + return this._OperateTime; + } + set + { + if ((this._OperateTime != value)) + { + this.OnOperateTimeChanging(value); + this.SendPropertyChanging(); + this._OperateTime = value; + this.SendPropertyChanged("OperateTime"); + this.OnOperateTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")] + public System.Nullable Sort + { + get + { + return this._Sort; + } + set + { + if ((this._Sort != value)) + { + this.OnSortChanging(value); + this.SendPropertyChanging(); + this._Sort = value; + this.SendPropertyChanged("Sort"); + this.OnSortChanged(); + } + } + } + + 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.Doc_DocManage")] public partial class Doc_DocManage : INotifyPropertyChanging, INotifyPropertyChanged { @@ -121785,6 +122272,8 @@ namespace Model private EntityRef _Base_CNProfessional; + private EntityRef _Base_DocType; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -121836,6 +122325,7 @@ namespace Model public Doc_DocManage() { this._Base_CNProfessional = default(EntityRef); + this._Base_DocType = default(EntityRef); this._Base_Project = default(EntityRef); this._Base_Unit = default(EntityRef); this._Sys_User = default(EntityRef); @@ -121914,6 +122404,10 @@ namespace Model { if ((this._DocTypeId != value)) { + if (this._Base_DocType.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnDocTypeIdChanging(value); this.SendPropertyChanging(); this._DocTypeId = value; @@ -122233,6 +122727,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Base_DocType", ThisKey="DocTypeId", OtherKey="DocTypeId", IsForeignKey=true)] + public Base_DocType Base_DocType + { + get + { + return this._Base_DocType.Entity; + } + set + { + Base_DocType previousValue = this._Base_DocType.Entity; + if (((previousValue != value) + || (this._Base_DocType.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_DocType.Entity = null; + previousValue.Doc_DocManage.Remove(this); + } + this._Base_DocType.Entity = value; + if ((value != null)) + { + value.Doc_DocManage.Add(this); + this._DocTypeId = value.DocTypeId; + } + else + { + this._DocTypeId = default(string); + } + this.SendPropertyChanged("Base_DocType"); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -122403,6 +122931,8 @@ namespace Model private EntityRef _Doc_DocManage; + private EntityRef _Sys_User; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -122426,6 +122956,7 @@ namespace Model public Doc_DocManageApprove() { this._Doc_DocManage = default(EntityRef); + this._Sys_User = default(EntityRef); OnCreated(); } @@ -122473,7 +123004,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")] public string ApproveMan { get @@ -122484,6 +123015,10 @@ namespace Model { if ((this._ApproveMan != value)) { + if (this._Sys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnApproveManChanging(value); this.SendPropertyChanging(); this._ApproveMan = value; @@ -122607,6 +123142,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Sys_User", ThisKey="ApproveMan", OtherKey="UserId", IsForeignKey=true)] + public Sys_User Sys_User + { + get + { + return this._Sys_User.Entity; + } + set + { + Sys_User previousValue = this._Sys_User.Entity; + if (((previousValue != value) + || (this._Sys_User.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Sys_User.Entity = null; + previousValue.Doc_DocManageApprove.Remove(this); + } + this._Sys_User.Entity = value; + if ((value != null)) + { + value.Doc_DocManageApprove.Add(this); + this._ApproveMan = value.UserId; + } + else + { + this._ApproveMan = default(string); + } + this.SendPropertyChanged("Sys_User"); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -237453,229 +238022,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligations")] - public partial class Manager_Month_ComplianceObligations : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _ComplianceObligationsId; - - private string _MonthReportId; - - private string _InformationContent; - - private string _ResponseMeasures; - - private string _ImplementationStatus; - - private string _EvaluationConclusion; - - private EntityRef _Manager_MonthReportC; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnComplianceObligationsIdChanging(string value); - partial void OnComplianceObligationsIdChanged(); - partial void OnMonthReportIdChanging(string value); - partial void OnMonthReportIdChanged(); - partial void OnInformationContentChanging(string value); - partial void OnInformationContentChanged(); - partial void OnResponseMeasuresChanging(string value); - partial void OnResponseMeasuresChanged(); - partial void OnImplementationStatusChanging(string value); - partial void OnImplementationStatusChanged(); - partial void OnEvaluationConclusionChanging(string value); - partial void OnEvaluationConclusionChanged(); - #endregion - - public Manager_Month_ComplianceObligations() - { - this._Manager_MonthReportC = default(EntityRef); - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ComplianceObligationsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string ComplianceObligationsId - { - get - { - return this._ComplianceObligationsId; - } - set - { - if ((this._ComplianceObligationsId != value)) - { - this.OnComplianceObligationsIdChanging(value); - this.SendPropertyChanging(); - this._ComplianceObligationsId = value; - this.SendPropertyChanged("ComplianceObligationsId"); - this.OnComplianceObligationsIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] - public string MonthReportId - { - get - { - return this._MonthReportId; - } - set - { - if ((this._MonthReportId != value)) - { - if (this._Manager_MonthReportC.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } - this.OnMonthReportIdChanging(value); - this.SendPropertyChanging(); - this._MonthReportId = value; - this.SendPropertyChanged("MonthReportId"); - this.OnMonthReportIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InformationContent", DbType="NVarChar(500)")] - public string InformationContent - { - get - { - return this._InformationContent; - } - set - { - if ((this._InformationContent != value)) - { - this.OnInformationContentChanging(value); - this.SendPropertyChanging(); - this._InformationContent = value; - this.SendPropertyChanged("InformationContent"); - this.OnInformationContentChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponseMeasures", DbType="NVarChar(500)")] - public string ResponseMeasures - { - get - { - return this._ResponseMeasures; - } - set - { - if ((this._ResponseMeasures != value)) - { - this.OnResponseMeasuresChanging(value); - this.SendPropertyChanging(); - this._ResponseMeasures = value; - this.SendPropertyChanged("ResponseMeasures"); - this.OnResponseMeasuresChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")] - public string ImplementationStatus - { - get - { - return this._ImplementationStatus; - } - set - { - if ((this._ImplementationStatus != value)) - { - this.OnImplementationStatusChanging(value); - this.SendPropertyChanging(); - this._ImplementationStatus = value; - this.SendPropertyChanged("ImplementationStatus"); - this.OnImplementationStatusChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationConclusion", DbType="NVarChar(50)")] - public string EvaluationConclusion - { - get - { - return this._EvaluationConclusion; - } - set - { - if ((this._EvaluationConclusion != value)) - { - this.OnEvaluationConclusionChanging(value); - this.SendPropertyChanging(); - this._EvaluationConclusion = value; - this.SendPropertyChanged("EvaluationConclusion"); - this.OnEvaluationConclusionChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] - public Manager_MonthReportC Manager_MonthReportC - { - get - { - return this._Manager_MonthReportC.Entity; - } - set - { - Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity; - if (((previousValue != value) - || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Manager_MonthReportC.Entity = null; - previousValue.Manager_Month_ComplianceObligations.Remove(this); - } - this._Manager_MonthReportC.Entity = value; - if ((value != null)) - { - value.Manager_Month_ComplianceObligations.Add(this); - this._MonthReportId = value.MonthReportId; - } - else - { - this._MonthReportId = default(string); - } - this.SendPropertyChanged("Manager_MonthReportC"); - } - } - } - - 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.Manager_Month_ComplianceObligationsC")] public partial class Manager_Month_ComplianceObligationsC : INotifyPropertyChanging, INotifyPropertyChanged { @@ -243875,8 +244221,6 @@ namespace Model private EntitySet _Manager_Month_CheckC; - private EntitySet _Manager_Month_ComplianceObligations; - private EntitySet _Manager_Month_ComplianceObligationsC; private EntitySet _Manager_Month_CostInvestmentPlanC; @@ -244149,7 +244493,6 @@ namespace Model this._Manager_Month_ActivitiesC = new EntitySet(new Action(this.attach_Manager_Month_ActivitiesC), new Action(this.detach_Manager_Month_ActivitiesC)); this._Manager_Month_ActivityDesC = new EntitySet(new Action(this.attach_Manager_Month_ActivityDesC), new Action(this.detach_Manager_Month_ActivityDesC)); this._Manager_Month_CheckC = new EntitySet(new Action(this.attach_Manager_Month_CheckC), new Action(this.detach_Manager_Month_CheckC)); - this._Manager_Month_ComplianceObligations = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligations), new Action(this.detach_Manager_Month_ComplianceObligations)); this._Manager_Month_ComplianceObligationsC = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligationsC), new Action(this.detach_Manager_Month_ComplianceObligationsC)); this._Manager_Month_CostInvestmentPlanC = new EntitySet(new Action(this.attach_Manager_Month_CostInvestmentPlanC), new Action(this.detach_Manager_Month_CostInvestmentPlanC)); this._Manager_Month_EmergencyExercisesC = new EntitySet(new Action(this.attach_Manager_Month_EmergencyExercisesC), new Action(this.detach_Manager_Month_EmergencyExercisesC)); @@ -246330,19 +246673,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligations", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] - public EntitySet Manager_Month_ComplianceObligations - { - get - { - return this._Manager_Month_ComplianceObligations; - } - set - { - this._Manager_Month_ComplianceObligations.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligationsC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_Month_ComplianceObligationsC { @@ -246924,18 +247254,6 @@ namespace Model entity.Manager_MonthReportC = null; } - private void attach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) - { - this.SendPropertyChanging(); - entity.Manager_MonthReportC = this; - } - - private void detach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) - { - this.SendPropertyChanging(); - entity.Manager_MonthReportC = null; - } - private void attach_Manager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC entity) { this.SendPropertyChanging(); @@ -275280,7 +275598,7 @@ namespace Model private System.Nullable _ProblemType; - private string _QuestionTechnologyId; + private string _SubInspectId; private string _TermItemId; @@ -275294,20 +275612,18 @@ namespace Model private string _InspectUser; + private string _HandleUser; + private string _ApproveUser; + private System.Nullable _AdjustCompleteTime; + private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; - private string _HandleUser; - - private System.Nullable _AdjustCompleteTime; - - private string _SubInspectId; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -275324,8 +275640,8 @@ namespace Model partial void OnConstructionUnitChanged(); partial void OnProblemTypeChanging(System.Nullable value); partial void OnProblemTypeChanged(); - partial void OnQuestionTechnologyIdChanging(string value); - partial void OnQuestionTechnologyIdChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); partial void OnTermItemIdChanging(string value); partial void OnTermItemIdChanged(); partial void OnWorkPackIdChanging(string value); @@ -275338,20 +275654,18 @@ namespace Model partial void OnRectifyTimeChanged(); partial void OnInspectUserChanging(string value); partial void OnInspectUserChanged(); + partial void OnHandleUserChanging(string value); + partial void OnHandleUserChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); + partial void OnAdjustCompleteTimeChanging(System.Nullable value); + partial void OnAdjustCompleteTimeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); - partial void OnHandleUserChanging(string value); - partial void OnHandleUserChanged(); - partial void OnAdjustCompleteTimeChanging(System.Nullable value); - partial void OnAdjustCompleteTimeChanged(); - partial void OnSubInspectIdChanging(string value); - partial void OnSubInspectIdChanged(); #endregion public PreRun_InspectTailTerm() @@ -275479,22 +275793,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")] - public string QuestionTechnologyId + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] + public string SubInspectId { get { - return this._QuestionTechnologyId; + return this._SubInspectId; } set { - if ((this._QuestionTechnologyId != value)) + if ((this._SubInspectId != value)) { - this.OnQuestionTechnologyIdChanging(value); + this.OnSubInspectIdChanging(value); this.SendPropertyChanging(); - this._QuestionTechnologyId = value; - this.SendPropertyChanged("QuestionTechnologyId"); - this.OnQuestionTechnologyIdChanged(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); } } } @@ -275619,6 +275933,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] + public string HandleUser + { + get + { + return this._HandleUser; + } + set + { + if ((this._HandleUser != value)) + { + this.OnHandleUserChanging(value); + this.SendPropertyChanging(); + this._HandleUser = value; + this.SendPropertyChanged("HandleUser"); + this.OnHandleUserChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] public string ApproveUser { @@ -275639,6 +275973,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] + public System.Nullable AdjustCompleteTime + { + get + { + return this._AdjustCompleteTime; + } + set + { + if ((this._AdjustCompleteTime != value)) + { + this.OnAdjustCompleteTimeChanging(value); + this.SendPropertyChanging(); + this._AdjustCompleteTime = value; + this.SendPropertyChanged("AdjustCompleteTime"); + this.OnAdjustCompleteTimeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -275699,66 +276053,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] - public string HandleUser - { - get - { - return this._HandleUser; - } - set - { - if ((this._HandleUser != value)) - { - this.OnHandleUserChanging(value); - this.SendPropertyChanging(); - this._HandleUser = value; - this.SendPropertyChanged("HandleUser"); - this.OnHandleUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] - public System.Nullable AdjustCompleteTime - { - get - { - return this._AdjustCompleteTime; - } - set - { - if ((this._AdjustCompleteTime != value)) - { - this.OnAdjustCompleteTimeChanging(value); - this.SendPropertyChanging(); - this._AdjustCompleteTime = value; - this.SendPropertyChanged("AdjustCompleteTime"); - this.OnAdjustCompleteTimeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="NVarChar(50)")] - public string SubInspectId - { - get - { - return this._SubInspectId; - } - set - { - if ((this._SubInspectId != value)) - { - this.OnSubInspectIdChanging(value); - this.SendPropertyChanging(); - this._SubInspectId = value; - this.SendPropertyChanged("SubInspectId"); - this.OnSubInspectIdChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -275800,14 +276094,14 @@ namespace Model private string _ApproveUser; + private System.Nullable _ApproveType; + private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; - private System.Nullable _ApproveType; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -275826,14 +276120,14 @@ namespace Model partial void OnApproveTimeChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); + partial void OnApproveTypeChanging(System.Nullable value); + partial void OnApproveTypeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); - partial void OnApproveTypeChanging(System.Nullable value); - partial void OnApproveTypeChanged(); #endregion public PreRun_InspectTermApproveRecords() @@ -275981,6 +276275,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] + public System.Nullable ApproveType + { + get + { + return this._ApproveType; + } + set + { + if ((this._ApproveType != value)) + { + this.OnApproveTypeChanging(value); + this.SendPropertyChanging(); + this._ApproveType = value; + this.SendPropertyChanged("ApproveType"); + this.OnApproveTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -276041,26 +276355,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] - public System.Nullable ApproveType - { - get - { - return this._ApproveType; - } - set - { - if ((this._ApproveType != value)) - { - this.OnApproveTypeChanging(value); - this.SendPropertyChanging(); - this._ApproveType = value; - this.SendPropertyChanged("ApproveType"); - this.OnApproveTypeChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -276993,7 +277287,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -277116,12 +277410,6 @@ namespace Model private string _InspectResult; - private System.Nullable _InspectTime; - - private string _AddUser; - - private System.Nullable _AddTime; - private string _Subcontractor; private string _Contractor; @@ -277130,12 +277418,6 @@ namespace Model private string _Owner; - private System.Nullable _IsUnifyWanderAbout; - - private System.Nullable _UnifyWanderAboutData; - - private string _UnifyWanderAboutOpinion; - private System.Nullable _InspectionIsAllPass; private System.Nullable _SubcontractorIsAllPass; @@ -277146,7 +277428,9 @@ namespace Model private System.Nullable _OwnerIsAllPass; - private System.Nullable _WanderIsComplete; + private System.Nullable _WorkPackType; + + private string _PropertyTechnologyId; private System.Nullable _SubcontractorAllPassData; @@ -277156,25 +277440,35 @@ namespace Model private System.Nullable _OwnerAllPassData; - private System.Nullable _WanderCompleteData; + private System.Nullable _WanderIsComplete; - private System.Nullable _WorkPackType; + private System.Nullable _WanderCompleteData; private System.Nullable _IsSiteImplement; - private System.Nullable _InspectIsClose; - - private System.Nullable _InspectCloseData; - - private string _InspectIsCloseUser; - - private string _PropertyTechnologyId; - - private System.Nullable _RecordUploadData; + private string _SiteImplementUser; private System.Nullable _SiteImplementConfirmData; - private string _SiteImplementUser; + private System.Nullable _RecordUploadData; + + private System.Nullable _InspectIsClose; + + private string _InspectIsCloseUser; + + private System.Nullable _InspectCloseData; + + private System.Nullable _IsUnifyWanderAbout; + + private System.Nullable _UnifyWanderAboutData; + + private string _UnifyWanderAboutOpinion; + + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; #region 可扩展性方法定义 partial void OnLoaded(); @@ -277196,12 +277490,6 @@ namespace Model partial void OnWorkPackIdChanged(); partial void OnInspectResultChanging(string value); partial void OnInspectResultChanged(); - partial void OnInspectTimeChanging(System.Nullable value); - partial void OnInspectTimeChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); partial void OnSubcontractorChanging(string value); partial void OnSubcontractorChanged(); partial void OnContractorChanging(string value); @@ -277210,12 +277498,6 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); - partial void OnIsUnifyWanderAboutChanging(System.Nullable value); - partial void OnIsUnifyWanderAboutChanged(); - partial void OnUnifyWanderAboutDataChanging(System.Nullable value); - partial void OnUnifyWanderAboutDataChanged(); - partial void OnUnifyWanderAboutOpinionChanging(string value); - partial void OnUnifyWanderAboutOpinionChanged(); partial void OnInspectionIsAllPassChanging(System.Nullable value); partial void OnInspectionIsAllPassChanged(); partial void OnSubcontractorIsAllPassChanging(System.Nullable value); @@ -277226,8 +277508,10 @@ namespace Model partial void OnSupervisionIsAllPassChanged(); partial void OnOwnerIsAllPassChanging(System.Nullable value); partial void OnOwnerIsAllPassChanged(); - partial void OnWanderIsCompleteChanging(System.Nullable value); - partial void OnWanderIsCompleteChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -277236,26 +277520,36 @@ namespace Model partial void OnSupervisionAllPassDataChanged(); partial void OnOwnerAllPassDataChanging(System.Nullable value); partial void OnOwnerAllPassDataChanged(); + partial void OnWanderIsCompleteChanging(System.Nullable value); + partial void OnWanderIsCompleteChanged(); partial void OnWanderCompleteDataChanging(System.Nullable value); partial void OnWanderCompleteDataChanged(); - partial void OnWorkPackTypeChanging(System.Nullable value); - partial void OnWorkPackTypeChanged(); partial void OnIsSiteImplementChanging(System.Nullable value); partial void OnIsSiteImplementChanged(); - partial void OnInspectIsCloseChanging(System.Nullable value); - partial void OnInspectIsCloseChanged(); - partial void OnInspectCloseDataChanging(System.Nullable value); - partial void OnInspectCloseDataChanged(); - partial void OnInspectIsCloseUserChanging(string value); - partial void OnInspectIsCloseUserChanged(); - partial void OnPropertyTechnologyIdChanging(string value); - partial void OnPropertyTechnologyIdChanged(); - partial void OnRecordUploadDataChanging(System.Nullable value); - partial void OnRecordUploadDataChanged(); - partial void OnSiteImplementConfirmDataChanging(System.Nullable value); - partial void OnSiteImplementConfirmDataChanged(); partial void OnSiteImplementUserChanging(string value); partial void OnSiteImplementUserChanged(); + partial void OnSiteImplementConfirmDataChanging(System.Nullable value); + partial void OnSiteImplementConfirmDataChanged(); + partial void OnRecordUploadDataChanging(System.Nullable value); + partial void OnRecordUploadDataChanged(); + partial void OnInspectIsCloseChanging(System.Nullable value); + partial void OnInspectIsCloseChanged(); + partial void OnInspectIsCloseUserChanging(string value); + partial void OnInspectIsCloseUserChanged(); + partial void OnInspectCloseDataChanging(System.Nullable value); + partial void OnInspectCloseDataChanged(); + partial void OnIsUnifyWanderAboutChanging(System.Nullable value); + partial void OnIsUnifyWanderAboutChanged(); + partial void OnUnifyWanderAboutDataChanging(System.Nullable value); + partial void OnUnifyWanderAboutDataChanged(); + partial void OnUnifyWanderAboutOpinionChanging(string value); + partial void OnUnifyWanderAboutOpinionChanged(); + partial void OnInspectTimeChanging(System.Nullable value); + partial void OnInspectTimeChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); #endregion public PreRun_SubInspectTerm() @@ -277423,66 +277717,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] - public System.Nullable InspectTime - { - get - { - return this._InspectTime; - } - set - { - if ((this._InspectTime != value)) - { - this.OnInspectTimeChanging(value); - this.SendPropertyChanging(); - this._InspectTime = value; - this.SendPropertyChanged("InspectTime"); - this.OnInspectTimeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser - { - get - { - return this._AddUser; - } - set - { - if ((this._AddUser != value)) - { - this.OnAddUserChanging(value); - this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime - { - get - { - return this._AddTime; - } - set - { - if ((this._AddTime != value)) - { - this.OnAddTimeChanging(value); - this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] public string Subcontractor { @@ -277563,66 +277797,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] - public System.Nullable IsUnifyWanderAbout - { - get - { - return this._IsUnifyWanderAbout; - } - set - { - if ((this._IsUnifyWanderAbout != value)) - { - this.OnIsUnifyWanderAboutChanging(value); - this.SendPropertyChanging(); - this._IsUnifyWanderAbout = value; - this.SendPropertyChanged("IsUnifyWanderAbout"); - this.OnIsUnifyWanderAboutChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] - public System.Nullable UnifyWanderAboutData - { - get - { - return this._UnifyWanderAboutData; - } - set - { - if ((this._UnifyWanderAboutData != value)) - { - this.OnUnifyWanderAboutDataChanging(value); - this.SendPropertyChanging(); - this._UnifyWanderAboutData = value; - this.SendPropertyChanged("UnifyWanderAboutData"); - this.OnUnifyWanderAboutDataChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string UnifyWanderAboutOpinion - { - get - { - return this._UnifyWanderAboutOpinion; - } - set - { - if ((this._UnifyWanderAboutOpinion != value)) - { - this.OnUnifyWanderAboutOpinionChanging(value); - this.SendPropertyChanging(); - this._UnifyWanderAboutOpinion = value; - this.SendPropertyChanged("UnifyWanderAboutOpinion"); - this.OnUnifyWanderAboutOpinionChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")] public System.Nullable InspectionIsAllPass { @@ -277723,22 +277897,42 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] - public System.Nullable WanderIsComplete + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType { get { - return this._WanderIsComplete; + return this._WorkPackType; } set { - if ((this._WanderIsComplete != value)) + if ((this._WorkPackType != value)) { - this.OnWanderIsCompleteChanging(value); + this.OnWorkPackTypeChanging(value); this.SendPropertyChanging(); - this._WanderIsComplete = value; - this.SendPropertyChanged("WanderIsComplete"); - this.OnWanderIsCompleteChanged(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string PropertyTechnologyId + { + get + { + return this._PropertyTechnologyId; + } + set + { + if ((this._PropertyTechnologyId != value)) + { + this.OnPropertyTechnologyIdChanging(value); + this.SendPropertyChanging(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); } } } @@ -277823,6 +278017,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] + public System.Nullable WanderIsComplete + { + get + { + return this._WanderIsComplete; + } + set + { + if ((this._WanderIsComplete != value)) + { + this.OnWanderIsCompleteChanging(value); + this.SendPropertyChanging(); + this._WanderIsComplete = value; + this.SendPropertyChanged("WanderIsComplete"); + this.OnWanderIsCompleteChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderCompleteData", DbType="DateTime")] public System.Nullable WanderCompleteData { @@ -277843,26 +278057,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] - public System.Nullable WorkPackType - { - get - { - return this._WorkPackType; - } - set - { - if ((this._WorkPackType != value)) - { - this.OnWorkPackTypeChanging(value); - this.SendPropertyChanging(); - this._WorkPackType = value; - this.SendPropertyChanged("WorkPackType"); - this.OnWorkPackTypeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSiteImplement", DbType="Int")] public System.Nullable IsSiteImplement { @@ -277883,102 +278077,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] - public System.Nullable InspectIsClose + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")] + public string SiteImplementUser { get { - return this._InspectIsClose; + return this._SiteImplementUser; } set { - if ((this._InspectIsClose != value)) + if ((this._SiteImplementUser != value)) { - this.OnInspectIsCloseChanging(value); + this.OnSiteImplementUserChanging(value); this.SendPropertyChanging(); - this._InspectIsClose = value; - this.SendPropertyChanged("InspectIsClose"); - this.OnInspectIsCloseChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] - public System.Nullable InspectCloseData - { - get - { - return this._InspectCloseData; - } - set - { - if ((this._InspectCloseData != value)) - { - this.OnInspectCloseDataChanging(value); - this.SendPropertyChanging(); - this._InspectCloseData = value; - this.SendPropertyChanged("InspectCloseData"); - this.OnInspectCloseDataChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="NVarChar(50)")] - public string InspectIsCloseUser - { - get - { - return this._InspectIsCloseUser; - } - set - { - if ((this._InspectIsCloseUser != value)) - { - this.OnInspectIsCloseUserChanging(value); - this.SendPropertyChanging(); - this._InspectIsCloseUser = value; - this.SendPropertyChanged("InspectIsCloseUser"); - this.OnInspectIsCloseUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="NVarChar(500)")] - public string PropertyTechnologyId - { - get - { - return this._PropertyTechnologyId; - } - set - { - if ((this._PropertyTechnologyId != value)) - { - this.OnPropertyTechnologyIdChanging(value); - this.SendPropertyChanging(); - this._PropertyTechnologyId = value; - this.SendPropertyChanged("PropertyTechnologyId"); - this.OnPropertyTechnologyIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] - public System.Nullable RecordUploadData - { - get - { - return this._RecordUploadData; - } - set - { - if ((this._RecordUploadData != value)) - { - this.OnRecordUploadDataChanging(value); - this.SendPropertyChanging(); - this._RecordUploadData = value; - this.SendPropertyChanged("RecordUploadData"); - this.OnRecordUploadDataChanged(); + this._SiteImplementUser = value; + this.SendPropertyChanged("SiteImplementUser"); + this.OnSiteImplementUserChanged(); } } } @@ -278003,22 +278117,202 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="NVarChar(50)")] - public string SiteImplementUser + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] + public System.Nullable RecordUploadData { get { - return this._SiteImplementUser; + return this._RecordUploadData; } set { - if ((this._SiteImplementUser != value)) + if ((this._RecordUploadData != value)) { - this.OnSiteImplementUserChanging(value); + this.OnRecordUploadDataChanging(value); this.SendPropertyChanging(); - this._SiteImplementUser = value; - this.SendPropertyChanged("SiteImplementUser"); - this.OnSiteImplementUserChanged(); + this._RecordUploadData = value; + this.SendPropertyChanged("RecordUploadData"); + this.OnRecordUploadDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] + public System.Nullable InspectIsClose + { + get + { + return this._InspectIsClose; + } + set + { + if ((this._InspectIsClose != value)) + { + this.OnInspectIsCloseChanging(value); + this.SendPropertyChanging(); + this._InspectIsClose = value; + this.SendPropertyChanged("InspectIsClose"); + this.OnInspectIsCloseChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="VarChar(50)")] + public string InspectIsCloseUser + { + get + { + return this._InspectIsCloseUser; + } + set + { + if ((this._InspectIsCloseUser != value)) + { + this.OnInspectIsCloseUserChanging(value); + this.SendPropertyChanging(); + this._InspectIsCloseUser = value; + this.SendPropertyChanged("InspectIsCloseUser"); + this.OnInspectIsCloseUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] + public System.Nullable InspectCloseData + { + get + { + return this._InspectCloseData; + } + set + { + if ((this._InspectCloseData != value)) + { + this.OnInspectCloseDataChanging(value); + this.SendPropertyChanging(); + this._InspectCloseData = value; + this.SendPropertyChanged("InspectCloseData"); + this.OnInspectCloseDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] + public System.Nullable IsUnifyWanderAbout + { + get + { + return this._IsUnifyWanderAbout; + } + set + { + if ((this._IsUnifyWanderAbout != value)) + { + this.OnIsUnifyWanderAboutChanging(value); + this.SendPropertyChanging(); + this._IsUnifyWanderAbout = value; + this.SendPropertyChanged("IsUnifyWanderAbout"); + this.OnIsUnifyWanderAboutChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] + public System.Nullable UnifyWanderAboutData + { + get + { + return this._UnifyWanderAboutData; + } + set + { + if ((this._UnifyWanderAboutData != value)) + { + this.OnUnifyWanderAboutDataChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutData = value; + this.SendPropertyChanged("UnifyWanderAboutData"); + this.OnUnifyWanderAboutDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string UnifyWanderAboutOpinion + { + get + { + return this._UnifyWanderAboutOpinion; + } + set + { + if ((this._UnifyWanderAboutOpinion != value)) + { + this.OnUnifyWanderAboutOpinionChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutOpinion = value; + this.SendPropertyChanged("UnifyWanderAboutOpinion"); + this.OnUnifyWanderAboutOpinionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] + public System.Nullable InspectTime + { + get + { + return this._InspectTime; + } + set + { + if ((this._InspectTime != value)) + { + this.OnInspectTimeChanging(value); + this.SendPropertyChanging(); + this._InspectTime = value; + this.SendPropertyChanged("InspectTime"); + this.OnInspectTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); } } } @@ -278086,6 +278380,22 @@ namespace Model private string _Owner; + private System.Nullable _SubcontractorIsPass; + + private System.Nullable _ContractorIsPass; + + private System.Nullable _SupervisionIsPass; + + private System.Nullable _OwnerIsPass; + + private string _SubcontractorRemark; + + private string _ContractorRemark; + + private string _SupervisionRemark; + + private string _OwnerRemark; + private System.Nullable _WorkPackType; private string _PropertyTechnologyId; @@ -278098,22 +278408,6 @@ namespace Model private System.Nullable _Sort; - private string _SubcontractorRemark; - - private string _ContractorRemark; - - private string _SupervisionRemark; - - private string _OwnerRemark; - - private System.Nullable _SubcontractorIsPass; - - private System.Nullable _ContractorIsPass; - - private System.Nullable _SupervisionIsPass; - - private System.Nullable _OwnerIsPass; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -278154,6 +278448,22 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); + partial void OnSubcontractorIsPassChanging(System.Nullable value); + partial void OnSubcontractorIsPassChanged(); + partial void OnContractorIsPassChanging(System.Nullable value); + partial void OnContractorIsPassChanged(); + partial void OnSupervisionIsPassChanging(System.Nullable value); + partial void OnSupervisionIsPassChanged(); + partial void OnOwnerIsPassChanging(System.Nullable value); + partial void OnOwnerIsPassChanged(); + partial void OnSubcontractorRemarkChanging(string value); + partial void OnSubcontractorRemarkChanged(); + partial void OnContractorRemarkChanging(string value); + partial void OnContractorRemarkChanged(); + partial void OnSupervisionRemarkChanging(string value); + partial void OnSupervisionRemarkChanged(); + partial void OnOwnerRemarkChanging(string value); + partial void OnOwnerRemarkChanged(); partial void OnWorkPackTypeChanging(System.Nullable value); partial void OnWorkPackTypeChanged(); partial void OnPropertyTechnologyIdChanging(string value); @@ -278166,22 +278476,6 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); - partial void OnSubcontractorRemarkChanging(string value); - partial void OnSubcontractorRemarkChanged(); - partial void OnContractorRemarkChanging(string value); - partial void OnContractorRemarkChanged(); - partial void OnSupervisionRemarkChanging(string value); - partial void OnSupervisionRemarkChanged(); - partial void OnOwnerRemarkChanging(string value); - partial void OnOwnerRemarkChanged(); - partial void OnSubcontractorIsPassChanging(System.Nullable value); - partial void OnSubcontractorIsPassChanged(); - partial void OnContractorIsPassChanging(System.Nullable value); - partial void OnContractorIsPassChanged(); - partial void OnSupervisionIsPassChanging(System.Nullable value); - partial void OnSupervisionIsPassChanged(); - partial void OnOwnerIsPassChanging(System.Nullable value); - partial void OnOwnerIsPassChanged(); #endregion public PreRun_SubInspectTermItem() @@ -278549,6 +278843,166 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] + public System.Nullable SubcontractorIsPass + { + get + { + return this._SubcontractorIsPass; + } + set + { + if ((this._SubcontractorIsPass != value)) + { + this.OnSubcontractorIsPassChanging(value); + this.SendPropertyChanging(); + this._SubcontractorIsPass = value; + this.SendPropertyChanged("SubcontractorIsPass"); + this.OnSubcontractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] + public System.Nullable ContractorIsPass + { + get + { + return this._ContractorIsPass; + } + set + { + if ((this._ContractorIsPass != value)) + { + this.OnContractorIsPassChanging(value); + this.SendPropertyChanging(); + this._ContractorIsPass = value; + this.SendPropertyChanged("ContractorIsPass"); + this.OnContractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] + public System.Nullable SupervisionIsPass + { + get + { + return this._SupervisionIsPass; + } + set + { + if ((this._SupervisionIsPass != value)) + { + this.OnSupervisionIsPassChanging(value); + this.SendPropertyChanging(); + this._SupervisionIsPass = value; + this.SendPropertyChanged("SupervisionIsPass"); + this.OnSupervisionIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] + public System.Nullable OwnerIsPass + { + get + { + return this._OwnerIsPass; + } + set + { + if ((this._OwnerIsPass != value)) + { + this.OnOwnerIsPassChanging(value); + this.SendPropertyChanging(); + this._OwnerIsPass = value; + this.SendPropertyChanged("OwnerIsPass"); + this.OnOwnerIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] + public string SubcontractorRemark + { + get + { + return this._SubcontractorRemark; + } + set + { + if ((this._SubcontractorRemark != value)) + { + this.OnSubcontractorRemarkChanging(value); + this.SendPropertyChanging(); + this._SubcontractorRemark = value; + this.SendPropertyChanged("SubcontractorRemark"); + this.OnSubcontractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] + public string ContractorRemark + { + get + { + return this._ContractorRemark; + } + set + { + if ((this._ContractorRemark != value)) + { + this.OnContractorRemarkChanging(value); + this.SendPropertyChanging(); + this._ContractorRemark = value; + this.SendPropertyChanged("ContractorRemark"); + this.OnContractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] + public string SupervisionRemark + { + get + { + return this._SupervisionRemark; + } + set + { + if ((this._SupervisionRemark != value)) + { + this.OnSupervisionRemarkChanging(value); + this.SendPropertyChanging(); + this._SupervisionRemark = value; + this.SendPropertyChanged("SupervisionRemark"); + this.OnSupervisionRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] + public string OwnerRemark + { + get + { + return this._OwnerRemark; + } + set + { + if ((this._OwnerRemark != value)) + { + this.OnOwnerRemarkChanging(value); + this.SendPropertyChanging(); + this._OwnerRemark = value; + this.SendPropertyChanged("OwnerRemark"); + this.OnOwnerRemarkChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] public System.Nullable WorkPackType { @@ -278569,7 +279023,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string PropertyTechnologyId { get @@ -278669,166 +279123,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] - public string SubcontractorRemark - { - get - { - return this._SubcontractorRemark; - } - set - { - if ((this._SubcontractorRemark != value)) - { - this.OnSubcontractorRemarkChanging(value); - this.SendPropertyChanging(); - this._SubcontractorRemark = value; - this.SendPropertyChanged("SubcontractorRemark"); - this.OnSubcontractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] - public string ContractorRemark - { - get - { - return this._ContractorRemark; - } - set - { - if ((this._ContractorRemark != value)) - { - this.OnContractorRemarkChanging(value); - this.SendPropertyChanging(); - this._ContractorRemark = value; - this.SendPropertyChanged("ContractorRemark"); - this.OnContractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] - public string SupervisionRemark - { - get - { - return this._SupervisionRemark; - } - set - { - if ((this._SupervisionRemark != value)) - { - this.OnSupervisionRemarkChanging(value); - this.SendPropertyChanging(); - this._SupervisionRemark = value; - this.SendPropertyChanged("SupervisionRemark"); - this.OnSupervisionRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] - public string OwnerRemark - { - get - { - return this._OwnerRemark; - } - set - { - if ((this._OwnerRemark != value)) - { - this.OnOwnerRemarkChanging(value); - this.SendPropertyChanging(); - this._OwnerRemark = value; - this.SendPropertyChanged("OwnerRemark"); - this.OnOwnerRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] - public System.Nullable SubcontractorIsPass - { - get - { - return this._SubcontractorIsPass; - } - set - { - if ((this._SubcontractorIsPass != value)) - { - this.OnSubcontractorIsPassChanging(value); - this.SendPropertyChanging(); - this._SubcontractorIsPass = value; - this.SendPropertyChanged("SubcontractorIsPass"); - this.OnSubcontractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] - public System.Nullable ContractorIsPass - { - get - { - return this._ContractorIsPass; - } - set - { - if ((this._ContractorIsPass != value)) - { - this.OnContractorIsPassChanging(value); - this.SendPropertyChanging(); - this._ContractorIsPass = value; - this.SendPropertyChanged("ContractorIsPass"); - this.OnContractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] - public System.Nullable SupervisionIsPass - { - get - { - return this._SupervisionIsPass; - } - set - { - if ((this._SupervisionIsPass != value)) - { - this.OnSupervisionIsPassChanging(value); - this.SendPropertyChanging(); - this._SupervisionIsPass = value; - this.SendPropertyChanged("SupervisionIsPass"); - this.OnSupervisionIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] - public System.Nullable OwnerIsPass - { - get - { - return this._OwnerIsPass; - } - set - { - if ((this._OwnerIsPass != value)) - { - this.OnOwnerIsPassChanging(value); - this.SendPropertyChanging(); - this._OwnerIsPass = value; - this.SendPropertyChanged("OwnerIsPass"); - this.OnOwnerIsPassChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -279830,6 +280124,8 @@ namespace Model private string _RestrictCondition; + private System.Nullable _ResponsibilityProposeSatate; + private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -279840,9 +280136,11 @@ namespace Model private System.Nullable _OwnerConfirm; + private System.Nullable _ProposeConfirmData; + private System.Nullable _ResponsibilityConfirmData; - private System.Nullable _ProposeConfirmData; + private System.Nullable _ProposeHandleData; private System.Nullable _GeneraConfirmData; @@ -279858,10 +280156,6 @@ namespace Model private System.Nullable _Sort; - private System.Nullable _ResponsibilityProposeSatate; - - private System.Nullable _ProposeHandleData; - private string _FourDecisionCode; #region 可扩展性方法定义 @@ -279898,6 +280192,8 @@ namespace Model partial void OnRealityDestructionTimeChanged(); partial void OnRestrictConditionChanging(string value); partial void OnRestrictConditionChanged(); + partial void OnResponsibilityProposeSatateChanging(System.Nullable value); + partial void OnResponsibilityProposeSatateChanged(); partial void OnResponsibilityConfirmChanging(System.Nullable value); partial void OnResponsibilityConfirmChanged(); partial void OnProposeConfirmChanging(System.Nullable value); @@ -279908,10 +280204,12 @@ namespace Model partial void OnSupervisionConfirmChanged(); partial void OnOwnerConfirmChanging(System.Nullable value); partial void OnOwnerConfirmChanged(); - partial void OnResponsibilityConfirmDataChanging(System.Nullable value); - partial void OnResponsibilityConfirmDataChanged(); partial void OnProposeConfirmDataChanging(System.Nullable value); partial void OnProposeConfirmDataChanged(); + partial void OnResponsibilityConfirmDataChanging(System.Nullable value); + partial void OnResponsibilityConfirmDataChanged(); + partial void OnProposeHandleDataChanging(System.Nullable value); + partial void OnProposeHandleDataChanged(); partial void OnGeneraConfirmDataChanging(System.Nullable value); partial void OnGeneraConfirmDataChanged(); partial void OnSupervisionConfirmDataChanging(System.Nullable value); @@ -279926,10 +280224,6 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); - partial void OnResponsibilityProposeSatateChanging(System.Nullable value); - partial void OnResponsibilityProposeSatateChanged(); - partial void OnProposeHandleDataChanging(System.Nullable value); - partial void OnProposeHandleDataChanged(); partial void OnFourDecisionCodeChanging(string value); partial void OnFourDecisionCodeChanged(); #endregion @@ -280239,6 +280533,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] + public System.Nullable ResponsibilityProposeSatate + { + get + { + return this._ResponsibilityProposeSatate; + } + set + { + if ((this._ResponsibilityProposeSatate != value)) + { + this.OnResponsibilityProposeSatateChanging(value); + this.SendPropertyChanging(); + this._ResponsibilityProposeSatate = value; + this.SendPropertyChanged("ResponsibilityProposeSatate"); + this.OnResponsibilityProposeSatateChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")] public System.Nullable ResponsibilityConfirm { @@ -280339,6 +280653,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] + public System.Nullable ProposeConfirmData + { + get + { + return this._ProposeConfirmData; + } + set + { + if ((this._ProposeConfirmData != value)) + { + this.OnProposeConfirmDataChanging(value); + this.SendPropertyChanging(); + this._ProposeConfirmData = value; + this.SendPropertyChanged("ProposeConfirmData"); + this.OnProposeConfirmDataChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")] public System.Nullable ResponsibilityConfirmData { @@ -280359,22 +280693,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] - public System.Nullable ProposeConfirmData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] + public System.Nullable ProposeHandleData { get { - return this._ProposeConfirmData; + return this._ProposeHandleData; } set { - if ((this._ProposeConfirmData != value)) + if ((this._ProposeHandleData != value)) { - this.OnProposeConfirmDataChanging(value); + this.OnProposeHandleDataChanging(value); this.SendPropertyChanging(); - this._ProposeConfirmData = value; - this.SendPropertyChanged("ProposeConfirmData"); - this.OnProposeConfirmDataChanged(); + this._ProposeHandleData = value; + this.SendPropertyChanged("ProposeHandleData"); + this.OnProposeHandleDataChanged(); } } } @@ -280519,46 +280853,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] - public System.Nullable ResponsibilityProposeSatate - { - get - { - return this._ResponsibilityProposeSatate; - } - set - { - if ((this._ResponsibilityProposeSatate != value)) - { - this.OnResponsibilityProposeSatateChanging(value); - this.SendPropertyChanging(); - this._ResponsibilityProposeSatate = value; - this.SendPropertyChanged("ResponsibilityProposeSatate"); - this.OnResponsibilityProposeSatateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] - public System.Nullable ProposeHandleData - { - get - { - return this._ProposeHandleData; - } - set - { - if ((this._ProposeHandleData != value)) - { - this.OnProposeHandleDataChanging(value); - this.SendPropertyChanging(); - this._ProposeHandleData = value; - this.SendPropertyChanged("ProposeHandleData"); - this.OnProposeHandleDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")] public string FourDecisionCode { @@ -281271,7 +281565,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -316156,164 +316450,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CQMS_ProblemHandle")] - public partial class Report_CQMS_ProblemHandle : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _Id; - - private string _ReportId; - - private string _ReType; - - private string _UnitName; - - private string _ProblemDes; - - #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 OnReportIdChanging(string value); - partial void OnReportIdChanged(); - partial void OnReTypeChanging(string value); - partial void OnReTypeChanged(); - partial void OnUnitNameChanging(string value); - partial void OnUnitNameChanged(); - partial void OnProblemDesChanging(string value); - partial void OnProblemDesChanged(); - #endregion - - public Report_CQMS_ProblemHandle() - { - 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="_ReportId", DbType="NVarChar(50)")] - public string ReportId - { - get - { - return this._ReportId; - } - set - { - if ((this._ReportId != value)) - { - this.OnReportIdChanging(value); - this.SendPropertyChanging(); - this._ReportId = value; - this.SendPropertyChanged("ReportId"); - this.OnReportIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReType", DbType="NChar(20)")] - public string ReType - { - get - { - return this._ReType; - } - set - { - if ((this._ReType != value)) - { - this.OnReTypeChanging(value); - this.SendPropertyChanging(); - this._ReType = value; - this.SendPropertyChanged("ReType"); - this.OnReTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(100)")] - public string UnitName - { - get - { - return this._UnitName; - } - set - { - if ((this._UnitName != value)) - { - this.OnUnitNameChanging(value); - this.SendPropertyChanging(); - this._UnitName = value; - this.SendPropertyChanged("UnitName"); - this.OnUnitNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDes", DbType="NVarChar(100)")] - public string ProblemDes - { - get - { - return this._ProblemDes; - } - set - { - if ((this._ProblemDes != value)) - { - this.OnProblemDesChanging(value); - this.SendPropertyChanging(); - this._ProblemDes = value; - this.SendPropertyChanged("ProblemDes"); - this.OnProblemDesChanged(); - } - } - } - - 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.Report_CqmsTarget")] public partial class Report_CqmsTarget : INotifyPropertyChanging, INotifyPropertyChanged { @@ -353293,6 +353429,8 @@ namespace Model private EntitySet _Doc_DocManage; + private EntitySet _Doc_DocManageApprove; + private EntitySet _Driver_DriverProgress; private EntitySet _Driver_DriverReport; @@ -354014,6 +354152,7 @@ namespace Model this._DataBase_File = new EntitySet(new Action(this.attach_DataBase_File), new Action(this.detach_DataBase_File)); this._DataBase_StartWorkReport = new EntitySet(new Action(this.attach_DataBase_StartWorkReport), new Action(this.detach_DataBase_StartWorkReport)); this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); + this._Doc_DocManageApprove = new EntitySet(new Action(this.attach_Doc_DocManageApprove), new Action(this.detach_Doc_DocManageApprove)); this._Driver_DriverProgress = new EntitySet(new Action(this.attach_Driver_DriverProgress), new Action(this.detach_Driver_DriverProgress)); this._Driver_DriverReport = new EntitySet(new Action(this.attach_Driver_DriverReport), new Action(this.detach_Driver_DriverReport)); this._Driver_DriverScheme = new EntitySet(new Action(this.attach_Driver_DriverScheme), new Action(this.detach_Driver_DriverScheme)); @@ -356421,6 +356560,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Doc_DocManageApprove", ThisKey="UserId", OtherKey="ApproveMan", DeleteRule="NO ACTION")] + public EntitySet Doc_DocManageApprove + { + get + { + return this._Doc_DocManageApprove; + } + set + { + this._Doc_DocManageApprove.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_DriverProgress_Sys_User", Storage="_Driver_DriverProgress", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet Driver_DriverProgress { @@ -360964,6 +361116,18 @@ namespace Model entity.Sys_User = null; } + private void attach_Doc_DocManageApprove(Doc_DocManageApprove entity) + { + this.SendPropertyChanging(); + entity.Sys_User = this; + } + + private void detach_Doc_DocManageApprove(Doc_DocManageApprove entity) + { + this.SendPropertyChanging(); + entity.Sys_User = null; + } + private void attach_Driver_DriverProgress(Driver_DriverProgress entity) { this.SendPropertyChanging(); diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 5fe155da..bd497c6b 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true