From e48087673e013b6adb8146122f50e39079ce3320 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 16 Oct 2025 10:46:15 +0800 Subject: [PATCH 01/17] 1 --- .../ManageReportNew/MonthReportEdit.aspx.cs | 32 ++++----- .../ManageReportNew/WeekReportEdit.aspx.cs | 68 +++++++++---------- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 3 files changed, 47 insertions(+), 55 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index b08ef4e2..cce304e6 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -357,6 +357,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); var units21 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList(); + var units22 = units.Where(x => x.UnitId != Const.UnitId_CWCEC && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)).ToList(); var units2 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList(); var remarks = loadRemarksDt(); @@ -461,7 +462,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } } - foreach (var item in units21) + foreach (var item in units22) { Model.Report_Construction_Plan model = new Model.Report_Construction_Plan(); @@ -529,7 +530,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } - foreach (var item in units21) + foreach (var item in units22) { Model.Report_Construction_Plan model = new Model.Report_Construction_Plan(); model.Id = Guid.NewGuid().ToString(); @@ -1340,7 +1341,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } - foreach (var item in units21) + foreach (var item in units22) { Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); model.Id = Guid.NewGuid().ToString(); @@ -1956,12 +1957,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } } - - - foreach (var item in units21) + foreach (var item in units22) { - - Model.CheckStatisc checkStatisc = new Model.CheckStatisc(); checkStatisc.Id = Guid.NewGuid().ToString(); checkStatisc.ReportId = ReportId; @@ -1971,8 +1968,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew checkStatisc.CheckNum = Quantity1Dic[item.UnitId]; checkStatisc.TotalCheckNum = Quantity2Dic[item.UnitId]; checkStatisc.OKNum = Quantity3Dic[item.UnitId]; ; - checkStatisc.TotalOKNum = Quantity4Dic[item.UnitId]; ; - + checkStatisc.TotalOKNum = Quantity4Dic[item.UnitId]; } if (checkStatisc.CheckNum != 0)//被除数不能为零 { @@ -2004,8 +2000,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew OKNum += checkStatisc.OKNum; TotalOKNum += checkStatisc.TotalOKNum; - - } gvInspectionDataInspection.DataSource = list; @@ -2082,7 +2076,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + PressurePipeNumber; } - foreach (var item in units21) + foreach (var item in units22) { Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); model.Id = Guid.NewGuid().ToString(); @@ -2158,10 +2152,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + IssuedReportNumber; } - foreach (var item in units21) + foreach (var item in units22) { - - Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); model.Id = Guid.NewGuid().ToString(); model.ContentName = item.UnitName; @@ -2238,7 +2230,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + MonitoringReportNumber; } - foreach (var item in units21) + foreach (var item in units22) { Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); model.Id = Guid.NewGuid().ToString(); @@ -2334,6 +2326,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } foreach (var item in units) { + if (item.UnitId == Const.UnitId_CWCEC) + { + continue; + } Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc(); NCRStatisc.Id = Guid.NewGuid().ToString(); NCRStatisc.WorkName = item.UnitName; @@ -2428,7 +2424,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } - foreach (var item in units21) + foreach (var item in units22) { var ClosedCount = 0; diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs index 0f920afc..186966be 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs @@ -289,7 +289,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #endregion //加载所有grid - // lodAllGrid("1"); + // lodAllGrid("1"); objType = "1"; RegisterAsyncTask(new PageAsyncTask(lodAllGrid)); } @@ -324,11 +324,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// 加载grid /// /// - async Task lodAllGrid() + async Task lodAllGrid() { DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); var units21 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList(); + var units22 = units.Where(x => x.UnitId != Const.UnitId_CWCEC && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)).ToList(); var units2 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList(); var remarks = loadRemarksDt(); @@ -433,7 +434,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } } - foreach (var item in units21) + foreach (var item in units22) { Model.Report_Construction_Plan model = new Model.Report_Construction_Plan(); @@ -501,7 +502,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } - foreach (var item in units21) + foreach (var item in units22) { Model.Report_Construction_Plan model = new Model.Report_Construction_Plan(); model.Id = Guid.NewGuid().ToString(); @@ -1312,7 +1313,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } - foreach (var item in units21) + foreach (var item in units22) { Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); model.Id = Guid.NewGuid().ToString(); @@ -1928,12 +1929,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } } - - - foreach (var item in units21) + foreach (var item in units22) { - - Model.CheckStatisc checkStatisc = new Model.CheckStatisc(); checkStatisc.Id = Guid.NewGuid().ToString(); checkStatisc.ReportId = ReportId; @@ -1976,8 +1973,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew OKNum += checkStatisc.OKNum; TotalOKNum += checkStatisc.TotalOKNum; - - } gvInspectionDataInspection.DataSource = list; @@ -2054,7 +2049,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + PressurePipeNumber; } - foreach (var item in units21) + foreach (var item in units22) { Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); model.Id = Guid.NewGuid().ToString(); @@ -2130,10 +2125,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + IssuedReportNumber; } - foreach (var item in units21) + foreach (var item in units22) { - - Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); model.Id = Guid.NewGuid().ToString(); model.ContentName = item.UnitName; @@ -2210,7 +2203,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + MonitoringReportNumber; } - foreach (var item in units21) + foreach (var item in units22) { Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); model.Id = Guid.NewGuid().ToString(); @@ -2306,6 +2299,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } foreach (var item in units) { + if (item.UnitId == Const.UnitId_CWCEC) + { + continue; + } Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc(); NCRStatisc.Id = Guid.NewGuid().ToString(); NCRStatisc.WorkName = item.UnitName; @@ -2400,9 +2397,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } - foreach (var item in units21) + foreach (var item in units22) { - var ClosedCount = 0; Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); model.Id = Guid.NewGuid().ToString(); @@ -2681,7 +2677,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //loadReviewDrawings(objType); //6 加载设计变更管理情况 - // loadDesignChangeOrder(); + // loadDesignChangeOrder(); //7.1 加载合格焊工管理情况 //loadPassWelder(); @@ -2690,27 +2686,27 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //loadProcessControl_NondestructiveTest_New(); //8 设备报验管理Grid11 - // LoadInspectionEquipment(objType); + // LoadInspectionEquipment(objType); //加载9.计量器具报验管理情况 //loadMeasuringInspection(objType); //加载10.现场质量共检数据 - // loadInspectionDataInspection(objType); + // loadInspectionDataInspection(objType); //加载11.压力管道监检情况 - // loadPressureInspection(objType); + // loadPressureInspection(objType); //加载12.管道试压包管理情况 - // loadPipingInspection(objType); + // loadPipingInspection(objType); //加载13.特种设备监检情况 - // loadSpecialInspection(objType); + // loadSpecialInspection(objType); ////加载14.NCR管理情况 - // loadNcrManagementInspection(objType); + // loadNcrManagementInspection(objType); //加载15.质量巡检情况 - // loadQualityInspection(objType); + // loadQualityInspection(objType); //加载16.质量专项检查情况 - // loadSpecialCheck(objType); + // loadSpecialCheck(objType); //加载17.质量文件上报情况 - // loadFileReport(objType); + // loadFileReport(objType); } #endregion @@ -4138,7 +4134,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew checkStatisc.ReportId = ReportId; checkStatisc.WorkName = item.UnitName; checkStatisc.CheckNum = monethCount.Count(); - checkStatisc.TotalCheckNum = AllList.Count(); + checkStatisc.TotalCheckNum = AllList.Count(); checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true); checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true); @@ -5738,10 +5734,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew ////保存23.施工照片 //saveImages(); - + #endregion - + } #endregion @@ -5776,9 +5772,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { try { - var result = db.Report_CqmsTarget.Where(a => a.ReportId == ReportId).ToList(); + var result = db.Report_CqmsTarget.Where(a => a.ReportId == ReportId).ToList(); db.Report_CqmsTarget.DeleteAllOnSubmit(result); - // CqmsTargetService.Delete(ReportId); + // CqmsTargetService.Delete(ReportId); db.Report_CqmsTarget.InsertAllOnSubmit(detailLists); db.SubmitChanges(); } @@ -6161,9 +6157,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #endregion try { - var result = db.Report_TextBoxContent.Where(a => a.ReportId == ReportId).ToList(); + var result = db.Report_TextBoxContent.Where(a => a.ReportId == ReportId).ToList(); db.Report_TextBoxContent.DeleteAllOnSubmit(result); - // TextBoxContentService.Delete(ReportId); + // TextBoxContentService.Delete(ReportId); db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList); db.SubmitChanges(); diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 1a1a9a6c..17978b44 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true From bb4969983f731da1f5c4279a14279182954a7338 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 16 Oct 2025 18:18:18 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E7=AE=A1=E9=81=93=E8=AF=95=E5=8E=8B=E5=8C=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/ProjectData/UnitWorkService.cs | 10 + .../App_GlobalResources/Lan.resx | 3 + .../App_GlobalResources/Lan1.designer.cs | 9 + .../ProcessControl/TestPackageManagement.aspx | 6 + .../TestPackageManagement.aspx.cs | 13 + .../TestPackageManagement.aspx.designer.cs | 62 ++- .../TestPackageManagementDataIn.aspx | 68 +++ .../TestPackageManagementDataIn.aspx.cs | 431 ++++++++++++++++++ ...stPackageManagementDataIn.aspx.designer.cs | 125 +++++ .../Excel/DataIn/管道试压包管理导入模板.xls | Bin 0 -> 18944 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 + SGGL/FineUIPro.Web/common/mainProject2.aspx | 4 +- 12 files changed, 716 insertions(+), 23 deletions(-) create mode 100644 SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/管道试压包管理导入模板.xls diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs index 8e681db9..884d35cc 100644 --- a/SGGL/BLL/ProjectData/UnitWorkService.cs +++ b/SGGL/BLL/ProjectData/UnitWorkService.cs @@ -192,6 +192,16 @@ namespace BLL return (from x in Funs.DB.WBS_UnitWork where x.UnitWorkCode == UnitWorkCode select x).ToList(); } + /// + /// 根据项目Id获取单位工程信息 + /// + /// + /// + public static List GetUnitWorkByProjectId(string projectId) + { + return (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId select x).ToList(); + } + /// /// 下拉框选择(获取 text value) /// diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx index a1feb729..99ef4fc0 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx @@ -416,6 +416,9 @@ 审批完成 + + + 已审待施工 呼叫 diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs index 94b02e68..8126a68e 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs @@ -105,6 +105,15 @@ namespace Resources { } } + /// + /// 查找类似 已审待施工 的本地化字符串。 + /// + internal static string ApprovalCompletedUnderConstruction { + get { + return ResourceManager.GetString("ApprovalCompletedUnderConstruction", resourceCulture); + } + } + /// /// 查找类似 材料到货 的本地化字符串。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx index a862f219..75b65a56 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx @@ -35,6 +35,8 @@ + @@ -91,6 +93,10 @@ Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Width="800px" Height="500px"> +