From 86d48d63f2c3ef096a70f610bd935a3b8da2c5e3 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 27 Nov 2023 12:13:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-11-27.sql | 61 ++++++++++ .../InformationProject/ConstructionLog.aspx | 115 +++++++++++++++++- .../ConstructionLog.aspx.cs | 96 +++++++++++++++ SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx | 2 +- 4 files changed, 267 insertions(+), 7 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-11-27.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-11-27.sql b/DataBase/版本日志/SGGLDB_V2023-11-27.sql new file mode 100644 index 00000000..1e679f87 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-11-27.sql @@ -0,0 +1,61 @@ + +ALTER VIEW [dbo].[View_HJGL_Batch_PointBatchItem] +AS +/*************ϸ*************/ +SELECT PointBatchItem.PointBatchItemId, +PointBatchItem.PointBatchId, +PointBatch.ProjectId, +PointBatch.UnitId, +PointBatch.DetectionTypeId, +PointBatch.DetectionRateId, +PointBatch.PointBatchCode, +Pipeline.UnitWorkId, +PointBatchItem.WeldJointId, +(CASE PointBatchItem.PointState WHEN '1' THEN '' WHEN '2' THEN '͸' END) AS PointState, +(CASE PointBatchItem.IsBuildTrust WHEN 1 THEN '' ELSE '' END) AS IsBuildTrust, +(CASE WHEN PointBatchItem.IsAudit=1 THEN '' + WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NOT NULL THEN '' + WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NULL THEN '' END) AS PointIsAudit, +PointBatchItem.PointDate,-- +(CASE PointBatchItem.IsWelderFirst WHEN 1 THEN '' ELSE '' END) AS IsWelderFirst, +PointBatchItem.RepairDate,-- +PointBatchItem.RepairRecordId, +PointBatchItem.CutDate,--г +PointBatchItem.PBackingWelderId,--޴׺ +PointBatchItem.PCoverWelderId,--޸溸 +UnitWork.UnitWorkCode,-- +WeldJoint.WeldJointCode,--ں +WeldJoint.BackingWelderId AS WelderId, --ID +BackingWelder.WelderCode AS BackingWelderCode, +CoverWelder.WelderCode AS CoverWelderCode, +WeldType.WeldTypeCode, +WeldJoint.JointAttribute, +WeldJoint.JointArea,-- +WeldJoint.Size,--ʵʴ羶 +WeldingDaily.WeldingDate,-- +WeldJoint.PipelineId, --ID +WeldJoint.Material1Id AS Mat, -- +WeldJoint.Specification, -- +Pipeline.PipelineCode, --ߺ +PipingClass.PipingClassName , --ܵȼ +WeldJoint.BackingWelderId, +WeldJoint.CoverWelderId +FROM dbo.HJGL_Batch_PointBatchItem AS PointBatchItem +LEFT JOIN dbo.HJGL_Batch_PointBatch AS PointBatch ON PointBatch.PointBatchId=PointBatchItem.PointBatchId +LEFT JOIN dbo.HJGL_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=PointBatchItem.WeldJointId +LEFT JOIN dbo.HJGL_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId +LEFT JOIN dbo.WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId=Pipeline.UnitWorkId +LEFT JOIN dbo.HJGL_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId +LEFT JOIN dbo.Base_PipingClass AS PipingClass ON PipingClass.PipingClassId=Pipeline.PipingClassId +LEFT JOIN SitePerson_Person AS BackingWelder ON BackingWelder.PersonId=WeldJoint.BackingWelderId +LEFT JOIN SitePerson_Person AS CoverWelder ON CoverWelder.PersonId=WeldJoint.CoverWelderId +LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId +LEFT JOIN HJGL_Hard_TrustItem HardTrustItem ON HardTrustItem.WeldJointId=PointBatchItem.WeldJointId +where (WeldJoint.IsHotProess!=1 or WeldJoint.IsHotProess is null or (WeldJoint.IsHotProess=1 and HardTrustItem.IsPass=1)) +and BackingWelder.ProjectId=Pipeline.ProjectId and CoverWelder.ProjectId=Pipeline.ProjectId + + + +GO + + diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx index de9c8c29..59158ad5 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx @@ -41,8 +41,8 @@ - + OnClick="imgBtnFile_Click"> + @@ -87,9 +87,9 @@ - + - + @@ -104,7 +104,7 @@ + SortField="ConstructionLogPersonId" EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow"> @@ -116,6 +116,9 @@ FieldType="String" Hidden="true"> + + + @@ -124,7 +127,7 @@ + SortField="ConstructionLogMachineId" EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow"> @@ -136,6 +139,9 @@ FieldType="String" Hidden="true"> + + + @@ -427,6 +433,103 @@ function reloadGrid() { __doPostBack(null, 'reloadGrid'); } + + function onGridAfterEdit(event, value, params) { + var me = this, columnId = params.columnId, rowId = params.rowId; + + if (columnId === 'TotalNum' || columnId === 'TotalCompleteNum1') { + var TotalNum = me.getCellValue(rowId, 'TotalNum'); + var TotalCompleteNum1 = me.getCellValue(rowId, 'TotalCompleteNum1'); + if (TotalNum.toString() != "" && TotalCompleteNum1.toString() != "") { + if (TotalNum !== "0") { + me.updateCellValue(rowId, 'TotalRate1', (TotalCompleteNum1 / TotalNum * 100).toFixed(2) + "%"); + } else { + me.updateCellValue(rowId, 'TotalRate1', ("")); + } + + } + } + + if (columnId === 'TotalNum' || columnId === 'TotalCompleteNum2') { + var TotalNum = me.getCellValue(rowId, 'TotalNum'); + var TotalCompleteNum2 = me.getCellValue(rowId, 'TotalCompleteNum2'); + + if (TotalNum.toString() != "" && TotalCompleteNum2.toString() != "") { + if (TotalNum !== "0") { + me.updateCellValue(rowId, 'TotalRate2', (TotalCompleteNum2 / TotalNum * 100).toFixed(2) + "%"); + } else { + me.updateCellValue(rowId, 'TotalRate2', ("")); + } + + } + } + + if (columnId === 'FilmNum' || columnId === 'NotOKFileNum') { + var FilmNum = me.getCellValue(rowId, 'FilmNum'); + var NotOKFileNum = me.getCellValue(rowId, 'NotOKFileNum'); + if (FilmNum.toString() != "" && NotOKFileNum.toString() != "") { + if (FilmNum !== "0") { + me.updateCellValue(rowId, 'OneOKRate', ((FilmNum - NotOKFileNum) / FilmNum * 100).toFixed(2) + "%"); + } else { + me.updateCellValue(rowId, 'OneOKRate', ("")); + } + } + updateSummary(); + } + if (columnId === 'TotalFilmNum' || columnId === 'TotalNotOKFileNum') { + var TotalFilmNum = me.getCellValue(rowId, 'TotalFilmNum'); + var TotalNotOKFileNum = me.getCellValue(rowId, 'TotalNotOKFileNum'); + if (TotalFilmNum.toString() != "" && TotalNotOKFileNum.toString() != "") { + if (TotalFilmNum !== "0") { + me.updateCellValue(rowId, 'TotalOneOKRate', ((TotalFilmNum - TotalNotOKFileNum) / TotalFilmNum * 100).toFixed(2) + "%"); + } else { + me.updateCellValue(rowId, 'TotalOneOKRate', ("")); + } + } + updateSummary(); + } + if (columnId === 'ThisPersonNum' || columnId === 'ThisOKPersonNum') { + var ThisPersonNum = me.getCellValue(rowId, 'ThisPersonNum'); + var ThisOKPersonNum = me.getCellValue(rowId, 'ThisOKPersonNum'); + if (ThisPersonNum.toString() != "" && ThisOKPersonNum.toString() != "") { + if (ThisPersonNum !== "0") { + me.updateCellValue(rowId, 'ThisOKRate', (ThisOKPersonNum / ThisPersonNum * 100).toFixed(2) + "%"); + } else { + me.updateCellValue(rowId, 'ThisOKRate', ("")); + } + } + updateSummary(); + } + + if (columnId === 'TotalPersonNum' || columnId === 'TotalOKPersonNum') { + var TotalPersonNum = me.getCellValue(rowId, 'TotalPersonNum'); + var TotalOKPersonNum = me.getCellValue(rowId, 'TotalOKPersonNum'); + if (TotalPersonNum.toString() != "" && TotalOKPersonNum.toString() != "") { + if (TotalPersonNum !== "0") { + me.updateCellValue(rowId, 'TotalOKRate', (TotalOKPersonNum / TotalPersonNum * 100).toFixed(2) + "%"); + } else { + me.updateCellValue(rowId, 'TotalOKRate', ("")); + } + } + updateSummary(); + } + if (columnId === 'TotalSpotNum' || columnId === 'TotalSpotOKNum') { + var TotalSpotNum = me.getCellValue(rowId, 'TotalSpotNum'); + var TotalSpotOKNum = me.getCellValue(rowId, 'TotalSpotOKNum'); + if (TotalSpotNum.toString() != "" && TotalSpotOKNum.toString() != "") { + if (TotalSpotNum !== "0") { + me.updateCellValue(rowId, 'TotalSpotOKRate', ((TotalSpotOKNum) / TotalSpotNum * 100).toFixed(2) + "%"); + } else { + me.updateCellValue(rowId, 'TotalSpotOKRate', ("")); + } + } + } + } + + function updateSummary() { + // 回发到后台更新 + __doPostBack('', 'UPDATE_SUMMARY'); + } diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs index da9630c4..b405c609 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs @@ -131,9 +131,105 @@ namespace FineUIPro.Web.PZHGL.InformationProject this.txtReportDate.Text = string.Format("{0:yyyy-MM}", DateTime.Now); this.InitTreeMenu(); } + else + { + if (GetRequestEventArgument() == "UPDATE_SUMMARY") + { + // 页面要求重新计算合计行的值 + OutputSummaryData(); + } + } } #endregion + private void OutputSummaryData() + { + //JObject summary = new JObject(); + //int filmNum = 0, notOKFileNum = 0, repairFileNum = 0, totalFilmNum = 0, totalNotOKFileNum = 0; + //string oneOKRate = string.Empty, totalOneOKRate = string.Empty; + //foreach (JObject mergedRow in GridNDTCheck.GetMergedData()) + //{ + // JObject values = mergedRow.Value("values"); + // if (values["FilmNum"].ToString() != "" && values["NotOKFileNum"].ToString() != "") + // { + // filmNum += values.Value("FilmNum"); + // notOKFileNum += values.Value("NotOKFileNum"); + // } + // if (values["RepairFileNum"].ToString() != "") + // { + // repairFileNum += values.Value("RepairFileNum"); + // } + // if (values["TotalFilmNum"].ToString() != "" && values["TotalNotOKFileNum"].ToString() != "") + // { + // totalFilmNum += values.Value("TotalFilmNum"); + // totalNotOKFileNum += values.Value("TotalNotOKFileNum"); + // } + //} + //if (filmNum > 0) + //{ + // var a = Convert.ToDouble(filmNum - notOKFileNum); + // var b = Convert.ToDouble(filmNum); + // decimal result = decimal.Round(decimal.Parse((a / b * 100).ToString()), 2); + // oneOKRate = result.ToString() + "%"; + //} + //if (totalFilmNum > 0) + //{ + // var a = Convert.ToDouble(totalFilmNum - totalNotOKFileNum); + // var b = Convert.ToDouble(totalFilmNum); + // decimal result = decimal.Round(decimal.Parse((a / b * 100).ToString()), 2); + // totalOneOKRate = result.ToString() + "%"; + //} + //JObject summary1 = new JObject(); + //summary1.Add("UnitName", "合计"); + //summary1.Add("FilmNum", filmNum); + //summary1.Add("NotOKFileNum", notOKFileNum); + //summary1.Add("RepairFileNum", repairFileNum); + //summary1.Add("OneOKRate", oneOKRate); + //summary1.Add("TotalFilmNum", totalFilmNum); + //summary1.Add("TotalNotOKFileNum", totalNotOKFileNum); + //summary1.Add("TotalOneOKRate", totalOneOKRate); + //GridNDTCheck.SummaryData = summary1; + //int thisPersonNum = 0, thisOKPersonNum = 0, totalPersonNum = 0, totalOKPersonNum = 0; + //string thisOKRate = string.Empty, totalOKRate = string.Empty; + //foreach (JObject mergedRow in GridWelder.GetMergedData()) + //{ + // JObject values = mergedRow.Value("values"); + // if (values["ThisPersonNum"].ToString() != "" && values["ThisOKPersonNum"].ToString() != "") + // { + // thisPersonNum += values.Value("ThisPersonNum"); + // thisOKPersonNum += values.Value("ThisOKPersonNum"); + // } + // if (values["TotalPersonNum"].ToString() != "" && values["TotalOKPersonNum"].ToString() != "") + // { + // totalPersonNum += values.Value("TotalPersonNum"); + // totalOKPersonNum += values.Value("TotalOKPersonNum"); + // } + //} + //if (thisPersonNum > 0 && thisOKPersonNum > 0) + //{ + // var a = Convert.ToDouble(thisOKPersonNum); + // var b = Convert.ToDouble(thisPersonNum); + // decimal result = decimal.Round(decimal.Parse((a / b * 100).ToString()), 2); + // thisOKRate = result.ToString() + "%"; + //} + //if (totalPersonNum > 0 && totalOKPersonNum > 0) + //{ + // var a = Convert.ToDouble(totalOKPersonNum); + // var b = Convert.ToDouble(totalPersonNum); + // decimal result = decimal.Round(decimal.Parse((a / b * 100).ToString()), 2); + // totalOKRate = result.ToString() + "%"; + //} + //summary.Add("UnitName", "合计"); + //summary.Add("ThisPersonNum", thisPersonNum); + //summary.Add("ThisOKPersonNum", thisOKPersonNum); + //summary.Add("ThisOKRate", thisOKRate); + //summary.Add("TotalPersonNum", totalPersonNum); + //summary.Add("TotalOKPersonNum", totalOKPersonNum); + //summary.Add("TotalOKRate", totalOKRate); + //GridWelder.SummaryData = summary; + + } + #region 加载树装置-单位-工作区 /// /// 加载树 diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx index adfc0c57..16cb6492 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx @@ -90,7 +90,7 @@