diff --git a/DataBase/版本日志/SGGLDB_WH_2024-06-26-wq.sql b/DataBase/版本日志/SGGLDB_WH_2024-06-26-wq.sql new file mode 100644 index 00000000..32e1cafe --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-06-26-wq.sql @@ -0,0 +1,33 @@ +--ɾֶ +alter table Running_Operation drop column RunningId; +alter table Running_Operation drop column InstallationId; +alter table Running_Operation drop column ProcessesId; +alter table Running_Operation drop column SystemId; +alter table Running_Maintenance drop column RunningId; +alter table Running_Maintenance drop column InstallationId; +alter table Running_Maintenance drop column ProcessesId; +alter table Running_Maintenance drop column SystemId; + +--Ӹֶ +alter table Running_LogManagement add MainId varchar(50) null; +alter table Running_Operation add MainId varchar(50) null; +alter table Running_Maintenance add MainId varchar(50) null; + + +if object_id(N'Running_LogMain',N'U') is not null +drop table dbo.Running_LogMain +CREATE TABLE dbo.Running_LogMain( + MainId varchar(50) NOT NULL,-- + ProjectId varchar(50) NULL,--Ŀ + JobNo varchar(50) NULL,--ļ + ShiftType varchar(50) NULL,--ְ1:װ2:ҹ + StartData datetime NULL,--ʼ + EndData datetime NULL,-- + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + CONSTRAINT PK_Running_LogMain PRIMARY KEY CLUSTERED +( + MainId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 63722353..cb873201 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/Personal/BusinessTrip.aspx b/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx index e0d0e57a..92a9239c 100644 --- a/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx +++ b/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx @@ -32,7 +32,7 @@ - diff --git a/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx b/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx index 92599337..e07d0945 100644 --- a/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx +++ b/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx @@ -58,7 +58,7 @@ - diff --git a/SGGL/FineUIPro.Web/Personal/TestRunPerformance.aspx b/SGGL/FineUIPro.Web/Personal/TestRunPerformance.aspx index 7376647e..8899ca59 100644 --- a/SGGL/FineUIPro.Web/Personal/TestRunPerformance.aspx +++ b/SGGL/FineUIPro.Web/Personal/TestRunPerformance.aspx @@ -27,7 +27,7 @@ - diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx index 89dadea0..38282c09 100644 --- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx @@ -173,7 +173,7 @@ @@ -219,7 +219,7 @@ diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.cs index d6ead992..7f635d59 100644 --- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.cs @@ -1,6 +1,7 @@ using BLL; using FineUIPro.Web.DataShow; using FineUIPro.Web.ProjectData; +using Microsoft.Office.Interop.Word; using Model; using Newtonsoft.Json.Linq; using NPOI.SS.Formula.Functions; @@ -20,13 +21,13 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun /// /// 日志 /// - public string RunningId { get { return (string)ViewState["RunningId"]; } set { ViewState["RunningId"] = value; } } + public string MainId { get { return (string)ViewState["MainId"]; } set { ViewState["MainId"] = value; } } protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) { - this.RunningId = Request["RunningId"]; + this.MainId = Request["MainId"]; PageBase(); } } @@ -101,28 +102,25 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun ddlSuccessionUser.DataSource = users; ddlSuccessionUser.DataBind(); ddlSuccessionUser.SelectedValue = this.CurrUser.UserId; - List options = new List(); - var model = Funs.DB.Running_LogManagement.FirstOrDefault(x => x.RunningId == this.RunningId); - if (model != null) + var mainModel = Funs.DB.Running_LogMain.FirstOrDefault(x => x.MainId == this.MainId); + if (mainModel != null) { - options.Add(model.SystemId); - txtJobNo.Text = model.JobNo; - ddlShiftUser.SelectedValue = model.ShiftUser; - ddlSuccessionUser.SelectedValue = model.SuccessionUser; - txtStartData.Text = model.StartData.Value.ToString("yyyy-MM-dd HH:mm:ss"); - txtEndData.Text = model.EndData.Value.ToString("yyyy-MM-dd HH:mm:ss"); - txtHandoverCare.Text = model.HandoverCare; - var dataInstall = alllist.FirstOrDefault(x => x.PreRunId == model.InstallationId); - if (dataInstall.PreRunName == "公用工程") - { - rdbEngineeringOperation.SelectedValueArray = options.ToArray(); - EngineeringDataBrid(); - } - if (dataInstall.PreRunName == "工艺装置") - { - rdbDeviceOption.SelectedValueArray = options.ToArray(); - DriveDataBrid(); - } + var managements = Funs.DB.Running_LogManagement.Where(x => x.MainId == this.MainId).ToList(); + var manaModel = managements.FirstOrDefault(); + var options = managements.ConvertAll(x => x.SystemId); + txtJobNo.Text = mainModel.JobNo; + ddlShiftUser.SelectedValue = manaModel.ShiftUser; + ddlSuccessionUser.SelectedValue = manaModel.SuccessionUser; + txtStartData.Text = mainModel.StartData.Value.ToString("yyyy-MM-dd HH:mm:ss"); + txtEndData.Text = mainModel.EndData.Value.ToString("yyyy-MM-dd HH:mm:ss"); + txtHandoverCare.Text = manaModel.HandoverCare; + + + rdbEngineeringOperation.SelectedValueArray = options.ToArray(); + EngineeringDataBrid(); + rdbDeviceOption.SelectedValueArray = options.ToArray(); + DriveDataBrid(); + gvOperationBrid(); gvMaintenanceBrid(); } @@ -241,25 +239,39 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun ShowNotify("请添加维护问题!", MessageBoxIcon.Warning); return; } - + var main = Funs.DB.Running_LogMain.FirstOrDefault(x => x.MainId == this.MainId); var addlist = new List(); var addoptionlist = new List(); var addmaintenancelist = new List(); - var ids = list.ConvertAll(x => x.RunningId); - var existlist = Funs.DB.Running_LogManagement.Where(x => ids.Contains(x.RunningId)).ToList(); + //删除系统日志记录 + var deleteRunnings = Funs.DB.Running_LogManagement.Where(x => x.MainId == this.MainId); + if (deleteRunnings.Count() > 0) + { + Funs.DB.Running_LogManagement.DeleteAllOnSubmit(deleteRunnings); + Funs.DB.SubmitChanges(); + } + bool add = false; + if (main == null) + { + add = true; + main = new Running_LogMain(); + main.MainId = Guid.NewGuid().ToString(); + main.AddUser = this.CurrUser.UserId; + main.AddTime = DateTime.Now; + } + main.ProjectId = this.CurrUser.LoginProjectId; + main.JobNo = txtJobNo.Text; + main.ShiftType = ddlShiftType.SelectedValue; + main.StartData = DateTime.Parse(txtStartData.Text); + main.EndData = DateTime.Parse(txtEndData.Text); + if (add) Funs.DB.Running_LogMain.InsertOnSubmit(main); + //子系统 foreach (var item in list) { - bool add = false; - var model = existlist.FirstOrDefault(x => x.RunningId == this.RunningId); - if (model == null) - { - add = true; - model = new Running_LogManagement(); - model.RunningId = Guid.NewGuid().ToString(); - model.ProjectId = this.CurrUser.LoginProjectId; - model.AddUser = this.CurrUser.UserId; - model.AddTime = DateTime.Now; - } + var model = new Running_LogManagement(); + model.RunningId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.MainId = main.MainId; model.InstallationId = item.InstallationId; model.ProcessesId = item.ProcessesId; model.SystemId = item.SystemId; @@ -272,58 +284,50 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun model.EndData = DateTime.Parse(txtEndData.Text); model.Situation = item.Situation; model.Remarks = item.Remarks; - - foreach (var itemoption in optionlist) - { - addoptionlist.Add(new Running_Operation() - { - OperationId = Guid.NewGuid().ToString(), - RunningId = model.RunningId, - InstallationId = item.InstallationId, - ProcessesId = item.ProcessesId, - SystemId = item.SystemId, - OperationReason = itemoption.OperationReason, - OperationHandle = itemoption.OperationHandle, - ProjectId = this.CurrUser.LoginProjectId, - AddUser = this.CurrUser.UserId, - AddTime = DateTime.Now, - }); - } - foreach (var itemmain in maintenancelist) - { - addmaintenancelist.Add(new Running_Maintenance() - { - MaintenanceId = Guid.NewGuid().ToString(), - RunningId = model.RunningId, - InstallationId = item.InstallationId, - ProcessesId = item.ProcessesId, - SystemId = item.SystemId, - MaintenanceReason = itemmain.MaintenanceReason, - MaintenanceHandle = itemmain.MaintenanceHandle, - ProjectId = this.CurrUser.LoginProjectId, - AddUser = this.CurrUser.UserId, - AddTime = DateTime.Now, - }); - } - if (add) - { - Funs.DB.SubmitChanges(); - addlist.Add(model); - } - else - { - Funs.DB.SubmitChanges(); - } + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + model.Sort = item.Sort; + addlist.Add(model); } + //操作问题 + foreach (var itemoption in optionlist) + { + addoptionlist.Add(new Running_Operation() + { + OperationId = Guid.NewGuid().ToString(), + MainId = main.MainId, + OperationReason = itemoption.OperationReason, + OperationHandle = itemoption.OperationHandle, + ProjectId = this.CurrUser.LoginProjectId, + AddUser = this.CurrUser.UserId, + AddTime = DateTime.Now, + }); + } + //维护问题 + foreach (var itemmain in maintenancelist) + { + addmaintenancelist.Add(new Running_Maintenance() + { + MaintenanceId = Guid.NewGuid().ToString(), + MainId = main.MainId, + MaintenanceReason = itemmain.MaintenanceReason, + MaintenanceHandle = itemmain.MaintenanceHandle, + ProjectId = this.CurrUser.LoginProjectId, + AddUser = this.CurrUser.UserId, + AddTime = DateTime.Now, + }); + } + + if (addlist.Count > 0) Funs.DB.Running_LogManagement.InsertAllOnSubmit(addlist); - var runIds = list.ConvertAll(x => x.RunningId); - var deleteOperas = Funs.DB.Running_Operation.Where(x => runIds.Contains(x.RunningId)).ToList(); + + var deleteOperas = Funs.DB.Running_Operation.Where(x => x.MainId == this.MainId).ToList(); if (deleteOperas.Count > 0) { Funs.DB.Running_Operation.DeleteAllOnSubmit(deleteOperas); Funs.DB.SubmitChanges(); } - var deleteMaints = Funs.DB.Running_Maintenance.Where(x => runIds.Contains(x.RunningId)).ToList(); + var deleteMaints = Funs.DB.Running_Maintenance.Where(x => x.MainId == this.MainId).ToList(); if (deleteMaints.Count > 0) { Funs.DB.Running_Maintenance.DeleteAllOnSubmit(deleteMaints); @@ -342,40 +346,45 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun /// public void EngineeringDataBrid(List list = null) { - if (list == null) list = new List(); var engineeringModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && x.PreRunName.Trim() == "公用工程"); if (engineeringModel == null) { + list = new List(); gvEngineeringOption.DataSource = list; gvEngineeringOption.DataBind(); return; } - var query = from a in Funs.DB.Running_LogManagement - join b in Funs.DB.PreRun_SysDevice on a.SystemId equals b.PreRunId - where a.RunningId == this.RunningId && a.InstallationId == engineeringModel.PreRunId - select new Running_LogManagementDto - { - RunningId = a.RunningId, - ProjectId = a.ProjectId, - InstallationId = a.InstallationId, - ProcessesId = a.ProcessesId, - SystemId = a.SystemId, - SystemName = b.PreRunName, - JobNo = a.JobNo, - ShiftType = a.ShiftType, - ShiftUser = a.ShiftUser, - SuccessionUser = a.SuccessionUser, - StartData = a.StartData, - EndData = a.EndData, - Situation = a.Situation, - Remarks = a.Remarks, - HandoverCare = a.HandoverCare, - AddUser = a.AddUser, - AddTime = a.AddTime - }; + if (list == null) + { + list = new List(); + var query = from a in Funs.DB.Running_LogManagement + join b in Funs.DB.PreRun_SysDevice on a.SystemId equals b.PreRunId + where a.MainId == this.MainId && a.InstallationId == engineeringModel.PreRunId + orderby a.Sort ascending + select new Running_LogManagementDto + { + RunningId = a.RunningId, + ProjectId = a.ProjectId, + InstallationId = a.InstallationId, + ProcessesId = a.ProcessesId, + SystemId = a.SystemId, + SystemName = b.PreRunName, + JobNo = a.JobNo, + ShiftType = a.ShiftType, + ShiftUser = a.ShiftUser, + SuccessionUser = a.SuccessionUser, + StartData = a.StartData, + EndData = a.EndData, + Situation = a.Situation, + Remarks = a.Remarks, + HandoverCare = a.HandoverCare, + AddUser = a.AddUser, + AddTime = a.AddTime + }; - var data = query.ToList(); - if (data.Count > 0) list.AddRange(data); + var data = query.ToList(); + if (data.Count > 0) list.AddRange(data); + } gvEngineeringOption.DataSource = list; gvEngineeringOption.DataBind(); } @@ -404,6 +413,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun Remarks = values.Value("Remarks"), AddUser = CurrUser.UserId, AddTime = DateTime.Now, + Sort = i + 1 }); } return massQuestionLs; @@ -414,40 +424,46 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun /// public void DriveDataBrid(List list = null) { - if (list == null) list = new List(); var deviceModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && x.PreRunName.Trim() == "工艺装置"); if (deviceModel == null) { + list = new List(); gvDeviceOption.DataSource = list; gvDeviceOption.DataBind(); return; } - var query = from a in Funs.DB.Running_LogManagement - join b in Funs.DB.PreRun_SysDevice on a.SystemId equals b.PreRunId - where a.RunningId == this.RunningId && a.InstallationId == deviceModel.PreRunId - select new Running_LogManagementDto - { - RunningId = a.RunningId, - ProjectId = a.ProjectId, - InstallationId = a.InstallationId, - ProcessesId = a.ProcessesId, - SystemId = a.SystemId, - SystemName = b.PreRunName, - JobNo = a.JobNo, - ShiftType = a.ShiftType, - ShiftUser = a.ShiftUser, - SuccessionUser = a.SuccessionUser, - StartData = a.StartData, - EndData = a.EndData, - Situation = a.Situation, - Remarks = a.Remarks, - HandoverCare = a.HandoverCare, - AddUser = a.AddUser, - AddTime = a.AddTime - }; + if (list == null) + { + list = new List(); + var query = from a in Funs.DB.Running_LogManagement + join b in Funs.DB.PreRun_SysDevice on a.SystemId equals b.PreRunId + where a.MainId == this.MainId && a.InstallationId == deviceModel.PreRunId + orderby a.Sort ascending + select new Running_LogManagementDto + { + RunningId = a.RunningId, + ProjectId = a.ProjectId, + InstallationId = a.InstallationId, + ProcessesId = a.ProcessesId, + SystemId = a.SystemId, + SystemName = b.PreRunName, + JobNo = a.JobNo, + ShiftType = a.ShiftType, + ShiftUser = a.ShiftUser, + SuccessionUser = a.SuccessionUser, + StartData = a.StartData, + EndData = a.EndData, + Situation = a.Situation, + Remarks = a.Remarks, + HandoverCare = a.HandoverCare, + AddUser = a.AddUser, + AddTime = a.AddTime, + Sort = a.Sort + }; - var data = query.ToList(); - if (data.Count > 0) list.AddRange(data); + var data = query.ToList(); + if (data.Count > 0) list.AddRange(data); + } gvDeviceOption.DataSource = list; gvDeviceOption.DataBind(); } @@ -476,6 +492,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun Remarks = values.Value("Remarks"), AddUser = CurrUser.UserId, AddTime = DateTime.Now, + Sort = i + 1 }); } return massQuestionLs; @@ -493,7 +510,8 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun /// public void gvOperationBrid() { - var list = Funs.DB.Running_Operation.Where(x => x.RunningId == this.RunningId).ToList(); + var query = from a in Funs.DB.Running_Operation join b in Funs.DB.Running_LogMain on a.MainId equals b.MainId select a; + var list = query.ToList(); gvOperation.DataSource = list; gvOperation.DataBind(); } @@ -513,11 +531,8 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun massQuestionLs.Add(new Running_Operation { OperationId = IsStrVal(this.gvOperation.Rows[i].DataKeys[0]), - RunningId = IsStrVal(this.gvOperation.Rows[i].DataKeys[1]), - ProjectId = this.CurrUser.LoginProjectId, - InstallationId = IsStrVal(this.gvOperation.Rows[i].DataKeys[2]), - ProcessesId = IsStrVal(this.gvOperation.Rows[i].DataKeys[3]), - SystemId = IsStrVal(this.gvOperation.Rows[i].DataKeys[4]), + MainId = IsStrVal(this.gvOperation.Rows[i].DataKeys[1]), + ProjectId = this.CurrUser.LoginProjectId, OperationReason = values.Value("OperationReason"), OperationHandle = values.Value("OperationHandle"), AddUser = CurrUser.UserId, @@ -581,7 +596,8 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun /// public void gvMaintenanceBrid() { - var list = Funs.DB.Running_Maintenance.Where(x => x.RunningId == this.RunningId).ToList(); + var query = from a in Funs.DB.Running_Maintenance join b in Funs.DB.Running_LogMain on a.MainId equals b.MainId select a; + var list = query.ToList(); gvMaintenance.DataSource = list; gvMaintenance.DataBind(); } @@ -601,11 +617,8 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun massQuestionLs.Add(new Running_Maintenance { MaintenanceId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[0]), - RunningId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[1]), + MainId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[1]), ProjectId = this.CurrUser.LoginProjectId, - InstallationId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[2]), - ProcessesId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[3]), - SystemId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[4]), MaintenanceReason = values.Value("MaintenanceReason"), MaintenanceHandle = values.Value("MaintenanceHandle"), AddUser = CurrUser.UserId, diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx index ff84b5d7..315d61db 100644 --- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx +++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx @@ -68,7 +68,7 @@ + runat="server" BoxFlex="1" DataKeyNames="MainId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="MainId" AllowSorting="true" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true" EnableTextSelection="True" EnableMultiSelect="false" EnableCheckBoxSelect="true"> @@ -103,19 +103,9 @@ - + - - - - - - - - - - - + @@ -138,7 +128,6 @@ - diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs index 78739ad3..88bfc842 100644 --- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs @@ -14,6 +14,7 @@ using NPOI.SS.Util; using NPOI.XSSF.UserModel; using Model; using NPOI.SS.Formula.Functions; +using FineUIPro.Web.ProjectData; namespace FineUIPro.Web.TestRun.ProduceTestRun { @@ -80,17 +81,17 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun public void BindGrid() { var years = DateTime.Now.Year; - string strSql = @"select a.RunningId,a.ProjectId,project.ProjectName as ProjectName,a.InstallationId,a.ProcessesId,a.SystemId,inst.PreRunName as InstallationName,proce.PreRunName as ProcessesName,syst.PreRunName as SystemName,a.JobNo,a.ShiftType,(case a.ShiftType when 1 then '白班' else '夜班' end) as ShiftTypeName,a.ShiftUser,shiftuser.UserName as ShiftUserName,a.SuccessionUser,successuser.UserName as SuccessionUserName,a.StartData,a.EndData,a.AddUser,a.AddTime,a.Sort from Running_LogManagement as a inner join Sys_User as shiftuser on shiftuser.UserId=a.ShiftUser inner join Sys_User as successuser on successuser.UserId=a.SuccessionUser inner join Base_Project as project on project.ProjectId=a.ProjectId inner join PreRun_SysDevice as inst on inst.PreRunId=a.InstallationId inner join PreRun_SysDevice as proce on proce.PreRunId=a.ProcessesId inner join PreRun_SysDevice as syst on syst.PreRunId=a.SystemId where a.ProjectId=@ProjectId "; + string strSql = @"select a.MainId,a.ProjectId,project.ProjectName as ProjectName,a.JobNo,a.ShiftType,(case a.ShiftType when 1 then '白班' else '夜班' end) as ShiftTypeName,a.StartData,a.EndData,a.AddUser,a.AddTime from Running_LogMain as a inner join Base_Project as project on project.ProjectId=a.ProjectId where a.ProjectId=@ProjectId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - if (!string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID)) - { - if (this.tvControlItem.SelectedNodeID != "0" && !string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID)) - { - strSql += " and a.InstallationId=@InstallationId"; - listStr.Add(new SqlParameter("@InstallationId", this.tvControlItem.SelectedNodeID)); - } - } + //if (!string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID)) + //{ + // if (this.tvControlItem.SelectedNodeID != "0" && !string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID)) + // { + // strSql += " and a.InstallationId=@InstallationId"; + // listStr.Add(new SqlParameter("@InstallationId", this.tvControlItem.SelectedNodeID)); + // } + //} if (!string.IsNullOrWhiteSpace(txtStartData.Text)) { strSql += " and a.StartData>=@StartData"; @@ -107,16 +108,16 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun strSql += " and a.ShiftType=@ShiftType"; listStr.Add(new SqlParameter("@ShiftType", ddlShiftType.SelectedValue)); } - strSql += " order by inst.PreRunLevel,inst.Sort,proce.Sort,syst.Sort asc"; + strSql += " order by a.StartData asc"; SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); Grid1.RecordCount = tb.Rows.Count; var table = this.GetPagedDataTable(Grid1, tb); Grid1.DataSource = table; Grid1.DataBind(); - if (Funs.DB.Running_LogManagement.Count(x => x.StartData.Value.Year == years) > 0) + if (Funs.DB.Running_LogMain.Count(x => x.StartData.Value.Year == years) > 0) { - var minTime = Funs.DB.Running_LogManagement.Where(x => x.StartData.Value.Year == years).Min(m => m.StartData); + var minTime = Funs.DB.Running_LogMain.Where(x => x.StartData.Value.Year == years).Min(m => m.StartData); lblminTime.Text = $"{years}年日志最小日期：{minTime.Value.ToString("yyyy-MM-dd")}"; } else @@ -184,7 +185,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun /// protected void btnAdd_Click(object sender, EventArgs e) { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RunningLogManagementEdit.aspx?RunningId=", "新增 - "))); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RunningLogManagementEdit.aspx?MainId=", "新增 - "))); } /// @@ -197,7 +198,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); return; } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RunningLogManagementEdit.aspx?RunningId={0}", Grid1.SelectedRowID, "编辑 - "))); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RunningLogManagementEdit.aspx?MainId={0}", Grid1.SelectedRowID, "编辑 - "))); } /// @@ -211,10 +212,10 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun return; } var ids = Grid1.SelectedRowIDArray.ToList(); - var list = Funs.DB.Running_LogManagement.Where(x => ids.Contains(x.RunningId)).ToList(); + var list = Funs.DB.Running_LogMain.Where(x => ids.Contains(x.MainId)).ToList(); if (list.Count > 0) { - Funs.DB.Running_LogManagement.DeleteAllOnSubmit(list); + Funs.DB.Running_LogMain.DeleteAllOnSubmit(list); Funs.DB.SubmitChanges(); BindGrid(); Alert.ShowInTop("删除成功！", MessageBoxIcon.Success); @@ -231,7 +232,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun Alert.ShowInTop("请至少选择记录，最大只可选择一条！", MessageBoxIcon.Warning); return; } - var runningId = this.Grid1.Rows[Grid1.SelectedRowIndex].DataKeys[0].ToString(); + var mainId = this.Grid1.Rows[Grid1.SelectedRowIndex].DataKeys[0].ToString(); string rootPath = Server.MapPath("~/") + Const.ExcelUrl; //导出文件 @@ -245,14 +246,20 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun join b in Funs.DB.Base_Project on a.ProjectId equals b.ProjectId join c in Funs.DB.Sys_User on a.ShiftUser equals c.UserId join d in Funs.DB.Sys_User on a.SuccessionUser equals d.UserId - where a.RunningId == runningId + join init in Funs.DB.PreRun_SysDevice on a.InstallationId equals init.PreRunId + join sys in Funs.DB.PreRun_SysDevice on a.SystemId equals sys.PreRunId + where a.MainId == mainId + orderby a.Sort ascending select new { a.RunningId, + a.MainId, a.ProjectId, a.InstallationId, + InstallationName = init.PreRunName, a.ProcessesId, a.SystemId, + SystemName = sys.PreRunName, a.JobNo, a.ShiftType, ShiftTypeName = a.ShiftType == "1" ? "白班" : "夜班", @@ -269,17 +276,18 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun a.AddTime, a.Sort }; - var model = data.FirstOrDefault(); - if (model != null) + var list = data.ToList(); + if (list.Count > 0) { + var firstModel = list.FirstOrDefault(); //操作问题 - var operations = Funs.DB.Running_Operation.Where(x => x.RunningId == model.RunningId).ToList(); + var operations = Funs.DB.Running_Operation.Where(x => x.MainId == mainId).ToList(); //维护问题 - var maintes = Funs.DB.Running_Maintenance.Where(x => x.RunningId == model.RunningId).ToList(); - string ReportFileName = $"{filePath}Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {model.ShiftUserName}).xlsx"; + var maintes = Funs.DB.Running_Maintenance.Where(x => x.MainId == mainId).ToList(); + string ReportFileName = $"{filePath}Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {firstModel.ShiftUserName}).xlsx"; int rowIndex = 0; XSSFWorkbook hssfworkbook = new XSSFWorkbook(); - XSSFSheet ws = (XSSFSheet)hssfworkbook.CreateSheet($"Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {model.ShiftUserName})"); + XSSFSheet ws = (XSSFSheet)hssfworkbook.CreateSheet($"Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {firstModel.ShiftUserName})"); #region 列宽 @@ -341,7 +349,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun //行5 region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 0, 5); ws.AddMergedRegion(region); - ws.GetRow(rowIndex + 4).GetCell(0).SetCellValue($"Shift：（{model.ShiftUserName}） Succession：（{model.SuccessionUserName}） {model.StartData.Value.ToString("yyyy-MM-dd")}— {model.EndData.Value.ToString("yyyy-MM-dd")}"); + ws.GetRow(rowIndex + 4).GetCell(0).SetCellValue($"Shift：（{firstModel.ShiftUserName}） Succession：（{firstModel.SuccessionUserName}） {firstModel.StartData.Value.ToString("yyyy-MM-dd")}— {firstModel.EndData.Value.ToString("yyyy-MM-dd")}"); ws.GetRow(rowIndex + 4).GetCell(0).CellStyle = styleBold; //行6 region = new CellRangeAddress(rowIndex + 5, rowIndex + 5, 0, 3); @@ -359,25 +367,29 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun var dataIndex = 5; - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5); - region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 3); - ws.AddMergedRegion(region); - ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("DW Station 脱盐水"); - ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold; - region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 4, 5); - ws.AddMergedRegion(region); - ws.GetRow(dataIndex + 1).GetCell(4).SetCellValue(""); - ws.GetRow(dataIndex + 1).GetCell(4).CellStyle = leftStyle; - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 90); - region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 3); - ws.AddMergedRegion(region); - ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(model.Situation); - ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle; - region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 4, 5); - ws.AddMergedRegion(region); - ws.GetRow(dataIndex + 2).GetCell(4).SetCellValue(model.Remarks); - ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle; - dataIndex += 2; + foreach (var item in list) + { + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5); + region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 3); + ws.AddMergedRegion(region); + ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue(item.SystemName); + ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold; + region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 4, 5); + ws.AddMergedRegion(region); + ws.GetRow(dataIndex + 1).GetCell(4).SetCellValue(""); + ws.GetRow(dataIndex + 1).GetCell(4).CellStyle = leftStyle; + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 90); + region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 3); + ws.AddMergedRegion(region); + ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(item.Situation); + ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle; + region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 4, 5); + ws.AddMergedRegion(region); + ws.GetRow(dataIndex + 2).GetCell(4).SetCellValue(item.Remarks); + ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle; + dataIndex += 2; + } + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5); region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5); @@ -387,11 +399,10 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 30); region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 5); ws.AddMergedRegion(region); - ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(model.HandoverCare); + ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(firstModel.HandoverCare); ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle; dataIndex += 2; - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5); region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5); ws.AddMergedRegion(region); @@ -449,7 +460,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun Response.Charset = "GB2312"; Response.ContentEncoding = System.Text.Encoding.UTF8; // 添加头信息，为"文件下载/另存为"对话框指定默认文件名 - Response.AddHeader("Content-Disposition", "attachment; filename=" + Server.UrlEncode($"Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {model.ShiftUserName}).xlsx")); + Response.AddHeader("Content-Disposition", "attachment; filename=" + Server.UrlEncode($"Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {firstModel.ShiftUserName}).xlsx")); // 添加头信息，指定文件大小，让浏览器能够显示下载进度 Response.AddHeader("Content-Length", filet.Length.ToString()); // 指定返回的是一个不能被客户端读取的流，必须被下载 diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 9fc55c34..963148f2 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx index 2106e0fb..cb378079 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx @@ -109,6 +109,11 @@
+
+
+
投料试车进度
+
+
未投料
@@ -131,13 +136,18 @@
+
+
+
试运行进度
+
+
-
未运行
+
未运行
-
运行中
+
运行中
-
停车检修
+
停车检修
@@ -149,16 +159,21 @@
-
-
-
考核未开始
-
-
考核进行中
-
-
考核已完成
+
+
+
性能考核进度
-
+
+
+
考核未开始
+
+
考核进行中
+
+
考核已完成
+
+
+
@@ -494,12 +509,19 @@ //图6 var sixStr = '<%=runProductionStr%>'; var sixData = JSON.parse(sixStr); - var colorData = ["#988989", "#6D5F5F", "#524747"]; + //var colorData = ["#988989", "#6D5F5F", "#524747"]; + //if (sixData.States == 2) { + // colorData = ["#2B1485", "#3E1DC0", "#603FE2"]; + //} + //if (sixData.States == 3) { + // colorData = ["#106722", "#20CE43", "#5DE679"]; + //} + var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"]; if (sixData.States == 2) { - colorData = ["#2B1485", "#3E1DC0", "#603FE2"]; + colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"]; } if (sixData.States == 3) { - colorData = ["#106722", "#20CE43", "#5DE679"]; + colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"]; } var chart = echarts.init(document.getElementById('six')); var value = 100; @@ -787,12 +809,19 @@ $.each(fourData, function (index, item) { - var colorData = ["#808080", "#A2945E", "#B3764D", "#482F1F"]; + //var colorData = ["#808080", "#A2945E", "#B3764D", "#482F1F"]; + //if (item.RunType == 2) { + // colorData = ["#A2945E", "#4444BB", "#D52B6F", "#DD226D"]; + //} + //if (item.RunType == 3) { + // colorData = ["#CCCC33", "#8FCC33", "#57C43C", "#22DD48"]; + //} + var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"]; if (item.RunType == 2) { - colorData = ["#A2945E", "#4444BB", "#D52B6F", "#DD226D"]; + colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"]; } if (item.RunType == 3) { - colorData = ["#CCCC33", "#8FCC33", "#57C43C", "#22DD48"]; + colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"]; } var chart = echarts.init(document.getElementById('four' + index)); var value = 100; @@ -805,13 +834,13 @@ top: '45%', //top待调整 textStyle: { color: '#fff', - fontSize: 9, - fontFamily: 'DINAlternate-Bold', + fontSize: 10, + fontFamily: 'Microsoft YaHei', }, subtextStyle: { - color: '#ff', - fontSize: 9, - fontFamily: 'PingFangSC-Regular', + color: '#fff', + fontSize: 10, + fontFamily: 'Microsoft YaHei', top: 'center' }, itemGap: 10 //主副标题间距 @@ -890,10 +919,10 @@ var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"]; if (item.RunType == 2) { - colorData = ["#A5F82A", "#2AF853", "#31F0F0", "#3FC1E2"]; + colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"]; } if (item.RunType == 3) { - colorData = ["#F82AF8", "#F0A431", "#E95B39", "#F82A2A"]; + colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"]; } var chart = echarts.init(document.getElementById('five' + index)); var value = 100; @@ -906,13 +935,13 @@ top: '45%', //top待调整 textStyle: { color: '#fff', - fontSize: 9, - fontFamily: 'DINAlternate-Bold', + fontSize: 10, + fontFamily: 'Microsoft YaHei', }, subtextStyle: { color: '#ff', fontSize: 9, - fontFamily: 'PingFangSC-Regular', + fontFamily: 'Microsoft YaHei', top: 'center' }, itemGap: 10 //主副标题间距 diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 4bc6ac51..19ee83c0 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -2084,6 +2084,9 @@ namespace Model partial void InsertRun_ScheduleSetUp(Run_ScheduleSetUp instance); partial void UpdateRun_ScheduleSetUp(Run_ScheduleSetUp instance); partial void DeleteRun_ScheduleSetUp(Run_ScheduleSetUp instance); + partial void InsertRunning_LogMain(Running_LogMain instance); + partial void UpdateRunning_LogMain(Running_LogMain instance); + partial void DeleteRunning_LogMain(Running_LogMain instance); partial void InsertRunning_LogManagement(Running_LogManagement instance); partial void UpdateRunning_LogManagement(Running_LogManagement instance); partial void DeleteRunning_LogManagement(Running_LogManagement instance); @@ -8207,6 +8210,14 @@ namespace Model } } + public System.Data.Linq.Table Running_LogMain + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Running_LogManagement { get @@ -320608,6 +320619,236 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Running_LogMain")] + public partial class Running_LogMain : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MainId; + + private string _ProjectId; + + private string _JobNo; + + private string _ShiftType; + + private System.Nullable _StartData; + + private System.Nullable _EndData; + + private string _AddUser; + + private System.Nullable _AddTime; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMainIdChanging(string value); + partial void OnMainIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnJobNoChanging(string value); + partial void OnJobNoChanged(); + partial void OnShiftTypeChanging(string value); + partial void OnShiftTypeChanged(); + partial void OnStartDataChanging(System.Nullable value); + partial void OnStartDataChanged(); + partial void OnEndDataChanging(System.Nullable value); + partial void OnEndDataChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + #endregion + + public Running_LogMain() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MainId + { + get + { + return this._MainId; + } + set + { + if ((this._MainId != value)) + { + this.OnMainIdChanging(value); + this.SendPropertyChanging(); + this._MainId = value; + this.SendPropertyChanged("MainId"); + this.OnMainIdChanged(); + } + } + } + + [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="_JobNo", DbType="VarChar(50)")] + public string JobNo + { + get + { + return this._JobNo; + } + set + { + if ((this._JobNo != value)) + { + this.OnJobNoChanging(value); + this.SendPropertyChanging(); + this._JobNo = value; + this.SendPropertyChanged("JobNo"); + this.OnJobNoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ShiftType", DbType="VarChar(50)")] + public string ShiftType + { + get + { + return this._ShiftType; + } + set + { + if ((this._ShiftType != value)) + { + this.OnShiftTypeChanging(value); + this.SendPropertyChanging(); + this._ShiftType = value; + this.SendPropertyChanged("ShiftType"); + this.OnShiftTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StartData", DbType="DateTime")] + public System.Nullable StartData + { + get + { + return this._StartData; + } + set + { + if ((this._StartData != value)) + { + this.OnStartDataChanging(value); + this.SendPropertyChanging(); + this._StartData = value; + this.SendPropertyChanged("StartData"); + this.OnStartDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EndData", DbType="DateTime")] + public System.Nullable EndData + { + get + { + return this._EndData; + } + set + { + if ((this._EndData != value)) + { + this.OnEndDataChanging(value); + this.SendPropertyChanging(); + this._EndData = value; + this.SendPropertyChanged("EndData"); + this.OnEndDataChanged(); + } + } + } + + [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(); + } + } + } + + 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.Running_LogManagement")] public partial class Running_LogManagement : INotifyPropertyChanging, INotifyPropertyChanged { @@ -320648,6 +320889,8 @@ namespace Model private System.Nullable _Sort; + private string _MainId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -320686,6 +320929,8 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnMainIdChanging(string value); + partial void OnMainIdChanged(); #endregion public Running_LogManagement() @@ -321033,6 +321278,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainId", DbType="VarChar(50)")] + public string MainId + { + get + { + return this._MainId; + } + set + { + if ((this._MainId != value)) + { + this.OnMainIdChanging(value); + this.SendPropertyChanging(); + this._MainId = value; + this.SendPropertyChanged("MainId"); + this.OnMainIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -321062,16 +321327,8 @@ namespace Model private string _MaintenanceId; - private string _RunningId; - private string _ProjectId; - private string _InstallationId; - - private string _ProcessesId; - - private string _SystemId; - private string _MaintenanceReason; private string _MaintenanceHandle; @@ -321082,22 +321339,16 @@ namespace Model private System.Nullable _Sort; + private string _MainId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnCreated(); partial void OnMaintenanceIdChanging(string value); partial void OnMaintenanceIdChanged(); - partial void OnRunningIdChanging(string value); - partial void OnRunningIdChanged(); partial void OnProjectIdChanging(string value); partial void OnProjectIdChanged(); - partial void OnInstallationIdChanging(string value); - partial void OnInstallationIdChanged(); - partial void OnProcessesIdChanging(string value); - partial void OnProcessesIdChanged(); - partial void OnSystemIdChanging(string value); - partial void OnSystemIdChanged(); partial void OnMaintenanceReasonChanging(string value); partial void OnMaintenanceReasonChanged(); partial void OnMaintenanceHandleChanging(string value); @@ -321108,6 +321359,8 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnMainIdChanging(string value); + partial void OnMainIdChanged(); #endregion public Running_Maintenance() @@ -321135,26 +321388,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RunningId", DbType="VarChar(50)")] - public string RunningId - { - get - { - return this._RunningId; - } - set - { - if ((this._RunningId != value)) - { - this.OnRunningIdChanging(value); - this.SendPropertyChanging(); - this._RunningId = value; - this.SendPropertyChanged("RunningId"); - this.OnRunningIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] public string ProjectId { @@ -321175,66 +321408,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="VarChar(50)")] - public string InstallationId - { - get - { - return this._InstallationId; - } - set - { - if ((this._InstallationId != value)) - { - this.OnInstallationIdChanging(value); - this.SendPropertyChanging(); - this._InstallationId = value; - this.SendPropertyChanged("InstallationId"); - this.OnInstallationIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProcessesId", DbType="VarChar(50)")] - public string ProcessesId - { - get - { - return this._ProcessesId; - } - set - { - if ((this._ProcessesId != value)) - { - this.OnProcessesIdChanging(value); - this.SendPropertyChanging(); - this._ProcessesId = value; - this.SendPropertyChanged("ProcessesId"); - this.OnProcessesIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemId", DbType="VarChar(50)")] - public string SystemId - { - get - { - return this._SystemId; - } - set - { - if ((this._SystemId != value)) - { - this.OnSystemIdChanging(value); - this.SendPropertyChanging(); - this._SystemId = value; - this.SendPropertyChanged("SystemId"); - this.OnSystemIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaintenanceReason", DbType="VarChar(1000)")] public string MaintenanceReason { @@ -321335,6 +321508,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainId", DbType="VarChar(50)")] + public string MainId + { + get + { + return this._MainId; + } + set + { + if ((this._MainId != value)) + { + this.OnMainIdChanging(value); + this.SendPropertyChanging(); + this._MainId = value; + this.SendPropertyChanged("MainId"); + this.OnMainIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -321364,16 +321557,8 @@ namespace Model private string _OperationId; - private string _RunningId; - private string _ProjectId; - private string _InstallationId; - - private string _ProcessesId; - - private string _SystemId; - private string _OperationReason; private string _OperationHandle; @@ -321384,22 +321569,16 @@ namespace Model private System.Nullable _Sort; + private string _MainId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnCreated(); partial void OnOperationIdChanging(string value); partial void OnOperationIdChanged(); - partial void OnRunningIdChanging(string value); - partial void OnRunningIdChanged(); partial void OnProjectIdChanging(string value); partial void OnProjectIdChanged(); - partial void OnInstallationIdChanging(string value); - partial void OnInstallationIdChanged(); - partial void OnProcessesIdChanging(string value); - partial void OnProcessesIdChanged(); - partial void OnSystemIdChanging(string value); - partial void OnSystemIdChanged(); partial void OnOperationReasonChanging(string value); partial void OnOperationReasonChanged(); partial void OnOperationHandleChanging(string value); @@ -321410,6 +321589,8 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnMainIdChanging(string value); + partial void OnMainIdChanged(); #endregion public Running_Operation() @@ -321437,26 +321618,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RunningId", DbType="VarChar(50)")] - public string RunningId - { - get - { - return this._RunningId; - } - set - { - if ((this._RunningId != value)) - { - this.OnRunningIdChanging(value); - this.SendPropertyChanging(); - this._RunningId = value; - this.SendPropertyChanged("RunningId"); - this.OnRunningIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] public string ProjectId { @@ -321477,66 +321638,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="VarChar(50)")] - public string InstallationId - { - get - { - return this._InstallationId; - } - set - { - if ((this._InstallationId != value)) - { - this.OnInstallationIdChanging(value); - this.SendPropertyChanging(); - this._InstallationId = value; - this.SendPropertyChanged("InstallationId"); - this.OnInstallationIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProcessesId", DbType="VarChar(50)")] - public string ProcessesId - { - get - { - return this._ProcessesId; - } - set - { - if ((this._ProcessesId != value)) - { - this.OnProcessesIdChanging(value); - this.SendPropertyChanging(); - this._ProcessesId = value; - this.SendPropertyChanged("ProcessesId"); - this.OnProcessesIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemId", DbType="VarChar(50)")] - public string SystemId - { - get - { - return this._SystemId; - } - set - { - if ((this._SystemId != value)) - { - this.OnSystemIdChanging(value); - this.SendPropertyChanging(); - this._SystemId = value; - this.SendPropertyChanged("SystemId"); - this.OnSystemIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationReason", DbType="VarChar(1000)")] public string OperationReason { @@ -321637,6 +321738,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainId", DbType="VarChar(50)")] + public string MainId + { + get + { + return this._MainId; + } + set + { + if ((this._MainId != value)) + { + this.OnMainIdChanging(value); + this.SendPropertyChanging(); + this._MainId = value; + this.SendPropertyChanged("MainId"); + this.OnMainIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; 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