diff --git a/SGGL/BLL/IDP/IDPDataService.cs b/SGGL/BLL/IDP/IDPDataService.cs index 3c1f40d5..02cdc6ce 100644 --- a/SGGL/BLL/IDP/IDPDataService.cs +++ b/SGGL/BLL/IDP/IDPDataService.cs @@ -20,9 +20,9 @@ namespace BLL /// public static class IDPDataService { - ///// - ///// 测试环境api地址 - ///// + /// + /// 测试环境api地址 + /// //private static readonly string IDPApiUrl = "http://10.5.6.151:8100/"; /// /// 正式环境api地址 diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs index 29cf4ba5..7bbbb5f0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs @@ -721,7 +721,7 @@ namespace FineUIPro.Web.CQMS.Check { lists = lists.OrderByDescending(x => x.CheckDate); string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("质量巡检模板", "质量巡检(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("质量巡检模板", "质量巡检(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs index d9a859e8..246612f5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs @@ -439,7 +439,7 @@ namespace FineUIPro.Web.CQMS.Check if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("质量专项检查模板", "质量专项检查(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("质量专项检查模板", "质量专项检查(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs index f1f29421..84c15942 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs @@ -263,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("施工技术交底管理导入模板", "施工技术交底管理("+projectName+DateTime.Now.ToString("yyyyMMdd")+")"); + newUrl = uploadfilepath.Replace("施工技术交底管理导入模板", "施工技术交底管理("+projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd")+")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs index 414cd7c3..34bccde7 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs @@ -351,7 +351,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("资料收发文登记记录导入模板", "资料收发文登记记录(" + projectName + "" + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("资料收发文登记记录导入模板", "资料收发文登记记录(" + projectName.Replace("/", "") + "" + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs index 2afefd3e..19341a08 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs @@ -316,7 +316,7 @@ namespace FineUIPro.Web.Comprehensive if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("设计变更单导入模板", "设计变更单(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("设计变更单导入模板", "设计变更单(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs index 8c44f781..c06a7dfb 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs @@ -377,7 +377,7 @@ namespace FineUIPro.Web.Comprehensive if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("图纸收发记录导入模板", "图纸收发记录(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("图纸收发记录导入模板", "图纸收发记录(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs index 2aeb43dd..c1ea8247 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs @@ -305,7 +305,7 @@ namespace FineUIPro.Web.Comprehensive if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("施工组织设计及施工方案导入模板", "施工组织设计及施工方案(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("施工组织设计及施工方案导入模板", "施工组织设计及施工方案(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs index fe6432f4..faf69628 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs @@ -312,7 +312,7 @@ namespace FineUIPro.Web.Comprehensive { var projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("设备材料报验导入模板", "设备材料报验(" + projectName + "" + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("设备材料报验导入模板", "设备材料报验(" + projectName.Replace("/", "") + "" + DateTime.Now.ToString("yyyyMMdd") + ")"); if(File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs index 4df9c83e..c7448798 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs @@ -336,7 +336,7 @@ namespace FineUIPro.Web.Comprehensive if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("机具报验导入模板", "机具报验("+ projectName+DateTime.Now.ToString("yyyyMMdd")+ ")"); + newUrl = uploadfilepath.Replace("机具报验导入模板", "机具报验("+ projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd")+ ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs index e0f3d1fd..17178cdd 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs @@ -414,7 +414,7 @@ namespace FineUIPro.Web.Comprehensive if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("人员报验导入模板", "人员报验(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("人员报验导入模板", "人员报验(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs index e74faf92..23a983ca 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs @@ -271,7 +271,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("检验试验计划导入模板.xls", "检验试验计划(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ").xls"); + newUrl = uploadfilepath.Replace("检验试验计划导入模板.xls", "检验试验计划(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ").xls"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs index e61f4f8a..88908b3a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs @@ -313,7 +313,7 @@ namespace FineUIPro.Web.Comprehensive if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("超过一定规模的危大施工方案导入模板", "超过一定规模的危大施工方案(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("超过一定规模的危大施工方案导入模板", "超过一定规模的危大施工方案(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs index 4f7aca93..10423154 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs @@ -362,7 +362,7 @@ namespace FineUIPro.Web.Comprehensive if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("NCR管理导入模板", "NCR管理(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("NCR管理导入模板", "NCR管理(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs index ab5c4c7a..d4f3f485 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs @@ -298,7 +298,7 @@ namespace FineUIPro.Web.Comprehensive if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("压力管道管理导入模板", "压力管道管理(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("压力管道管理导入模板", "压力管道管理(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs index 3f2d2684..15a85c13 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs @@ -540,7 +540,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("共检通知单模板", "共检通知单(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("共检通知单模板", "共检通知单(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ConExperienceSummary.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ConExperienceSummary.aspx.cs index 3c6996be..93e29947 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ConExperienceSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ConExperienceSummary.aspx.cs @@ -224,7 +224,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("类似项目施工经验总结清单导入模板", "类似项目施工经验总结清单(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("类似项目施工经验总结清单导入模板", "类似项目施工经验总结清单(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs index 58bc1312..c8fc0b7e 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs @@ -496,7 +496,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning initTemplatePath = Const.CQMS_OrganizationalUrl; uploadfilepath = rootPath + initTemplatePath; - newUrl = uploadfilepath.Replace("总包质量管理组织机构图", "总包质量管理组织机构图(" + pModel.ShortName + ")"); + newUrl = uploadfilepath.Replace("总包质量管理组织机构图", "总包质量管理组织机构图(" + pModel.ShortName.Replace("/", "") + ")"); //filePath = initTemplatePath.Replace(".doc", trainRecords.TrainRecordsId.Replace("/", "-") + ".pdf"); if (File.Exists(newUrl)) { diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ProjectQualityPlan.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ProjectQualityPlan.aspx.cs index 42ebc1ce..86da0822 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ProjectQualityPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/ProjectQualityPlan.aspx.cs @@ -228,7 +228,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("项目质量计划导入模板", "项目质量计划(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("项目质量计划导入模板", "项目质量计划(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx.cs index 52c65bb1..5b469a34 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx.cs @@ -228,7 +228,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning if (lists != null) { string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); - newUrl = uploadfilepath.Replace("质量管理制度导入模板", "质量管理制度(" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("质量管理制度导入模板", "质量管理制度(" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")"); if (File.Exists(newUrl)) { File.Delete(newUrl);