diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx index 119f1ecf..30300c5a 100644 --- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx @@ -33,7 +33,7 @@ - + diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx index 4492d70c..3de02858 100644 --- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx +++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx @@ -125,7 +125,7 @@ - diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs index 88b9b82e..e0aa1d48 100644 --- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs @@ -113,7 +113,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun if (this.tvControlItem.SelectedNodeID.Split('|').Length > 0) { var installationId = this.tvControlItem.SelectedNodeID.Split('|').First(); - if (installationId != "0") + if (installationId != "0" && !string.IsNullOrWhiteSpace(installationId)) { strSql += " and a.InstallationId=@InstallationId"; listStr.Add(new SqlParameter("@InstallationId", installationId)); @@ -280,6 +280,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun ShiftUserName = c.UserName, a.SuccessionUser, SuccessionUserName = d.UserName, + a.HandoverCare, a.StartData, a.EndData, a.Situation, @@ -291,6 +292,10 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun var model = data.FirstOrDefault(); if (model != null) { + //操作问题 + var operations = Funs.DB.Running_Operation.Where(x => x.RunningId == model.RunningId).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"; int rowIndex = 0; XSSFWorkbook hssfworkbook = new XSSFWorkbook(); @@ -373,181 +378,83 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun #region 数据 var dataIndex = 5; - //if (model.IsDesalinated == 1) - //{ - // 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.DesalinatedSituation); - // 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.DesalinatedRemarks); - // ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle; - // dataIndex += 2; - //} - //if (model.IsLoop == 1) - //{ - // 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("ACW/UCW/ECW 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.LoopSituation); - // 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.LoopRemarks); - // ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle; - // dataIndex += 2; - //} - //if (model.IsSteam == 1) - //{ - // 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("Steam System蒸汽"); - // 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.SteamSituation); - // 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.SteamRemarks); - // ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle; - // dataIndex += 2; - //} - //if (model.IsAirCompression == 1) - //{ - // 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("Air 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.AirCompressionSituation); - // 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.AirCompressionRemarks); - // ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle; - // dataIndex += 2; - //} - //if (model.IsCompoundAmmonia == 1) - //{ - // 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("Ammonia Plant 合成氨"); - // 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.CompoundAmmoniaSituation); - // 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.CompoundAmmoniaRemarks); - // ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle; - // dataIndex += 2; - //} - //if (model.IsUrea == 1) - //{ - // 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("Urea Plant 尿素"); - // 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.UreaSituation); - // 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.UreaRemarks); - // 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); - //ws.AddMergedRegion(region); - //ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("Attention of next shift交班注意"); - //ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold; - //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).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); - //ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("operation issue操作问题"); - //ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold; - //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($"reason原因:{model.OperationReason}"); - //ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle; - //ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 3, dataIndex + 3, 0, 5, 30); - //region = new CellRangeAddress(dataIndex + 3, dataIndex + 3, 0, 5); - //ws.AddMergedRegion(region); - //ws.GetRow(dataIndex + 3).GetCell(0).SetCellValue($"solution处理:{model.OperationHandle}"); - //ws.GetRow(dataIndex + 3).GetCell(0).CellStyle = leftStyle; - //dataIndex += 3; - //ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5); - //region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5); - //ws.AddMergedRegion(region); - //ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("maintenance issue维护问题"); - //ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold; - //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($"reason原因:{model.MaintenanceReason}"); - //ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle; - //ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 3, dataIndex + 3, 0, 5, 30); - //region = new CellRangeAddress(dataIndex + 3, dataIndex + 3, 0, 5); - //ws.AddMergedRegion(region); - //ws.GetRow(dataIndex + 3).GetCell(0).SetCellValue($"solution处理:{model.MaintenanceHandle}"); - //ws.GetRow(dataIndex + 3).GetCell(0).CellStyle = leftStyle; - //dataIndex += 3; + + 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; + + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5); + region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5); + ws.AddMergedRegion(region); + ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("Attention of next shift交班注意"); + ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold; + 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).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); + ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("operation issue操作问题"); + ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold; + dataIndex += 1; + foreach (var itemoption in operations) + { + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5, 30); + region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5); + ws.AddMergedRegion(region); + ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue($"reason原因:{itemoption.OperationReason}"); + ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = leftStyle; + dataIndex += 1; + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5, 30); + region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5); + ws.AddMergedRegion(region); + ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue($"solution处理:{itemoption.OperationHandle}"); + ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = leftStyle; + dataIndex += 1; + } + + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5); + region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5); + ws.AddMergedRegion(region); + ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("maintenance issue维护问题"); + ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold; + dataIndex += 1; + foreach (var itemmait in maintes) + { + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5, 30); + region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5); + ws.AddMergedRegion(region); + ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue($"reason原因:{itemmait.MaintenanceReason}"); + ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = leftStyle; + dataIndex += 1; + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5, 30); + region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5); + ws.AddMergedRegion(region); + ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue($"solution处理:{itemmait.MaintenanceHandle}"); + ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = leftStyle; + dataIndex += 1; + } #endregion ws.PrintSetup.Landscape = false;