diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs index af03a574..34cb57bf 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs @@ -638,6 +638,10 @@ namespace FineUIPro.Web.CQMS.Check { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("质量巡检模板", "质量巡检（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs index 966226b5..138f89f9 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs @@ -400,6 +400,10 @@ namespace FineUIPro.Web.CQMS.Check string rootPath = Server.MapPath("~/"); string uploadfilepath = rootPath + initTemplatePath; string newUrl = uploadfilepath.Replace(".doc", txtCode.Text.Trim() + ".doc"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); //更新书签内容 string unitType = string.Empty; diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs index 5a129aea..d9a859e8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs @@ -440,6 +440,10 @@ namespace FineUIPro.Web.CQMS.Check { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("质量专项检查模板", "质量专项检查（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs index 9725f413..06f41e82 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs @@ -334,6 +334,10 @@ namespace FineUIPro.Web.CQMS.Check { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("问题统计模板", "问题统计（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs index cc2861fb..712a75bf 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs @@ -264,6 +264,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("施工技术交底管理导入模板", "施工技术交底管理（"+projectName+DateTime.Now.ToString("yyyyMMdd")+"）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs index fb537b1c..4025c21a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs @@ -352,6 +352,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("资料收发文登记记录导入模板", "资料收发文登记记录（" + projectName + "" + DateTime.Now.ToString("yyyyMMdd") + ")"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs index 877a7142..f8f27856 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs @@ -317,6 +317,10 @@ namespace FineUIPro.Web.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("设计变更单导入模板", "设计变更单（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs index 29da87aa..a9572e49 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs @@ -339,6 +339,10 @@ namespace FineUIPro.Web.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("设计交底管理导入模板", "设计交底管理（" + projectName+ DateTime.Now.ToString("yyyyMMdd") + ")"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs index a49dfe19..bf7c334a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs @@ -378,6 +378,10 @@ namespace FineUIPro.Web.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("图纸收发记录导入模板", "图纸收发记录（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs index 95f3d39b..3ca54a87 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs @@ -306,6 +306,10 @@ namespace FineUIPro.Web.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("施工组织设计及施工方案导入模板", "施工组织设计及施工方案（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs index afaedd1b..ebba4187 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs @@ -310,7 +310,12 @@ namespace FineUIPro.Web.Comprehensive if (lists != null) { var projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("设备材料报验导入模板", "设备材料报验（" + projectName + "" + DateTime.Now.ToString("yyyyMMdd") + ")"); + if(File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs index 1e0e8e4f..8d5058fc 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs @@ -337,6 +337,10 @@ namespace FineUIPro.Web.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("机具报验导入模板", "机具报验（"+ projectName+DateTime.Now.ToString("yyyyMMdd")+ "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs index 06888830..5853346f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs @@ -399,6 +399,10 @@ namespace FineUIPro.Web.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("人员报验导入模板", "人员报验（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs index 67b39dc2..0cfc98df 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs @@ -272,6 +272,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("检验试验计划导入模板.xls", "检验试验计划（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ").xls"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs index fa084818..023438d1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs @@ -307,6 +307,10 @@ namespace FineUIPro.Web.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("超过一定规模的危大施工方案导入模板", "超过一定规模的危大施工方案（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs index 6d5b0218..12d353a7 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs @@ -363,6 +363,10 @@ namespace FineUIPro.Web.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("NCR管理导入模板", "NCR管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs index ac9df4fe..7dd20666 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs @@ -299,6 +299,10 @@ namespace FineUIPro.Web.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("压力管道管理导入模板", "压力管道管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs index bd982a97..c0ea753c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs @@ -305,6 +305,10 @@ namespace FineUIPro.Web.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("质量事故处理记录导入模板", "质量事故处理记录（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs index 890bd48b..18855998 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs @@ -356,6 +356,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("图纸会审管理导入模板", "图纸会审管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs index 54414dac..4b750597 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs @@ -312,6 +312,10 @@ namespace FineUIPro.Web.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("现场签证管理导入模板", "现场签证管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs index e4337bb2..c76a91e5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs @@ -293,6 +293,10 @@ namespace FineUIPro.Web.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("特种设备管理导入模板", "特种设备管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs index 82136871..2b328f37 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs @@ -234,6 +234,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("培训记录导入模板", "培训记录（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs index 7b6003c0..43881cf3 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs @@ -413,6 +413,10 @@ namespace FineUIPro.Web.CQMS.ManageReport { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("现场检查情况模板", "现场检查情况（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs index 491a51d3..b30e2176 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs @@ -209,6 +209,10 @@ namespace FineUIPro.Web.CQMS.ManageReport { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("设计变更单统计模板", "设计变更单统计（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs index efcad6d3..3fedc1dc 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs @@ -161,6 +161,10 @@ namespace FineUIPro.Web.CQMS.ManageReport { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("现场焊接无损检测情况模板", "现场焊接无损检测情况（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs index d91d6e0f..005e0d0c 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs @@ -182,6 +182,10 @@ namespace FineUIPro.Web.CQMS.ManageReport { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("NCR统计模板", "NCR统计（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx index f5937785..c456400d 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx @@ -720,7 +720,7 @@ - + @@ -2036,6 +2036,7 @@ runat="server" ValidationGroup="Save" HeaderText="请注意！" ShowSummary="False" ShowMessageBox="True"> + diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index e6c30cbb..a7c228ed 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -3001,15 +3001,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "5", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), Remarks = values.Value("Remarks"), }; //if (Grid9.Rows[rowIndex].DataKeys.Length > 0) @@ -3037,15 +3037,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "0", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), Remarks = values.Value("Remarks") }; //if (Grid2.Rows[rowIndex].DataKeys.Length > 0) @@ -3071,16 +3071,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "1", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), - Quantity3 = values.Value("Quantity3"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), + Quantity3 = Funs.GetNewIntOrZero(values.Value("Quantity3")), Remarks = values.Value("Remarks") }; //if (Grid3.Rows[rowIndex].DataKeys.Length > 0) @@ -3106,15 +3106,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "2", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), Remarks = values.Value("Remarks") }; //if (Grid4.Rows[rowIndex].DataKeys.Length > 0) @@ -3142,15 +3142,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "3", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), Remarks = values.Value("Remarks") }; //if (Grid5.Rows[rowIndex].DataKeys.Length > 0) @@ -3178,15 +3178,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "4", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), Remarks = values.Value("Remarks") }; //if (Grid6.Rows[rowIndex].DataKeys.Length > 0) @@ -3214,15 +3214,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "6", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), QuaRate = values.Value("QuaRate"), Remarks = values.Value("Remarks") }; @@ -3312,15 +3312,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "9", ContentName = values.Value("ContentName"), - MonthsCount = values.Value("MonthsCount"), - ProjectCount = values.Value("ProjectCount"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), //RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks") }; @@ -3346,17 +3346,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-1", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 }; @@ -3379,19 +3379,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-2", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 - - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 - + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 }; @@ -3414,19 +3412,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-3", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 - - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 - + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 }; @@ -3450,18 +3446,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-4", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 @@ -3485,18 +3481,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-5", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 @@ -3520,18 +3516,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-6", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 @@ -3555,18 +3551,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-7", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 @@ -3590,18 +3586,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 TotationRate = values.Value("TotalOneOKRate"), @@ -3631,16 +3627,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "11", - TotalNoBackCount = values.Value("TotalNoBackCount"), + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")), ContentName = values.Value("ContentName"), - MonthsCount = values.Value("MonthsCount"), - ProjectCount = values.Value("ProjectCount"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), //RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks"), }; @@ -3667,16 +3663,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "12", - TotalNoBackCount = values.Value("TotalNoBackCount"), + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")), ContentName = values.Value("ContentName"), - MonthsCount = values.Value("MonthsCount"), - ProjectCount = values.Value("ProjectCount"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), //RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks"), }; @@ -3703,16 +3699,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "13", - TotalNoBackCount = values.Value("TotalNoBackCount"), + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")), ContentName = values.Value("ContentName"), - MonthsCount = values.Value("MonthsCount"), - ProjectCount = values.Value("ProjectCount"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), //RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks"), }; @@ -3739,16 +3735,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "14", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CurrentPeriodOkNum"), - ProjectCount = values.Value("OKNum"), - TotalNoBackCount = values.Value("CheckNum"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("CurrentPeriodOkNum")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")), + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), RectificationRate = values.Value("OKRate"), }; //if (gvNcrManagementInspection.Rows[rowIndex].DataKeys.Length > 0) @@ -3776,15 +3772,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "1", ContentName = values.Value("ContentName"), - MonthsCount = values.Value("MonthsCount"), - ProjectCount = values.Value("ProjectCount"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks") }; @@ -3813,15 +3809,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "2", ContentName = values.Value("ContentName"), - MonthsCount = values.Value("MonthsCount"), - ProjectCount = values.Value("ProjectCount"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), Remarks = values.Value("Remarks") }; //if (gvSpecialCheck.Rows[rowIndex].DataKeys.Length > 0) @@ -3849,17 +3845,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "3", ContentName = values.Value("ContentName"), - MonthsCount = Funs.GetNewInt(values.Value("MonthsCount").ToString()), - ProjectCount = Funs.GetNewInt(values.Value("ProjectCount").ToString()), - MonthsBackCount = Funs.GetNewInt(values.Value("MonthsBackCount").ToString()), - TotalNoBackCount = Funs.GetNewInt(values.Value("TotalNoBackCount").ToString()) + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("MonthsBackCount")), + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")) }; //if (gvFileReport.Rows[rowIndex].DataKeys.Length > 0) //{ @@ -3886,7 +3882,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem { RowMaterialProblemId = SQLHelper.GetNewID(typeof(Model.Report_RowMaterialProblem)), @@ -3920,7 +3916,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems { ConstructionProblemsId = SQLHelper.GetNewID(typeof(Model.Report_ConstructionProblems)), @@ -3957,7 +3953,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl { NextQualityControlId = SQLHelper.GetNewID(typeof(Model.Report_NextQualityControl)), @@ -4041,5 +4037,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { SaveMethod(); } + + protected override object LoadPageStateFromPersistenceMedium() + { + return Session["_ViewState"]; + } + + protected override void SavePageStateToPersistenceMedium(object viewState) + { + Session["_ViewState"] = viewState; + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx index 9bba523e..99f997da 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx @@ -2037,6 +2037,7 @@ runat="server" ValidationGroup="Save" HeaderText="请注意！" ShowSummary="False" ShowMessageBox="True"> + diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs index 6f941f52..7546a212 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs @@ -2941,15 +2941,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "5", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), Remarks = values.Value("Remarks"), }; //if (Grid9.Rows[rowIndex].DataKeys.Length > 0) @@ -2977,15 +2977,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "0", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), Remarks = values.Value("Remarks") }; //if (Grid2.Rows[rowIndex].DataKeys.Length > 0) @@ -3011,16 +3011,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "1", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), - Quantity3 = values.Value("Quantity3"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), + Quantity3 = Funs.GetNewIntOrZero(values.Value("Quantity3")), Remarks = values.Value("Remarks") }; //if (Grid3.Rows[rowIndex].DataKeys.Length > 0) @@ -3046,15 +3046,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "2", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), Remarks = values.Value("Remarks") }; //if (Grid4.Rows[rowIndex].DataKeys.Length > 0) @@ -3082,15 +3082,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "3", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), Remarks = values.Value("Remarks") }; //if (Grid5.Rows[rowIndex].DataKeys.Length > 0) @@ -3118,15 +3118,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "4", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), Remarks = values.Value("Remarks") }; //if (Grid6.Rows[rowIndex].DataKeys.Length > 0) @@ -3154,15 +3154,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "6", UnitOrMajor = values.Value("UnitOrMajor"), - Quantity1 = values.Value("Quantity1"), - Quantity2 = values.Value("Quantity2"), + Quantity1 = Funs.GetNewIntOrZero(values.Value("Quantity1")), + Quantity2 = Funs.GetNewIntOrZero(values.Value("Quantity2")), QuaRate = values.Value("QuaRate"), Remarks = values.Value("Remarks") }; @@ -3252,15 +3252,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "9", ContentName = values.Value("ContentName"), - MonthsCount = values.Value("MonthsCount"), - ProjectCount = values.Value("ProjectCount"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), //RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks") }; @@ -3286,7 +3286,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), @@ -3294,11 +3294,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew ReType = "10-1", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 @@ -3322,18 +3322,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-2", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 @@ -3357,18 +3357,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-3", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 @@ -3393,18 +3393,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-4", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 @@ -3428,18 +3428,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-5", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 @@ -3463,18 +3463,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-6", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 @@ -3498,18 +3498,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10-7", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 @@ -3533,18 +3533,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "10", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 - MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 + MonthsCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), //当前检查点数 + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("TotalCheckNum")),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 - TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")),//当前合格点数 + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalOKNum")),//累计合格点数 RectificationRate = values.Value("OneOKRate"),//本月合格点数 TotationRate = values.Value("TotalOneOKRate"), @@ -3574,16 +3574,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "11", - TotalNoBackCount = values.Value("TotalNoBackCount"), + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")), ContentName = values.Value("ContentName"), - MonthsCount = values.Value("MonthsCount"), - ProjectCount = values.Value("ProjectCount"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), //RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks"), }; @@ -3610,16 +3610,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "12", - TotalNoBackCount = values.Value("TotalNoBackCount"), + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")), ContentName = values.Value("ContentName"), - MonthsCount = values.Value("MonthsCount"), - ProjectCount = values.Value("ProjectCount"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), //RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks"), }; @@ -3646,16 +3646,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "13", - TotalNoBackCount = values.Value("TotalNoBackCount"), + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")), ContentName = values.Value("ContentName"), - MonthsCount = values.Value("MonthsCount"), - ProjectCount = values.Value("ProjectCount"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), //RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks"), }; @@ -3682,16 +3682,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "14", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CurrentPeriodOkNum"), - ProjectCount = values.Value("OKNum"), - TotalNoBackCount = values.Value("CheckNum"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("CurrentPeriodOkNum")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("OKNum")), + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("CheckNum")), RectificationRate = values.Value("OKRate"), }; //if (gvNcrManagementInspection.Rows[rowIndex].DataKeys.Length > 0) @@ -3719,15 +3719,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "1", ContentName = values.Value("ContentName"), - MonthsCount = values.Value("MonthsCount"), - ProjectCount = values.Value("ProjectCount"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks") }; @@ -3756,15 +3756,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "2", ContentName = values.Value("ContentName"), - MonthsCount = values.Value("MonthsCount"), - ProjectCount = values.Value("ProjectCount"), + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), Remarks = values.Value("Remarks") }; //if (gvSpecialCheck.Rows[rowIndex].DataKeys.Length > 0) @@ -3792,17 +3792,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), ReportId = ReportId, ReType = "3", ContentName = values.Value("ContentName"), - MonthsCount = Funs.GetNewInt(values.Value("MonthsCount").ToString()), - ProjectCount = Funs.GetNewInt(values.Value("ProjectCount").ToString()), - MonthsBackCount = Funs.GetNewInt(values.Value("MonthsBackCount").ToString()), - TotalNoBackCount = Funs.GetNewInt(values.Value("TotalNoBackCount").ToString()) + MonthsCount = Funs.GetNewIntOrZero(values.Value("MonthsCount")), + ProjectCount = Funs.GetNewIntOrZero(values.Value("ProjectCount")), + MonthsBackCount = Funs.GetNewIntOrZero(values.Value("MonthsBackCount")), + TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")) }; //if (gvFileReport.Rows[rowIndex].DataKeys.Length > 0) //{ @@ -3829,7 +3829,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem { RowMaterialProblemId = SQLHelper.GetNewID(typeof(Model.Report_RowMaterialProblem)), @@ -3863,7 +3863,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems { ConstructionProblemsId = SQLHelper.GetNewID(typeof(Model.Report_ConstructionProblems)), @@ -3900,7 +3900,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - int rowIndex = teamGroupRow.Value("index"); + //int rowIndex = teamGroupRow.Value("index"); Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl { NextQualityControlId = SQLHelper.GetNewID(typeof(Model.Report_NextQualityControl)), @@ -3986,5 +3986,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew SaveMethod(); } + protected override object LoadPageStateFromPersistenceMedium() + { + return Session["_ViewState"]; + } + + protected override void SavePageStateToPersistenceMedium(object viewState) + { + Session["_ViewState"] = viewState; + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs index 20ded6c8..74858b4c 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs @@ -121,6 +121,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("检查人检查次数统计模板", "检查人检查次数统计（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/HotProessManage.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/HotProessManage.aspx.cs index 9ba330af..a247382a 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/HotProessManage.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/HotProessManage.aspx.cs @@ -271,6 +271,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("热处理检测模板", "热处理检测（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs index 800ff4e3..a4fda121 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs @@ -271,6 +271,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("控制点检查检测模板", "控制点检查检测（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs index d0067319..4b1b8c3e 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs @@ -447,6 +447,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("控制点检查检测合格率统计模板", "控制点检查检测合格率统计（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs index bec70518..96690b4d 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs @@ -367,6 +367,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("共检通知单模板", "共检通知单（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.cs index 9bf5f2ac..ffda7459 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.cs @@ -256,6 +256,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("无损检测管理模板", "无损检测管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs index 08fa8539..842f5be5 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs @@ -243,6 +243,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("管道试压包管理模板", "管道试压包管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ConExperienceSummary.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ConExperienceSummary.aspx.cs index 2493b0ea..3c6996be 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ConExperienceSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ConExperienceSummary.aspx.cs @@ -225,6 +225,10 @@ namespace FineUIPro.Web.CQMS.QualityPlanning { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("类似项目施工经验总结清单导入模板", "类似项目施工经验总结清单（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ProjectQualityPlan.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ProjectQualityPlan.aspx.cs index 428f7185..42ebc1ce 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ProjectQualityPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ProjectQualityPlan.aspx.cs @@ -229,6 +229,10 @@ namespace FineUIPro.Web.CQMS.QualityPlanning { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("项目质量计划导入模板", "项目质量计划（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx.cs index 19cac7a9..52c65bb1 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx.cs @@ -229,6 +229,10 @@ namespace FineUIPro.Web.CQMS.QualityPlanning { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("质量管理制度导入模板", "质量管理制度（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs index 416f991a..29c3d0e5 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs @@ -108,6 +108,10 @@ namespace FineUIPro.Web.CQMS.WBS.Control { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("单位分部分项工程划分导入模板", projectName + "单位分部分项工程划分表"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 NPOI.SS.UserModel.IWorkbook workbook; diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PauseNotice.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/PauseNotice.aspx.cs index 6bea026c..a7a71f30 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PauseNotice.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PauseNotice.aspx.cs @@ -345,6 +345,10 @@ namespace FineUIPro.Web.HSSE.Check initTemplatePath = "File\\Word\\HSSE\\工程暂停令.doc"; uploadfilepath = rootPath + initTemplatePath; newUrl = uploadfilepath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".doc"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } filePath = initTemplatePath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".pdf"); File.Copy(uploadfilepath, newUrl); ///更新书签内容 diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNotice.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/PunishNotice.aspx.cs index a60c6f3a..2e5d1586 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNotice.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNotice.aspx.cs @@ -368,6 +368,10 @@ namespace FineUIPro.Web.HSSE.Check initTemplatePath = "File\\Word\\HSSE\\安全处罚通知单.doc"; uploadfilepath = rootPath + initTemplatePath; newUrl = uploadfilepath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".doc"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } filePath = initTemplatePath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".pdf"); File.Copy(uploadfilepath, newUrl); ///更新书签内容 diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx.cs index 98ce1396..ba3e8c0a 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx.cs @@ -293,6 +293,10 @@ namespace FineUIPro.Web.HSSE.License uploadfilepath = rootPath + initTemplatePath; newUrl = uploadfilepath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".doc"); filePath = initTemplatePath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".pdf"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); ///更新书签 var getBreakGround = LicensePublicService.GetBreakGroundById(Id); diff --git a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs index 79e6cca7..477a3fbc 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs @@ -293,6 +293,10 @@ namespace FineUIPro.Web.HSSE.License uploadfilepath = rootPath + initTemplatePath; newUrl = uploadfilepath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".doc"); filePath = initTemplatePath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".pdf"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } File.Copy(uploadfilepath, newUrl); ///更新书签 var getElectricity = LicensePublicService.GetElectricityById(Id); diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index f3999ec9..58dd68d6 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - +