From 5a47e8145b499d683c29527a9a970af06ee146b6 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Tue, 30 Apr 2024 23:33:49 +0800 Subject: [PATCH] =?UTF-8?q?20240430=20=E8=B4=A8=E9=87=8F=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2024-05-01-bwj.sql | 45 ++++ .../Comprehensive/DesignDetailsService.cs | 1 + .../GeneralPlanApprovalService.cs | 1 + .../Comprehensive/MajorPlanApprovalService.cs | 1 + .../Comprehensive/NCRManagementService.cs | 1 + .../CQMS/Comprehensive/PressurePipeService.cs | 1 + .../Comprehensive/QualityAccidentService.cs | 1 + .../Comprehensive/SpecialEquipmentService.cs | 1 + SGGL/BLL/Common/Const.cs | 4 +- .../ConTechnologyDisclosure.aspx | 2 +- .../ConTechnologyDisclosure.aspx.cs | 4 +- .../Comprehensive/DataDistribution.aspx.cs | 2 +- .../Comprehensive/DataReceivingDoc.aspx.cs | 2 +- .../CQMS/Comprehensive/DesignChangeOrder.aspx | 2 +- .../Comprehensive/DesignChangeOrder.aspx.cs | 5 +- .../CQMS/Comprehensive/DesignDetails.aspx | 5 +- .../CQMS/Comprehensive/DesignDetails.aspx.cs | 203 ++++++++++++--- .../DesignDetails.aspx.designer.cs | 9 + .../Comprehensive/DesignDetailsDataIn.aspx.cs | 19 +- .../CQMS/Comprehensive/DesignDetailsEdit.aspx | 3 +- .../Comprehensive/DesignDetailsEdit.aspx.cs | 17 ++ .../DesignDetailsEdit.aspx.designer.cs | 4 +- .../CQMS/Comprehensive/DesignDrawings.aspx | 5 +- .../CQMS/Comprehensive/DesignDrawings.aspx.cs | 225 +++++++++++++++-- .../DesignDrawings.aspx.designer.cs | 67 ++--- .../DesignDrawingsDataIn.aspx.cs | 95 +++---- .../Comprehensive/DesignDrawingsEdit.aspx | 2 +- .../Comprehensive/DesignDrawingsEdit.aspx.cs | 18 +- .../Comprehensive/GeneralPlanApproval.aspx | 5 +- .../Comprehensive/GeneralPlanApproval.aspx.cs | 159 +++++++++++- .../GeneralPlanApproval.aspx.designer.cs | 9 + .../GeneralPlanApprovalDataIn.aspx.cs | 21 +- .../GeneralPlanApprovalEdit.aspx | 3 +- .../GeneralPlanApprovalEdit.aspx.cs | 8 + .../GeneralPlanApprovalEdit.aspx.designer.cs | 9 + .../Comprehensive/InspectionEquipment.aspx.cs | 2 +- .../CQMS/Comprehensive/InspectionMachine.aspx | 2 +- .../Comprehensive/InspectionMachine.aspx.cs | 4 +- .../CQMS/Comprehensive/InspectionPerson.aspx | 2 +- .../Comprehensive/InspectionPerson.aspx.cs | 4 +- .../Comprehensive/InspectionTestPlan.aspx | 5 +- .../Comprehensive/InspectionTestPlan.aspx.cs | 146 ++++++++++- .../InspectionTestPlan.aspx.designer.cs | 9 + .../InspectionTestPlanDataIn.aspx.cs | 23 +- .../Comprehensive/InspectionTestPlanEdit.aspx | 2 +- .../InspectionTestPlanEdit.aspx.cs | 9 +- .../InspectionTestPlanEdit.aspx.designer.cs | 52 ++-- .../CQMS/Comprehensive/MajorPlanApproval.aspx | 5 +- .../Comprehensive/MajorPlanApproval.aspx.cs | 167 ++++++++++++- .../MajorPlanApproval.aspx.designer.cs | 9 + .../MajorPlanApprovalDataIn.aspx.cs | 8 +- .../Comprehensive/MajorPlanApprovalEdit.aspx | 4 +- .../MajorPlanApprovalEdit.aspx.cs | 10 +- .../MajorPlanApprovalEdit.aspx.designer.cs | 61 +++-- .../CQMS/Comprehensive/NCRManagement.aspx | 5 +- .../CQMS/Comprehensive/NCRManagement.aspx.cs | 235 ++++++++++++++++-- .../NCRManagement.aspx.designer.cs | 67 ++--- .../Comprehensive/NCRManagementDataIn.aspx.cs | 19 +- .../CQMS/Comprehensive/NCRManagementEdit.aspx | 24 +- .../Comprehensive/NCRManagementEdit.aspx.cs | 17 +- .../NCRManagementEdit.aspx.designer.cs | 27 +- .../CQMS/Comprehensive/PressurePipe.aspx | 7 +- .../CQMS/Comprehensive/PressurePipe.aspx.cs | 136 +++++++++- .../PressurePipe.aspx.designer.cs | 9 + .../Comprehensive/PressurePipeDataIn.aspx.cs | 19 +- .../CQMS/Comprehensive/PressurePipeEdit.aspx | 13 +- .../Comprehensive/PressurePipeEdit.aspx.cs | 19 +- .../PressurePipeEdit.aspx.designer.cs | 67 ++--- .../CQMS/Comprehensive/QualityAccident.aspx | 5 +- .../Comprehensive/QualityAccident.aspx.cs | 137 +++++++++- .../QualityAccident.aspx.designer.cs | 9 + .../QualityAccidentDataIn.aspx.cs | 19 +- .../Comprehensive/QualityAccidentEdit.aspx | 1 + .../Comprehensive/QualityAccidentEdit.aspx.cs | 19 +- .../QualityAccidentEdit.aspx.designer.cs | 69 ++--- .../CQMS/Comprehensive/ReviewDrawings.aspx | 5 +- .../CQMS/Comprehensive/ReviewDrawings.aspx.cs | 141 +++++++++++ .../ReviewDrawings.aspx.designer.cs | 9 + .../ReviewDrawingsDataIn.aspx.cs | 19 +- .../Comprehensive/ReviewDrawingsEdit.aspx | 2 +- .../Comprehensive/ReviewDrawingsEdit.aspx.cs | 19 +- .../ReviewDrawingsEdit.aspx.designer.cs | 63 ++--- .../Comprehensive/SiteVisaManagement.aspx | 2 +- .../Comprehensive/SiteVisaManagement.aspx.cs | 4 +- .../CQMS/Comprehensive/SpecialEquipment.aspx | 7 +- .../Comprehensive/SpecialEquipment.aspx.cs | 149 ++++++++++- .../SpecialEquipment.aspx.designer.cs | 9 + .../SpecialEquipmentDataIn.aspx.cs | 19 +- .../Comprehensive/SpecialEquipmentEdit.aspx | 7 +- .../SpecialEquipmentEdit.aspx.cs | 17 +- .../SpecialEquipmentEdit.aspx.designer.cs | 9 + .../CQMS/Comprehensive/TrainingRecords.aspx | 2 +- .../Comprehensive/TrainingRecords.aspx.cs | 5 +- SGGL/FineUIPro.Web/ErrLog.txt | 190 ++++++++++++++ .../File/Excel/DataIn/NCR管理导入模板.xls | Bin 20480 -> 22528 bytes .../Excel/DataIn/压力管道管理导入模板.xls | Bin 19456 -> 21504 bytes ...记录导入模板.xls => 图纸会审管理导入模板.xls} | Bin 19968 -> 21504 bytes .../Excel/DataIn/图纸收发记录导入模板.xls | Bin 19968 -> 14848 bytes .../DataIn/施工组织设计及施工方案导入模板.xls | Bin 19456 -> 14848 bytes .../Excel/DataIn/检验试验计划导入模板.xls | Bin 19456 -> 21504 bytes .../Excel/DataIn/特种设备管理导入模板.xls | Bin 19456 -> 20992 bytes .../File/Excel/DataIn/设计交底导入模板.xls | Bin 19456 -> 0 bytes .../Excel/DataIn/设计交底管理导入模板.xls | Bin 0 -> 14848 bytes .../Excel/DataIn/质量事故处理记录导入模板.xls | Bin 19456 -> 21504 bytes .../超过一定规模的危大施工方案导入模板.xls | Bin 19456 -> 21504 bytes SGGL/Model/Model.cs | 80 +++--- 106 files changed, 2666 insertions(+), 498 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-05-01-bwj.sql rename SGGL/FineUIPro.Web/File/Excel/DataIn/{图纸会审记录导入模板.xls => 图纸会审管理导入模板.xls} (77%) delete mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/设计交底导入模板.xls create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/设计交底管理导入模板.xls diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-01-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-01-bwj.sql new file mode 100644 index 00000000..149a8d2c --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-05-01-bwj.sql @@ -0,0 +1,45 @@ +alter table Comprehensive_DesignDetails alter column RemarCode int +go +alter table Comprehensive_GeneralPlanApproval alter column RemarkCode int +go +alter table Comprehensive_MajorPlanApproval alter column RemarkCode int +go +alter table Inspection_Test_Plan alter column RemarkCode int +go +alter table Comprehensive_NCRManagement alter column RemarkCode int +go +alter table Comprehensive_SpecialEquipment alter column RemarkCode int +go +alter table Comprehensive_PressurePipe alter column RemarkCode int +go +alter table Comprehensive_QualityAccident alter column RemarkCode int +go +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-30003-ST21-04~05' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-48112-ST25-01~04' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-30001-ST46-01~05' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-30602-ST21-01~02' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='F022BFQ001N421' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-30001-ST25-01~10' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-48105-ST21-01~04' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-30001-ST25-11~21' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='úװ' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-48106-ST21-01~012' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-48110-ST21-01~02' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-30001-ST45-01~05' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-48103-ST21-01~05' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='F22BFU001N421' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-48101-ST21-04~05' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-30100-ST40-01' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='F022BGT001N421' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-24002-ST25-01~07' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-48101-ST35-13' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-48101-ST35-11' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='շװ' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-48109-ST21-01' +update Comprehensive_DesignDrawings set RemarkCode =null where RemarkCode='19021-30001-ST03-01~04' +go +alter table Comprehensive_DesignDrawings alter column RemarkCode int +go +alter table Comprehensive_ReviewDrawings alter column RemarkCode int +go \ No newline at end of file diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs index bbb685b6..11cac15c 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs @@ -168,6 +168,7 @@ namespace BLL newDesignDetails.Status = designDetails.Status; newDesignDetails.AuditMan = designDetails.AuditMan; newDesignDetails.JoinPersonNum = designDetails.JoinPersonNum; + newDesignDetails.RemarCode = designDetails.RemarCode; db.SubmitChanges(); } diff --git a/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalService.cs b/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalService.cs index 649bb780..9c01f2d8 100644 --- a/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalService.cs @@ -143,6 +143,7 @@ namespace BLL newGeneralPlanApproval.ImplementationDeviation = generalPlanApproval.ImplementationDeviation; newGeneralPlanApproval.AttachUrl = generalPlanApproval.AttachUrl; newGeneralPlanApproval.UnitWorkId = generalPlanApproval.UnitWorkId; + newGeneralPlanApproval.RemarkCode = generalPlanApproval.RemarkCode; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs index 74d664ec..d0efc0c7 100644 --- a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs @@ -149,6 +149,7 @@ namespace BLL newMajorPlanApproval.AttachUrl = majorPlanApproval.AttachUrl; newMajorPlanApproval.UnitWorkId = majorPlanApproval.UnitWorkId; newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan; + newMajorPlanApproval.RemarkCode = majorPlanApproval.RemarkCode; newMajorPlanApproval.IsReview = majorPlanApproval.IsReview; db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs index 1e5b5755..f02c6d4b 100644 --- a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs @@ -149,6 +149,7 @@ namespace BLL newNCRManagement.Status = nCRManagement.Status; newNCRManagement.Problem = nCRManagement.Problem; newNCRManagement.Measure = nCRManagement.Measure; + newNCRManagement.RemarkCode = nCRManagement.RemarkCode; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs b/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs index 6c4dc9ed..62991c6f 100644 --- a/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs @@ -127,6 +127,7 @@ namespace BLL newPressurePipe.IssuedReportNumber = PressurePipe.IssuedReportNumber; newPressurePipe.Status = PressurePipe.Status; newPressurePipe.ReportTime = PressurePipe.ReportTime; + newPressurePipe.RemarkCode = PressurePipe.RemarkCode; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs b/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs index 406f17bf..10aba676 100644 --- a/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs @@ -127,6 +127,7 @@ namespace BLL newQualityAccident.AttachUrl = QualityAccident.AttachUrl; newQualityAccident.UnitWorkId = QualityAccident.UnitWorkId; newQualityAccident.Status = QualityAccident.Status; + newQualityAccident.RemarkCode = QualityAccident.RemarkCode; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs index 67a8835c..7f697c09 100644 --- a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs @@ -130,6 +130,7 @@ namespace BLL newEquipment.MonitoringReportNumber = SpecialEquipment.MonitoringReportNumber; newEquipment.Status = SpecialEquipment.Status; newEquipment.PositionNum = SpecialEquipment.PositionNum; + newEquipment.RemarkCode = SpecialEquipment.RemarkCode; db.SubmitChanges(); } } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 762826be..fb4b0ca1 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3259,12 +3259,12 @@ namespace BLL /// /// 设计交底导入模板文件原始虚拟路径 /// - public const string DesignDetailsTemplateUrl = "File\\Excel\\DataIn\\设计交底导入模板.xls"; + public const string DesignDetailsTemplateUrl = "File\\Excel\\DataIn\\设计交底管理导入模板.xls"; /// /// 图纸会审记录导入模板文件原始虚拟路径 /// - public const string ReviewDrawingsTemplateUrl = "File\\Excel\\DataIn\\图纸会审记录导入模板.xls"; + public const string ReviewDrawingsTemplateUrl = "File\\Excel\\DataIn\\图纸会审管理导入模板.xls"; /// /// 检验试验计划导入模板文件原始虚拟路径 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx index 5cbee3b9..08f047ec 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx @@ -15,7 +15,7 @@ diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs index 844a4050..b1957133 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs @@ -32,7 +32,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive public void BindGrid() { string strSql = @"select C.ConTechnologyDisclosureId, C.ProjectId, C.CNProfessionalId, C.DisclosureCode, C.DisclosureName,C.UnitId,C.DisclosureMan,C.DisclosureDate, C.UnitWorkId,C.AttendMan, - C.CompileMan, C.CompileDate, C.RemarkCode,CN.ProfessionalName,u.UnitName + C.CompileMan, C.CompileDate, C.RemarkCode,CN.ProfessionalName,u.UnitName,C.RemarkCode from Comprehensive_ConTechnologyDisclosure C left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId left join Base_Unit u on u.UnitId = C.UnitId @@ -262,7 +262,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("施工技术交底管理导入模板", "施工技术交底管理（"+projectName+DateTime.Now.ToString("yyyyMMdd")+"）"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx.cs index 1c6e24f2..8f25abfc 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx.cs @@ -27,7 +27,7 @@ namespace FineUIPro.Web.Comprehensive { string strSql = @"select DataDistributionId, ProjectId, SendDate, FileCode, FileName, Status, SendMan, ReceivingUnit, ReceivingMan, (case when FileType='1' then '纸质' ELSE '电子' end)AS FileType, CopiesCount, (case when IsReply='True' then '是' else '否' end) as IsReply, ReplyCode, - ReplyDate, Remark, AttachUrl, CompileMan, CompileDate,CN.ProfessionalName + ReplyDate, Remark, AttachUrl, CompileMan, CompileDate,CN.ProfessionalName from Comprehensive_DataDistribution C left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId where C.ProjectId = @ProjectId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs index 5e1bd28c..528aca21 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs @@ -350,7 +350,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("资料收发文登记记录导入模板", "资料收发文登记记录（" + projectName + "" + DateTime.Now.ToString("yyyyMMdd") + ")"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx index 38d2bc1a..90fa1098 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx @@ -15,7 +15,7 @@ diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs index 71057464..474ecd6f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs @@ -45,7 +45,8 @@ namespace FineUIPro.Web.Comprehensive C.ImplementationFrontState, CN.ProfessionalName, C.Status, - C.CompleteDate + C.CompleteDate, + C.RemarkCode from Comprehensive_DesignChangeOrder C " + @" left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId " + @" where C.ProjectId = @ProjectId"; @@ -314,7 +315,7 @@ namespace FineUIPro.Web.Comprehensive lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("设计变更单导入模板", "设计变更单（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx index 57482e4c..d3b260b5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx @@ -15,7 +15,7 @@ @@ -29,6 +29,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs index 055e20fd..3ce2d892 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; namespace FineUIPro.Web.Comprehensive { @@ -26,7 +27,7 @@ namespace FineUIPro.Web.Comprehensive public void BindGrid() { string strSql = @"select DesignDetailsId,DesignDetailsCode, DetailsMan, DetailsDate, UnitWorkId,Status, - UnitName, AttachUrl, CompileMan, CN.ProfessionalName + UnitName, AttachUrl, CompileMan, CN.ProfessionalName,C.RemarCode from Comprehensive_DesignDetails C left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId where C.ProjectId = @ProjectId"; @@ -230,6 +231,35 @@ namespace FineUIPro.Web.Comprehensive return ""; } } + + public static string ConvertState(object Status) + { + if (Status != null) + { + if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile) + { + return "重报"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect) + { + return "驳回"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile) + { + return "编制"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit) + { + return "待审批"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete) + { + return "审批完成"; + } + } + + return "编制"; + } #endregion #region 获取按钮权限 @@ -271,36 +301,7 @@ namespace FineUIPro.Web.Comprehensive } } #endregion - - public static string ConvertState(object Status) - { - if (Status != null) - { - if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile) - { - return "重报"; - } - else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect) - { - return "驳回"; - } - else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile) - { - return "编制"; - } - else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit) - { - return "待审批"; - } - else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete) - { - return "审批完成"; - } - } - - return "编制"; - } - + #region 导入 /// /// 导入按钮 @@ -312,5 +313,145 @@ namespace FineUIPro.Web.Comprehensive PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("DesignDetailsDataIn.aspx", "导入 - "))); } #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.DesignDetailsTemplateUrl; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; + + var lists = (from x in Funs.DB.Comprehensive_DesignDetails + where x.ProjectId == this.CurrUser.LoginProjectId + select x); + if (sdrpCNProfessionalId.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.CNProfessionalId == sdrpCNProfessionalId.SelectedValue); + } + lists = lists.OrderBy(x => x.RemarCode); + if (lists != null) + { + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("设计交底管理导入模板", "设计交底管理（" + projectName+ DateTime.Now.ToString("yyyyMMdd") + ")"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle(); + cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font0 = workbook.CreateFont(); + font0.FontHeightInPoints = 12; + font0.IsBold = true; + cellStyle0.SetFont(font0); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 2; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + string proName = string.Empty; + var cnp = BLL.CNProfessionalService.GetCNProfessional(item.CNProfessionalId); + if (cnp != null) + { + proName = cnp.ProfessionalName; + } + cell.SetCellValue(proName);//专业 + + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.DesignDetailsCode);//文件号 + + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.DetailsMan);//交底人 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.DetailsDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.DetailsDate) : "");//交底日期 + + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + string unitWorkName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitWorkId)) + { + unitWorkName = ConvertUnitWork(item.UnitWorkId); + } + cell.SetCellValue(unitWorkName);//单位工程 + + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + string unitName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitName)) + { + unitName = ConvertCarryUnit(item.UnitName); + } + cell.SetCellValue(unitName);//参加单位 + + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.JoinPersonNum.HasValue ? item.JoinPersonNum.ToString() : "");//参加人数 + + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarCode.HasValue ? item.RemarCode.ToString() : "");//标志编号 + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.designer.cs index aabbb362..a0108d6f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.designer.cs @@ -93,6 +93,15 @@ namespace FineUIPro.Web.Comprehensive { /// protected global::FineUIPro.Button btnImport; + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs index 27ff5bae..11c6711e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs @@ -178,7 +178,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); if (!string.IsNullOrEmpty(row0)) @@ -255,6 +255,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int t = Convert.ToInt32(row7); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row7 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -404,13 +415,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_DesignDetails oldViewInfo = new Model.Comprehensive_DesignDetails(); string row0 = pds.Rows[i][0].ToString().Trim(); var cn = cns.Where(y => y.ProfessionalName == row0).FirstOrDefault(); - oldViewInfo = oldViewInfos.Where(x => x.RemarCode == pds.Rows[i][7].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarCode ==Funs.GetNewInt(pds.Rows[i][7].ToString().Trim()) ).FirstOrDefault(); if (oldViewInfo == null) { @@ -430,7 +441,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive des.UnitName = BLL.UnitService.GetUnitIds(pds.Rows[i][5].ToString().Trim()); } des.JoinPersonNum = Funs.GetNewInt(pds.Rows[i][6].ToString().Trim()); - des.RemarCode = pds.Rows[i][7].ToString().Trim(); + des.RemarCode = Funs.GetNewInt(pds.Rows[i][7].ToString().Trim()); des.CompileMan = this.CurrUser.UserId; des.CompileDate = DateTime.Now; des.Status = BLL.Const.Comprehensive_Compile; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx index 07c72260..8903ba25 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx @@ -39,7 +39,8 @@ - + <%----%> + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs index a18c938c..32679055 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs @@ -71,6 +71,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.txtJoinPersonNum.Text = designDetails.JoinPersonNum.ToString(); } + this.txtRemarkCode.Text = designDetails.RemarCode.HasValue ? designDetails.RemarCode.ToString() : ""; var auditApprove = DesignDetailsApproveService.GetAuditApprove(designDetails.DesignDetailsId, BLL.Const.Comprehensive_Audit); if (auditApprove != null) { @@ -133,6 +134,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpUnitWorks.Readonly = true; this.drpAudit.Readonly = true; + this.txtRemarkCode.Readonly = true; //this.btnAttach.Enabled = false; @@ -174,6 +176,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_DesignDetails.FirstOrDefault(x => x.RemarCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignDetailsId != this.DesignDetailsId || (this.DesignDetailsId == null && x.DesignDetailsId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_DesignDetails designDetails = new Model.Comprehensive_DesignDetails(); designDetails.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) @@ -214,6 +222,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); } designDetails.UnitName = unitIds; + designDetails.RemarCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.DesignDetailsId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) @@ -254,6 +263,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_DesignDetails.FirstOrDefault(x => x.RemarCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignDetailsId != this.DesignDetailsId || (this.DesignDetailsId == null && x.DesignDetailsId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } + Model.Comprehensive_DesignDetails designDetails = new Model.Comprehensive_DesignDetails(); designDetails.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) @@ -294,6 +310,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); } designDetails.UnitName = unitIds; + designDetails.RemarCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.DesignDetailsId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs index e332d44a..965fc383 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs @@ -103,13 +103,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive { protected global::FineUIPro.NumberBox txtJoinPersonNum; /// - /// TextBox1 控件。 + /// txtRemarkCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox1; + protected global::FineUIPro.NumberBox txtRemarkCode; /// /// Panel2 控件。 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx index a3b29823..c83b8e00 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx @@ -15,7 +15,7 @@ @@ -35,6 +35,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs index c5e13e95..7f8dc3d6 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; namespace FineUIPro.Web.Comprehensive @@ -272,6 +273,36 @@ namespace FineUIPro.Web.Comprehensive return ""; } } + + public static string ConvertState(object Status) + { + if (Status != null) + { + if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile) + { + return "重报"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect) + { + return "驳回"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile) + { + return "编制"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit) + { + return "待审批"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete) + { + return "审批完成"; + } + } + + return "编制"; + } + #endregion #region 获取按钮权限 @@ -314,33 +345,177 @@ namespace FineUIPro.Web.Comprehensive } #endregion - public static string ConvertState(object Status) + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) { - if (Status != null) - { - if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile) - { - return "重报"; - } - else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect) - { - return "驳回"; - } - else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile) - { - return "编制"; - } - else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit) - { - return "待审批"; - } - else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete) - { - return "审批完成"; - } - } + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.DesignDrawingsDataInUrl; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; - return "编制"; + var lists = (from x in Funs.DB.Comprehensive_DesignDrawings + where x.ProjectId == this.CurrUser.LoginProjectId + select x); + if (sdrpCNProfessionalId.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.CNProfessionalId == sdrpCNProfessionalId.SelectedValue); + } + if (!string.IsNullOrEmpty(this.stxtReceiveDate.Text.Trim())) + { + lists = lists.Where(x => x.ReceiveDate ==Funs.GetNewDateTime(stxtReceiveDate.Text.Trim())); + } + if (!string.IsNullOrEmpty(this.stxtSendDate.Text.Trim())) + { + lists = lists.Where(x => x.SendDate == Funs.GetNewDateTime(stxtSendDate.Text.Trim())); + } + lists = lists.OrderBy(x => x.RemarkCode); + if (lists != null) + { + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("图纸收发记录导入模板", "图纸收发记录（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle(); + cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font0 = workbook.CreateFont(); + font0.FontHeightInPoints = 12; + font0.IsBold = true; + cellStyle0.SetFont(font0); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 2; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + //cell = row.CreateCell(0); + //cell.CellStyle = cellStyle; + //string unitName = string.Empty; + //if (!string.IsNullOrEmpty(item.UnitId)) + //{ + // unitName = BLL.UnitService.GetUnitNameByUnitId(item.UnitId); + //} + //cell.SetCellValue(unitName);//报批单位 + + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + string proName = string.Empty; + var cnp = BLL.CNProfessionalService.GetCNProfessional(item.CNProfessionalId); + if (cnp != null) + { + proName = cnp.ProfessionalName; + } + cell.SetCellValue(proName);//专业 + + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.DesignDrawingsCode);//设计图纸编号 + + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + string unitWorkName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitWorkId)) + { + unitWorkName = ConvertUnitWork(item.UnitWorkId); + } + cell.SetCellValue(unitWorkName);//单位工程 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.DesignDrawingsContent);//图纸内容 + + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Edition);//版次 + + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PageNumber.HasValue ? item.PageNumber.ToString() : "");//页数 + + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ReceiveDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ReceiveDate) : "");//接收日期 + + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.SendDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.SendDate) : "");//发送日期 + + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; + string unitName = string.Empty; + if (!string.IsNullOrEmpty(item.ReceiveUnits)) + { + unitName = ConvertCarryUnit(item.ReceiveUnits); + } + cell.SetCellValue(unitName);//接收单位 + + cell = row.CreateCell(9); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ReceiveMan);//接收人 + + cell = row.CreateCell(10); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Remark);//备注 + + cell = row.CreateCell(11); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.designer.cs index 56749638..f525714d 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.Comprehensive -{ - - - public partial class DesignDrawings - { - +namespace FineUIPro.Web.Comprehensive { + + + public partial class DesignDrawings { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// ToolSearch 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar ToolSearch; - + /// /// sdrpCNProfessionalId 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList sdrpCNProfessionalId; - + /// /// stxtReceiveDate 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker stxtReceiveDate; - + /// /// stxtSendDate 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker stxtSendDate; - + /// /// btnSearch 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// btnNew 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnImport 控件。 /// @@ -112,7 +110,16 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnImport; - + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// @@ -121,7 +128,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - + /// /// Label2 控件。 /// @@ -130,7 +137,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label2; - + /// /// Label3 控件。 /// @@ -139,7 +146,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label3; - + /// /// txtStatus 控件。 /// @@ -148,7 +155,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label txtStatus; - + /// /// lbtnFileUrl 控件。 /// @@ -157,7 +164,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl; - + /// /// ToolbarText1 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window2; - + /// /// WindowAtt 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; - + /// /// Menu1 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuModify 控件。 /// @@ -220,7 +227,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuModify; - + /// /// btnMenuDel 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs index 8faf6310..d867b7cb 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs @@ -178,7 +178,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); if (string.IsNullOrEmpty(row0)) @@ -215,9 +215,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive } string row5 = pds.Rows[i][5].ToString(); - if (string.IsNullOrEmpty(row5)) + if (!string.IsNullOrEmpty(row5)) { - result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|"; + try + { + Int32 date = Convert.ToInt32(row5.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "页数" + "," + "[" + row5 + "]错误！" + "|"; + } } string row6 = pds.Rows[i][6].ToString(); @@ -225,11 +232,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive { try { - Int32 date = Convert.ToInt32(row6.Trim()); + DateTime date = Convert.ToDateTime(row6.Trim()); } catch (Exception) { - result += (i + 2).ToString() + "," + "页数" + "," + "[" + row6 + "]错误！" + "|"; + result += (i + 2).ToString() + "," + "接收日期" + "," + "[" + row6 + "]错误！" + "|"; } } @@ -242,27 +249,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive } catch (Exception) { - result += (i + 2).ToString() + "," + "接收日期" + "," + "[" + row7 + "]错误！" + "|"; + result += (i + 2).ToString() + "," + "发送日期" + "," + "[" + row7 + "]错误！" + "|"; } } string row8 = pds.Rows[i][8].ToString(); if (!string.IsNullOrEmpty(row8)) { - try - { - DateTime date = Convert.ToDateTime(row8.Trim()); - } - catch (Exception) - { - result += (i + 2).ToString() + "," + "发送日期" + "," + "[" + row8 + "]错误！" + "|"; - } - } - - string row9 = pds.Rows[i][9].ToString(); - if (!string.IsNullOrEmpty(row9)) - { - string[] reunit = row9.Split(','); + string[] reunit = row8.Split(','); foreach (string unit in reunit) { var u = units.Where(x => x.UnitName == unit.Trim()).FirstOrDefault(); @@ -272,6 +266,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive } } } + + string row11 = pds.Rows[i][11].ToString(); + if (string.IsNullOrEmpty(row11)) + { + result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|"; + } + else + { + try + { + int t = Convert.ToInt32(row11); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标识编号" + "," + "[" + row11 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -421,12 +432,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_DesignDrawings oldViewInfo = new Model.Comprehensive_DesignDrawings(); string row0 = pds.Rows[i][0].ToString().Trim(); var cn = cns.Where(y => y.ProfessionalName == row0).FirstOrDefault(); - oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][5].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][11].ToString().Trim()) ).FirstOrDefault(); if (oldViewInfo == null) { @@ -441,25 +452,25 @@ namespace FineUIPro.Web.CQMS.Comprehensive } des.DesignDrawingsContent = pds.Rows[i][3].ToString().Trim();//图纸内容 des.Edition = pds.Rows[i][4].ToString().Trim();//版次 - des.RemarkCode = pds.Rows[i][5].ToString().Trim();//标志编号 + if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim())) + { + des.PageNumber = Convert.ToInt32(pds.Rows[i][5].ToString().Trim());//页数 + } if (!string.IsNullOrEmpty(pds.Rows[i][6].ToString().Trim())) { - des.PageNumber = Convert.ToInt32(pds.Rows[i][6].ToString().Trim());//页数 + des.ReceiveDate = Convert.ToDateTime(pds.Rows[i][6].ToString().Trim());//接收日期 } if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim())) { - des.ReceiveDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());//接收日期 + des.SendDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());//发送日期 } if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim())) { - des.SendDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim());//发送日期 + des.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][8].ToString().Trim());//接收单位 } - if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim())) - { - des.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][9].ToString().Trim());//接收单位 - } - des.ReceiveMan = pds.Rows[i][10].ToString().Trim(); //接收人 - des.Remark = pds.Rows[i][11].ToString().Trim();//备注 + des.ReceiveMan = pds.Rows[i][9].ToString().Trim(); //接收人 + des.Remark = pds.Rows[i][10].ToString().Trim();//备注 + des.RemarkCode = Funs.GetNewInt(pds.Rows[i][11].ToString().Trim());//标志编号 des.Status = BLL.Const.Comprehensive_Compile; des.CompileMan = this.CurrUser.UserId; BLL.DesignDrawingsService.AddDesignDrawings(des); @@ -474,25 +485,25 @@ namespace FineUIPro.Web.CQMS.Comprehensive } oldViewInfo.DesignDrawingsContent = pds.Rows[i][3].ToString().Trim();//图纸内容 oldViewInfo.Edition = pds.Rows[i][4].ToString().Trim();//版次 - oldViewInfo.RemarkCode = pds.Rows[i][5].ToString().Trim();//标志编号 + if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim())) + { + oldViewInfo.PageNumber = Convert.ToInt32(pds.Rows[i][5].ToString().Trim());//页数 + } if (!string.IsNullOrEmpty(pds.Rows[i][6].ToString().Trim())) { - oldViewInfo.PageNumber = Convert.ToInt32(pds.Rows[i][6].ToString().Trim());//页数 + oldViewInfo.ReceiveDate = Convert.ToDateTime(pds.Rows[i][6].ToString().Trim());//接收日期 } if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim())) { - oldViewInfo.ReceiveDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());//接收日期 + oldViewInfo.SendDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());//发送日期 } if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim())) { - oldViewInfo.SendDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim());//发送日期 + oldViewInfo.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][8].ToString().Trim());//接收单位 } - if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim())) - { - oldViewInfo.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][9].ToString().Trim());//接收单位 - } - oldViewInfo.ReceiveMan = pds.Rows[i][10].ToString().Trim(); //接收人 - oldViewInfo.Remark = pds.Rows[i][11].ToString().Trim();//备注 + oldViewInfo.ReceiveMan = pds.Rows[i][9].ToString().Trim(); //接收人 + oldViewInfo.Remark = pds.Rows[i][10].ToString().Trim();//备注 + oldViewInfo.RemarkCode = Funs.GetNewInt(pds.Rows[i][11].ToString().Trim());//标志编号 oldViewInfo.CompileMan = this.CurrUser.UserId; oldViewInfo.Status = BLL.Const.Comprehensive_Compile; BLL.DesignDrawingsService.UpdateDesignDrawings(oldViewInfo); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx index 97230392..c18cb356 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx @@ -32,7 +32,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs index 2a50a668..5d203926 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs @@ -70,7 +70,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive } this.txtReceiveMan.Text = designDrawings.ReceiveMan; this.txtRemark.Text = designDrawings.Remark; - this.txtRemarkCode.Text = designDrawings.RemarkCode; + this.txtRemarkCode.Text = designDrawings.RemarkCode.HasValue ? designDrawings.RemarkCode.ToString() : ""; var currApprove = DesignDrawingsApproveService.GetCurrentApprove(designDrawings.DesignDrawingsId); @@ -171,6 +171,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_DesignDrawings.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignDrawingsId != this.DesignDrawingsId || (this.DesignDrawingsId == null && x.DesignDrawingsId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_DesignDrawings designDrawings = new Model.Comprehensive_DesignDrawings(); designDrawings.ProjectId = this.CurrUser.LoginProjectId; @@ -184,7 +190,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive designDrawings.ReceiveMan = this.txtReceiveMan.Text.Trim(); designDrawings.Remark = this.txtRemark.Text.Trim(); designDrawings.CompileMan = this.CurrUser.UserId; - designDrawings.RemarkCode = this.txtRemarkCode.Text.Trim(); + designDrawings.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) { designDrawings.AuditMan = drpAudit.SelectedValue; @@ -251,6 +257,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_DesignDrawings.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignDrawingsId != this.DesignDrawingsId || (this.DesignDrawingsId == null && x.DesignDrawingsId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_DesignDrawings designDrawings = new Model.Comprehensive_DesignDrawings(); designDrawings.ProjectId = this.CurrUser.LoginProjectId; designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; @@ -263,7 +275,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive designDrawings.ReceiveMan = this.txtReceiveMan.Text.Trim(); designDrawings.Remark = this.txtRemark.Text.Trim(); designDrawings.CompileMan = this.CurrUser.UserId; - designDrawings.RemarkCode = this.txtRemarkCode.Text.Trim(); + designDrawings.RemarkCode =Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) { designDrawings.AuditMan = drpAudit.SelectedValue; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx index b7f30a56..7fddcb12 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx @@ -15,7 +15,7 @@ @@ -34,6 +34,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs index 4096ac49..946783be 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; namespace FineUIPro.Web.Comprehensive @@ -33,7 +34,7 @@ namespace FineUIPro.Web.Comprehensive { string strSql = @"select GeneralPlanApprovalId, ProjectId, C.UnitId,PlanCode,C.CNProfessionalId, PlanName, ApprovalDate, AuditMan, ApprovalMan, ImplementationDeviation,CompileMan, - CompileDate, UnitWorkId,CN.ProfessionalName,u.UnitName + CompileDate, UnitWorkId,CN.ProfessionalName,u.UnitName,C.RemarkCode from Comprehensive_GeneralPlanApproval C left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId left join Base_Unit u on u.UnitId = c.UnitId @@ -271,5 +272,161 @@ namespace FineUIPro.Web.Comprehensive PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("GeneralPlanApprovalDataIn.aspx", "导入 - "))); } #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.GeneralPlanApprovalTemplateUrl; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; + + var lists = (from x in Funs.DB.Comprehensive_GeneralPlanApproval + where x.ProjectId == this.CurrUser.LoginProjectId + select x); + if (sdrpUnitId.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.UnitId == sdrpUnitId.SelectedValue); + } + if (this.drpProfessionalId.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.CNProfessionalId == drpProfessionalId.SelectedValue); + } + if (!string.IsNullOrEmpty(this.txtPlanName.Text.Trim())) + { + lists = lists.Where(x => x.PlanName.Contains(this.txtPlanName.Text.Trim())); + } + lists = lists.OrderBy(x => x.RemarkCode); + if (lists != null) + { + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("施工组织设计及施工方案导入模板", "施工组织设计及施工方案（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle(); + cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font0 = workbook.CreateFont(); + font0.FontHeightInPoints = 12; + font0.IsBold = true; + cellStyle0.SetFont(font0); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 2; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + string unitName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitId)) + { + unitName = BLL.UnitService.GetUnitNameByUnitId(item.UnitId); + } + cell.SetCellValue(unitName);//报批单位 + + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + string proName = string.Empty; + var cnp = BLL.CNProfessionalService.GetCNProfessional(item.CNProfessionalId); + if (cnp != null) + { + proName = cnp.ProfessionalName; + } + cell.SetCellValue(proName);//专业 + + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + string unitWorkName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitWorkId)) + { + unitWorkName = ConvertUnitWork(item.UnitWorkId); + } + cell.SetCellValue(unitWorkName);//单位工程 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PlanCode);//编号 + + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PlanName);//方案名称 + + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ApprovalDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ApprovalDate) : "");//审批日期 + + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.AuditMan);//审核人 + + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ApprovalMan);//批准人 + + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ImplementationDeviation);//施工总结 + + cell = row.CreateCell(9); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.designer.cs index ffe721a1..b19c2176 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.designer.cs @@ -111,6 +111,15 @@ namespace FineUIPro.Web.Comprehensive { /// protected global::FineUIPro.Button btnImport; + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalDataIn.aspx.cs index 317d539b..2c31f4ac 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalDataIn.aspx.cs @@ -178,7 +178,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); if (string.IsNullOrEmpty(row0)) @@ -246,6 +246,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int t = Convert.ToInt32(row9); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row9 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -395,13 +406,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_GeneralPlanApproval oldViewInfo = new Model.Comprehensive_GeneralPlanApproval(); string row0 = pds.Rows[i][0].ToString().Trim(); string row1 = pds.Rows[i][1].ToString().Trim(); var cn = cns.Where(y => y.ProfessionalName == row1).FirstOrDefault(); - oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][9].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == Funs.GetNewInt(pds.Rows[i][9].ToString().Trim()) ).FirstOrDefault(); if (oldViewInfo == null) { @@ -419,8 +430,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive des.ApprovalDate = Funs.GetNewDateTime(pds.Rows[i][5].ToString().Trim()); des.AuditMan = pds.Rows[i][6].ToString().Trim(); des.ApprovalMan = pds.Rows[i][7].ToString().Trim(); - des.ImplementationDeviation = pds.Rows[i][8].ToString().Trim(); - des.RemarkCode = pds.Rows[i][9].ToString().Trim(); + des.ImplementationDeviation = pds.Rows[i][8].ToString().Trim(); + des.RemarkCode = Funs.GetNewInt(pds.Rows[i][9].ToString().Trim()); des.CompileMan = this.CurrUser.UserId; des.CompileDate = DateTime.Now; BLL.GeneralPlanApprovalService.AddGeneralPlanApproval(des); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalEdit.aspx index 9c396189..173618dd 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalEdit.aspx @@ -16,7 +16,7 @@ - + @@ -55,6 +55,7 @@ + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalEdit.aspx.cs index 7fde8d81..b39dbdef 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalEdit.aspx.cs @@ -64,6 +64,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtAuditMan.Text = generalPlanApproval.AuditMan; this.txtApprovalMan.Text = generalPlanApproval.ApprovalMan; this.txtImplementationDeviation.Text = generalPlanApproval.ImplementationDeviation; + this.txtRemarkCode.Text = generalPlanApproval.RemarkCode.HasValue ? generalPlanApproval.RemarkCode.ToString() : ""; } else { @@ -90,6 +91,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_GeneralPlanApproval.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.GeneralPlanApprovalId != this.GeneralPlanApprovalId || (this.GeneralPlanApprovalId == null && x.GeneralPlanApprovalId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_GeneralPlanApproval generalPlanApproval = new Model.Comprehensive_GeneralPlanApproval(); generalPlanApproval.ProjectId = this.CurrUser.LoginProjectId; if (this.drpUnitId.SelectedValue != BLL.Const._Null) @@ -120,6 +127,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive ids = ids.Substring(0, ids.LastIndexOf(",")); } generalPlanApproval.UnitWorkId = ids; + generalPlanApproval.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.GeneralPlanApprovalId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalEdit.aspx.designer.cs index 0ca06991..11a041d3 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalEdit.aspx.designer.cs @@ -147,6 +147,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnAttach; + /// + /// txtRemarkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// Toolbar1 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs index fc883381..a7627848 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs @@ -309,7 +309,7 @@ namespace FineUIPro.Web.Comprehensive lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + var projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("设备材料报验导入模板", "设备材料报验（" + projectName + "" + DateTime.Now.ToString("yyyyMMdd") + ")"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx index e22ec66a..2c66e751 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx @@ -26,7 +26,7 @@ ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs index fd56334b..b788b077 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.Comprehensive { string strSql = @"select InspectionMachineId, InspectionMachineCode, U.UnitName,CN.ProfessionalName ,Status, InspectionMachineName, SpecificationModel, NextTestDate, TestCycle, C.InspectionDate, - InspectionDate CompileDate, (CASE WHEN IsVerification=1 THEN '是' WHEN IsVerification=0 THEN '否' ELSE '' END) AS IsVerification, InspectionType, LeaveDate, UnitsCount + InspectionDate CompileDate, (CASE WHEN IsVerification=1 THEN '是' WHEN IsVerification=0 THEN '否' ELSE '' END) AS IsVerification, InspectionType, LeaveDate, UnitsCount,C.RemarkCode from Comprehensive_InspectionMachine C left join Base_Unit U on C.UnitId=U.UnitId left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId @@ -328,7 +328,7 @@ namespace FineUIPro.Web.Comprehensive lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("机具报验导入模板", "机具报验（"+ projectName+DateTime.Now.ToString("yyyyMMdd")+ "）"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx index bf771998..e67a17df 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx @@ -27,7 +27,7 @@ diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs index 72302fe0..570f9cb5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs @@ -35,7 +35,7 @@ namespace FineUIPro.Web.Comprehensive string strSql = @"select InspectionPersonId, InspectionPersonCode, PersonName, Status, CertificateNumber, QualifiedProjectCode, ValidityDate, ApprovalTime, DepartureTime, AttachUrl,CompileMan, CompileDate, - IsOnSite, UnitWorkId,U.UnitName,CN.ProfessionalName ,P.PostName + IsOnSite, UnitWorkId,U.UnitName,CN.ProfessionalName ,P.PostName,C.RemarkCode from Comprehensive_InspectionPerson C left join Base_Unit U on C.UnitId=U.UnitId left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId @@ -395,7 +395,7 @@ namespace FineUIPro.Web.Comprehensive lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("人员报验导入模板", "人员报验（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx index 18df54e4..1ee77feb 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx @@ -16,7 +16,7 @@ @@ -35,6 +35,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs index 387c99ea..70b59d90 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; namespace FineUIPro.Web.CQMS.Comprehensive @@ -31,7 +32,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// public void BindGrid() { - string strSql = @"select C.*,CN.ProfessionalName,C.CNProfessionalId,C.UnitId,u.UnitName + string strSql = @"select C.*,CN.ProfessionalName,C.CNProfessionalId,C.UnitId,u.UnitName,C.RemarkCode from Inspection_Test_Plan C left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId left join Base_Unit as u on u.UnitId = C.UnitId @@ -237,5 +238,148 @@ namespace FineUIPro.Web.CQMS.Comprehensive PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("InspectionTestPlanDataIn.aspx", "导入 - "))); } #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.InspectionTestPlanTemplateUrl; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; + + var lists = (from x in Funs.DB.Inspection_Test_Plan + where x.ProjectId == this.CurrUser.LoginProjectId + select x); + if (sdrpUnitId.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.UnitId == sdrpUnitId.SelectedValue); + } + if (drpCNPr.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.CNProfessionalId == drpCNPr.SelectedValue); + } + if (!string.IsNullOrEmpty(this.txtPlanName.Text.Trim())) + { + lists = lists.Where(x => x.PlanName.Contains(this.txtPlanName.Text.Trim())); + } + lists = lists.OrderBy(x => x.RemarkCode); + if (lists != null) + { + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("检验试验计划导入模板.xls", "检验试验计划（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ").xls"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle(); + cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font0 = workbook.CreateFont(); + font0.FontHeightInPoints = 12; + font0.IsBold = true; + cellStyle0.SetFont(font0); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 2; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + string unitName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitId)) + { + unitName = BLL.UnitService.GetUnitNameByUnitId(item.UnitId); + } + cell.SetCellValue(unitName);//报批单位 + + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + string proName = string.Empty; + var cnp = BLL.CNProfessionalService.GetCNProfessional(item.CNProfessionalId); + if (cnp != null) + { + proName = cnp.ProfessionalName; + } + cell.SetCellValue(proName);//专业 + + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PlanCode);//编号 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PlanName);//检验试验计划名称 + + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ApprovalDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ApprovalDate) : "");//审批日期 + + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ApprovalMan);//审批人 + + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.AuditMan);//审核人 + + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.designer.cs index 1452997b..2d81c6a1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.designer.cs @@ -111,6 +111,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnImport; + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanDataIn.aspx.cs index 493d6f11..33ab05e9 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanDataIn.aspx.cs @@ -170,7 +170,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString().Trim(); if (!string.IsNullOrEmpty(row0)) @@ -195,6 +195,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive result += (i + 2).ToString() + "," + "专业名称" + "," + "[" + row1 + "]不存在！" + "|"; } } + else + { + result += (i + 2).ToString() + "," + "专业名称" + "," + "此项为必填项！" + "|"; + } string row2 = pds.Rows[i][2].ToString(); if (string.IsNullOrEmpty(row2)) @@ -220,6 +224,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int t = Convert.ToInt32(row7); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row7 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -363,9 +378,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive var oldViewInfos = from x in Funs.DB.Inspection_Test_Plan where x.ProjectId == this.CurrUser.LoginProjectId select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { - var oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][7].ToString().Trim()).FirstOrDefault(); + var oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == Funs.GetNewInt(pds.Rows[i][7].ToString().Trim())).FirstOrDefault(); if (oldViewInfo == null) { Model.Inspection_Test_Plan Ins = new Model.Inspection_Test_Plan(); @@ -384,7 +399,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.ApprovalDate = Funs.GetNewDateTime(pds.Rows[i][4].ToString().Trim()); Ins.AuditMan = pds.Rows[i][5].ToString().Trim(); Ins.ApprovalMan= pds.Rows[i][6].ToString().Trim(); - Ins.RemarkCode= pds.Rows[i][7].ToString().Trim(); + Ins.RemarkCode= Funs.GetNewInt(pds.Rows[i][7].ToString().Trim()); Ins.CreateMan = this.CurrUser.UserId; Ins.CreateDate = DateTime.Now; BLL.InspectionTestPlanService.Insert(Ins); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx index b1dc5644..6345b696 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx @@ -39,7 +39,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.cs index 956c07f0..5acb22a7 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.cs @@ -61,6 +61,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtAuditMan.Text = model.AuditMan; this.txtApprovalMan.Text = model.ApprovalMan; this.txtRemarks.Text = model.Remarks; + this.txtRemarkCode.Text = model.RemarkCode.HasValue ? model.RemarkCode.ToString() : ""; } else { @@ -104,6 +105,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Inspection_Test_Plan.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.Id != this.Id || (this.Id == null && x.Id != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } var majorPlanApproval = new Model.Inspection_Test_Plan(); majorPlanApproval.ProjectId = this.CurrUser.LoginProjectId; if (this.drpUnitId.SelectedValue != BLL.Const._Null) @@ -124,7 +131,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive majorPlanApproval.AuditMan = this.txtAuditMan.Text.Trim(); majorPlanApproval.ApprovalMan = this.txtApprovalMan.Text.Trim(); majorPlanApproval.Remarks = this.txtRemarks.Text.Trim(); - + majorPlanApproval.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.Id)) { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.designer.cs index 006a5798..f3aafdd2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class InspectionTestPlanEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class InspectionTestPlanEdit { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpUnitId 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// drpCNProfessionalId 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// txtPlanCode 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPlanCode; - + /// /// txtPlanName 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPlanName; - + /// /// txtApprovalDate 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtApprovalDate; - + /// /// txtAuditMan 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtAuditMan; - + /// /// txtApprovalMan 控件。 /// @@ -103,16 +101,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApprovalMan; - + /// - /// Label13 控件。 + /// txtRemarkCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label13; - + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// txtRemarks 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemarks; - + /// /// Panel2 控件。 /// @@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -139,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -148,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// Toolbar1 控件。 /// @@ -157,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -166,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -175,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx index 2d658334..a21337d8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx @@ -15,7 +15,7 @@ @@ -34,6 +34,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs index 5403d302..3e65c307 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; namespace FineUIPro.Web.Comprehensive @@ -34,7 +35,7 @@ namespace FineUIPro.Web.Comprehensive string strSql = @"select MajorPlanApprovalId, ProjectId, PlanCode, PlanName, ReviewMan, ApprovalDate, AuditMan, ApprovalMan, ImplementationDeviation, AttachUrl, CompileMan, CompileDate, UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,C.UnitId,u.UnitName , - case IsReview when 1 then '是' else '否' end as IsReview + case IsReview when 1 then '是' else '否' end as IsReview,C.RemarkCode from Comprehensive_MajorPlanApproval C left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId left join Base_Unit as u on u.UnitId = C.UnitId @@ -272,5 +273,169 @@ namespace FineUIPro.Web.Comprehensive PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("MajorPlanApprovalDataIn.aspx", "导入 - "))); } #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.MajorPlanApprovalTemplateUrl; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; + + var lists = (from x in Funs.DB.Comprehensive_MajorPlanApproval + where x.ProjectId == this.CurrUser.LoginProjectId + select x); + if (sdrpUnitId.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.UnitId == sdrpUnitId.SelectedValue); + } + if (drpCNPr.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.CNProfessionalId == drpCNPr.SelectedValue); + } + if (!string.IsNullOrEmpty(this.txtPlanName.Text.Trim())) + { + lists = lists.Where(x => x.PlanName.Contains(this.txtPlanName.Text.Trim())); + } + lists = lists.OrderBy(x => x.RemarkCode); + if (lists != null) + { + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("超过一定规模的危大施工方案导入模板", "超过一定规模的危大施工方案（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle(); + cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font0 = workbook.CreateFont(); + font0.FontHeightInPoints = 12; + font0.IsBold = true; + cellStyle0.SetFont(font0); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 2; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + string unitName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitId)) + { + unitName = BLL.UnitService.GetUnitNameByUnitId(item.UnitId); + } + cell.SetCellValue(unitName);//报批单位 + + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + string proName = string.Empty; + var cnp = BLL.CNProfessionalService.GetCNProfessional(item.CNProfessionalId); + if (cnp != null) + { + proName = cnp.ProfessionalName; + } + cell.SetCellValue(proName);//专业 + + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + string unitWorkName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitWorkId)) + { + unitWorkName = ConvertUnitWork(item.UnitWorkId); + } + cell.SetCellValue(unitWorkName);//单位工程 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PlanCode);//编号 + + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PlanName);//方案名称 + + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ReviewMan);//评审人员 + + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ApprovalDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ApprovalDate) : "");//审批日期 + + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.AuditMan);//审核人 + + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ApprovalMan);//批准人 + + cell = row.CreateCell(9); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ExpertReviewMan);//专家评审人员 + + cell = row.CreateCell(10); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.IsReview == true ? "是" : "否");//是否通过专家评审 + + cell = row.CreateCell(11); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.designer.cs index 6c0b02fa..2b9c7008 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.designer.cs @@ -111,6 +111,15 @@ namespace FineUIPro.Web.Comprehensive { /// protected global::FineUIPro.Button btnImport; + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx.cs index 39113f7c..976e4f5b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx.cs @@ -178,7 +178,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); if (string.IsNullOrEmpty(row0)) @@ -400,13 +400,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_MajorPlanApproval oldViewInfo = new Model.Comprehensive_MajorPlanApproval(); string row0 = pds.Rows[i][0].ToString().Trim(); string row1 = pds.Rows[i][1].ToString().Trim(); var cn = cns.Where(y => y.ProfessionalName == row1).FirstOrDefault(); - oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][11].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == Funs.GetNewInt(pds.Rows[i][11].ToString().Trim()) ).FirstOrDefault(); if (oldViewInfo == null) { @@ -427,7 +427,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive des.ApprovalMan = pds.Rows[i][8].ToString().Trim(); des.ExpertReviewMan = pds.Rows[i][9].ToString().Trim(); des.IsReview = pds.Rows[i][10].ToString().Trim() == "是" ? true : false; - des.RemarkCode = pds.Rows[i][11].ToString().Trim(); + des.RemarkCode = Funs.GetNewInt(pds.Rows[i][11].ToString().Trim()); des.CompileMan = this.CurrUser.UserId; des.CompileDate = DateTime.Now; BLL.MajorPlanApprovalService.AddMajorPlanApproval(des); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx index 62c7633e..2df44ca1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx @@ -53,8 +53,8 @@ - - + + <%----%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs index e620735c..cd64a4e1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs @@ -66,7 +66,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtApprovalMan.Text = majorPlanApproval.ApprovalMan; //this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation; this.txtExpertReviewMan.Text = majorPlanApproval.ExpertReviewMan; - + this.txtRemarkCode.Text = majorPlanApproval.RemarkCode.HasValue ? majorPlanApproval.RemarkCode.ToString() : ""; this.rblIsReview.SelectedValue = majorPlanApproval.IsReview.HasValue && majorPlanApproval.IsReview == true ? "true" : "false"; } else @@ -90,6 +90,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_MajorPlanApproval.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.MajorPlanApprovalId != this.MajorPlanApprovalId || (this.MajorPlanApprovalId == null && x.MajorPlanApprovalId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_MajorPlanApproval majorPlanApproval = new Model.Comprehensive_MajorPlanApproval(); majorPlanApproval.ProjectId = this.CurrUser.LoginProjectId; if (this.drpUnitId.SelectedValue != BLL.Const._Null) @@ -131,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { majorPlanApproval.IsReview = false; } - + majorPlanApproval.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.MajorPlanApprovalId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs index 800e451c..829af817 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class MajorPlanApprovalEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class MajorPlanApprovalEdit { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpUnitId 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// drpCNProfessionalId 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// drpUnitWorkIds 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWorkIds; - + /// /// txtPlanCode 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPlanCode; - + /// /// txtPlanName 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPlanName; - + /// /// txtReviewMan 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtReviewMan; - + /// /// txtApprovalDate 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtApprovalDate; - + /// /// txtAuditMan 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtAuditMan; - + /// /// txtApprovalMan 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApprovalMan; - + /// /// txtExpertReviewMan 控件。 /// @@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtExpertReviewMan; - + /// /// rblIsReview 控件。 /// @@ -139,7 +137,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsReview; - + + /// + /// txtRemarkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// Panel2 控件。 /// @@ -148,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// Toolbar1 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx index a6024155..e9c8a125 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx @@ -15,7 +15,7 @@ @@ -34,6 +34,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs index 717d0d45..e2034bc8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; @@ -30,7 +31,7 @@ namespace FineUIPro.Web.Comprehensive { string strSql = @"select NCRManagementId, ProjectId, SendUnit, NCRCode, Contents,Problem,Measure,IssuedDate, ReceiveUnit,Status, ClosedDate, CompleteDate, ResponsibleMan, AttachUrl, ImplementationFrontState, - CompileMan, UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName + CompileMan, UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName,C.RemarkCode from Comprehensive_NCRManagement C left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId left join Base_Unit u on u.UnitId = C.SendUnit @@ -245,6 +246,35 @@ namespace FineUIPro.Web.Comprehensive return ""; } } + + public static string ConvertState(object Status) + { + if (Status != null) + { + if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile) + { + return "重报"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect) + { + return "驳回"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile) + { + return "编制"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit) + { + return "待审批"; + } + else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete) + { + return "审批完成"; + } + } + + return "编制"; + } #endregion #region 导入 @@ -299,33 +329,186 @@ namespace FineUIPro.Web.Comprehensive } #endregion - public static string ConvertState(object Status) + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) { - if (Status != null) - { - if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile) - { - return "重报"; - } - else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect) - { - return "驳回"; - } - else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile) - { - return "编制"; - } - else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit) - { - return "待审批"; - } - else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete) - { - return "审批完成"; - } - } + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.NCRManagementDataInUrl; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; - return "编制"; + var lists = (from x in Funs.DB.Comprehensive_NCRManagement + where x.ProjectId == this.CurrUser.LoginProjectId + select x); + if (sdrpUnitId.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.SendUnit == sdrpUnitId.SelectedValue); + } + if (this.drpProfessionalId.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.CNProfessionalId == drpProfessionalId.SelectedValue); + } + if (!string.IsNullOrEmpty(this.txtNCRCode.Text.Trim())) + { + lists = lists.Where(x => x.NCRCode.Contains(this.txtNCRCode.Text.Trim())); + } + lists = lists.OrderBy(x => x.RemarkCode); + if (lists != null) + { + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("NCR管理导入模板", "NCR管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle(); + cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font0 = workbook.CreateFont(); + font0.FontHeightInPoints = 12; + font0.IsBold = true; + cellStyle0.SetFont(font0); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 2; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + string unitName = string.Empty; + if (!string.IsNullOrEmpty(item.SendUnit)) + { + unitName = BLL.UnitService.GetUnitNameByUnitId(item.SendUnit); + } + cell.SetCellValue(unitName);//发出单位 + + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + string proName = string.Empty; + var cnp = BLL.CNProfessionalService.GetCNProfessional(item.CNProfessionalId); + if (cnp != null) + { + proName = cnp.ProfessionalName; + } + cell.SetCellValue(proName);//专业 + + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.NCRCode);//NCR单号 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Contents);//主要内容 + + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期 + + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Problem);//问题类别 + + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Measure);//改进措施 + + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + string unitWorkName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitWorkId)) + { + unitWorkName = ConvertUnitWork(item.UnitWorkId); + } + cell.SetCellValue(unitWorkName);//单位工程 + + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; + string receiveUnitName = string.Empty; + if (!string.IsNullOrEmpty(item.ReceiveUnit)) + { + receiveUnitName = ConvertCarryUnit(item.ReceiveUnit); + } + cell.SetCellValue(receiveUnitName);//接收单位 + + cell = row.CreateCell(9); + cell.CellStyle = cellStyle; + string state = string.Empty; + if (!string.IsNullOrEmpty(item.ImplementationFrontState)) + { + state = item.ImplementationFrontState; + } + cell.SetCellValue(state);//实施状态 + + cell = row.CreateCell(10); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ResponsibleMan);//责任人 + + cell = row.CreateCell(11); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ClosedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ClosedDate) : "");//要求封闭日期 + + cell = row.CreateCell(12); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//完成日期 + + cell = row.CreateCell(13); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.designer.cs index dab173ea..4b7b49c1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.Comprehensive -{ - - - public partial class NCRManagement - { - +namespace FineUIPro.Web.Comprehensive { + + + public partial class NCRManagement { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// ToolSearch 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar ToolSearch; - + /// /// sdrpUnitId 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList sdrpUnitId; - + /// /// drpProfessionalId 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProfessionalId; - + /// /// txtNCRCode 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtNCRCode; - + /// /// btnSearch 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// btnNew 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnImport 控件。 /// @@ -112,7 +110,16 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnImport; - + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// @@ -121,7 +128,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - + /// /// Label2 控件。 /// @@ -130,7 +137,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label2; - + /// /// Label3 控件。 /// @@ -139,7 +146,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label3; - + /// /// txtStatus 控件。 /// @@ -148,7 +155,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label txtStatus; - + /// /// lbtnFileUrl 控件。 /// @@ -157,7 +164,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl; - + /// /// ToolbarText1 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window2; - + /// /// WindowAtt 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; - + /// /// Menu1 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuModify 控件。 /// @@ -220,7 +227,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuModify; - + /// /// btnMenuDel 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs index e82972b2..645fc344 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs @@ -178,7 +178,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); if (string.IsNullOrEmpty(row0)) @@ -304,6 +304,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int t = Convert.ToInt32(row13); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row13 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -453,13 +464,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_NCRManagement oldViewInfo = new Model.Comprehensive_NCRManagement(); string row0 = pds.Rows[i][0].ToString().Trim(); string row1 = pds.Rows[i][1].ToString().Trim(); var cn = cns.Where(y => y.ProfessionalName == row1).FirstOrDefault(); - oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][13].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt( pds.Rows[i][13].ToString().Trim()) ).FirstOrDefault(); if (oldViewInfo == null) { @@ -495,7 +506,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { des.CompleteDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim()); } - des.RemarkCode = pds.Rows[i][13].ToString().Trim(); + des.RemarkCode = Funs.GetNewInt(pds.Rows[i][13].ToString().Trim()); des.Status = BLL.Const.Comprehensive_Compile; des.CompileMan = this.CurrUser.UserId; BLL.NCRManagementService.AddNCRManagement(des); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx index bd1f658c..15914813 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx @@ -27,12 +27,6 @@ - - - - - - @@ -43,7 +37,13 @@ - + + + + + + + @@ -51,8 +51,6 @@ - - @@ -64,8 +62,7 @@ - - + @@ -94,12 +91,9 @@ - + - - - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs index f2b305c4..b6763aba 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs @@ -84,7 +84,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.ddlProblem.SelectedValue = nCRManagement.Problem; } this.txtMeasure.Text = nCRManagement.Measure; - + this.txtRemarkCode.Text = nCRManagement.RemarkCode.HasValue ? nCRManagement.RemarkCode.ToString() : ""; this.txtResponsibleMan.Text = nCRManagement.ResponsibleMan; //this.txtImplementationFrontState.Text = nCRManagement.ImplementationFrontState; @@ -153,6 +153,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpAudit.Readonly = true; this.ddlProblem.Readonly = true; //this.btnAttach.Enabled = false; + this.txtRemarkCode.Readonly = true; } @@ -199,6 +200,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + + var q = Funs.DB.Comprehensive_NCRManagement.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.NCRManagementId != this.NCRManagementId || (this.NCRManagementId == null && x.NCRManagementId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_NCRManagement nCRManagement = new Model.Comprehensive_NCRManagement(); nCRManagement.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) @@ -264,6 +272,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); } nCRManagement.ReceiveUnit = unitIds; + nCRManagement.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.NCRManagementId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) @@ -318,6 +327,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_NCRManagement.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.NCRManagementId != this.NCRManagementId || (this.NCRManagementId == null && x.NCRManagementId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_NCRManagement nCRManagement = new Model.Comprehensive_NCRManagement(); nCRManagement.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs index 9d5d8213..90068363 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs @@ -75,15 +75,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.DatePicker txtIssuedDate; - /// - /// txtContents 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtContents; - /// /// ddlProblem 控件。 /// @@ -93,6 +84,24 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.DropDownList ddlProblem; + /// + /// txtRemarkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtRemarkCode; + + /// + /// txtContents 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtContents; + /// /// txtMeasure 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx index a3559007..40e52253 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx @@ -16,7 +16,7 @@ @@ -32,6 +32,9 @@ + + @@ -96,7 +99,7 @@ + + + + LabelAlign="Right" LabelWidth="150px"> @@ -52,13 +58,12 @@ - - + + LabelAlign="Right" LabelWidth="180px"> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs index 29c7c7ae..65d06056 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs @@ -63,7 +63,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.txtReportTime.Text = string.Format("{0:yyyy-MM-dd}", pressurePipe.ReportTime); } - + this.txtRemarkCode.Text = pressurePipe.RemarkCode.HasValue ? pressurePipe.RemarkCode.ToString() : ""; var currApprove = PressurePipeApproveService.GetCurrentApprove(pressurePipe.PressurePipeId); if (currApprove != null) { @@ -119,6 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtPressurePipeNumber.Readonly = true; this.drpUnit.Readonly = true; this.txtReportTime.Readonly = true; + this.txtRemarkCode.Readonly = true; this.drpAudit.Readonly = true; @@ -163,6 +164,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择所属单位！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_PressurePipe.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.PressurePipeId != this.PressurePipeId || (this.PressurePipeId == null && x.PressurePipeId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } + Model.Comprehensive_PressurePipe pressurePipe = new Model.Comprehensive_PressurePipe(); pressurePipe.Projctid = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) @@ -201,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { pressurePipe.ReportTime = Convert.ToDateTime(this.txtReportTime.Text); } - + pressurePipe.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.PressurePipeId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) @@ -242,6 +250,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择所属单位！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_PressurePipe.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.PressurePipeId != this.PressurePipeId || (this.PressurePipeId == null && x.PressurePipeId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_PressurePipe pressurePipe = new Model.Comprehensive_PressurePipe(); pressurePipe.Projctid = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) @@ -280,6 +294,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { pressurePipe.ReportTime = Convert.ToDateTime(this.txtReportTime.Text); } + pressurePipe.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.PressurePipeId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs index c04b9621..4d4422cf 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class PressurePipeEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class PressurePipeEdit { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpUnit 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// txtEstimateNumber 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtEstimateNumber; - + /// /// txtActualNumber 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtActualNumber; - + /// /// txtPackageNumber 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtPackageNumber; - + /// /// txtCompletePackageNumber 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtCompletePackageNumber; - + /// /// txtPressurePipeNumber 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtPressurePipeNumber; - + /// /// txtIssuedReportNumber 控件。 /// @@ -103,7 +101,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtIssuedReportNumber; - + + /// + /// txtRemarkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// Panel2 控件。 /// @@ -112,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -121,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -130,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// drpAudit 控件。 /// @@ -139,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAudit; - + /// /// txtReportTime 控件。 /// @@ -148,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtReportTime; - + /// /// agree 控件。 /// @@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow agree; - + /// /// rblIsAgree 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsAgree; - + /// /// options 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow options; - + /// /// txtidea 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtidea; - + /// /// Toolbar1 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -220,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx index 6d0745cd..7c73a7f9 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx @@ -15,7 +15,7 @@ @@ -27,6 +27,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs index 4fd7892f..6cd67ae8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; namespace FineUIPro.Web.Comprehensive @@ -31,7 +32,7 @@ namespace FineUIPro.Web.Comprehensive { string strSql = @"select QualityAccidentId, time, Place, DirectEconomicLoss, RemedialMeasures,Status, ResponsibilityDetermination, CorrectiveActions, AttachUrl, CompileMan, CompileDate, - UnitWorkId,U.UnitName + UnitWorkId,U.UnitName,C.RemarkCode from Comprehensive_QualityAccident C left join Base_Unit U on C.UnitId=U.UnitId where C.ProjectId = @ProjectId"; @@ -282,5 +283,139 @@ namespace FineUIPro.Web.Comprehensive PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("QualityAccidentDataIn.aspx", "导入 - "))); } #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.QualityAccidentTemplateUrl; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; + + var lists = (from x in Funs.DB.Comprehensive_QualityAccident + where x.ProjectId == this.CurrUser.LoginProjectId + select x); + lists = lists.OrderBy(x => x.RemarkCode); + if (lists != null) + { + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("质量事故处理记录导入模板", "质量事故处理记录（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle(); + cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font0 = workbook.CreateFont(); + font0.FontHeightInPoints = 12; + font0.IsBold = true; + cellStyle0.SetFont(font0); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 2; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + string unitName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitId)) + { + unitName = BLL.UnitService.GetUnitNameByUnitId(item.UnitId); + } + cell.SetCellValue(unitName);//责任单位 + + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + string unitWorkName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitWorkId)) + { + unitWorkName = ConvertUnitWork(item.UnitWorkId); + } + cell.SetCellValue(unitWorkName);//单位工程 + + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Time.HasValue ? string.Format("{0:yyyy-MM-dd}",item.Time) : "");//时间 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Place);//地点 + + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.DirectEconomicLoss);//直接经济损失(估计)原因及性质 + + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemedialMeasures);//采取补救措施 + + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ResponsibilityDetermination);//事故责任认定 + + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.CorrectiveActions);//最终整改措施 + + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.designer.cs index fc0f5cbd..ebe584ce 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.designer.cs @@ -75,6 +75,15 @@ namespace FineUIPro.Web.Comprehensive { /// protected global::FineUIPro.Button btnImport; + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.cs index 6f1406ba..59f0caad 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.cs @@ -176,7 +176,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); if (string.IsNullOrEmpty(row0)) @@ -224,6 +224,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int t = Convert.ToInt32(row8); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row8 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -371,11 +382,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_QualityAccident oldViewInfo = new Model.Comprehensive_QualityAccident(); string row0 = pds.Rows[i][0].ToString().Trim(); - oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][8].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][8].ToString().Trim()) ).FirstOrDefault(); if (oldViewInfo == null) { @@ -393,7 +404,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive des.RemedialMeasures = pds.Rows[i][5].ToString().Trim(); des.ResponsibilityDetermination =pds.Rows[i][6].ToString().Trim(); des.CorrectiveActions = pds.Rows[i][7].ToString().Trim(); - des.RemarkCode = pds.Rows[i][8].ToString().Trim(); + des.RemarkCode = Funs.GetNewInt(pds.Rows[i][8].ToString().Trim()); des.CompileMan = this.CurrUser.UserId; des.CompileDate = DateTime.Now; des.Status = BLL.Const.Comprehensive_Compile; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx index f311f291..b8b6fcfd 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx @@ -58,6 +58,7 @@ + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs index 2abfd6c8..7c08b396 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs @@ -60,7 +60,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.drpUnitWorkId.SelectedValueArray = pressurePipe.UnitWorkId.Split(','); } - + this.txtRemarkCode.Text = pressurePipe.RemarkCode.HasValue ? pressurePipe.RemarkCode.ToString() : ""; var currApprove = QualityAccidentApproveService.GetCurrentApprove(pressurePipe.QualityAccidentId); if (currApprove != null) { @@ -114,7 +114,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtTime.Readonly = true; this.drpUnit.Readonly = true; this.drpUnitWorkId.Readonly = true; - this.drpAudit.Readonly = true; + this.drpAudit.Readonly = true; + this.txtRemarkCode.Readonly = true; //this.btnAttach.Enabled = false; } @@ -151,6 +152,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive { if (drpUnit.SelectedValue != BLL.Const._Null) { + var q = Funs.DB.Comprehensive_QualityAccident.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.QualityAccidentId != this.QualityAccidentId || (this.QualityAccidentId == null && x.QualityAccidentId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_QualityAccident pressurePipe = new Model.Comprehensive_QualityAccident(); pressurePipe.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) @@ -182,6 +189,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive ids = ids.Substring(0, ids.LastIndexOf(",")); } pressurePipe.UnitWorkId = ids; + pressurePipe.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.QualityAccidentId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) @@ -224,6 +232,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive { if (drpUnit.SelectedValue != BLL.Const._Null) { + var q = Funs.DB.Comprehensive_QualityAccident.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.QualityAccidentId != this.QualityAccidentId || (this.QualityAccidentId == null && x.QualityAccidentId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_QualityAccident pressurePipe = new Model.Comprehensive_QualityAccident(); pressurePipe.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) @@ -255,6 +269,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive ids = ids.Substring(0, ids.LastIndexOf(",")); } pressurePipe.UnitWorkId = ids; + pressurePipe.RemarkCode =Funs.GetNewInt( this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.QualityAccidentId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.designer.cs index ff9a189a..be16d369 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class QualityAccidentEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class QualityAccidentEdit { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpUnit 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// drpUnitWorkId 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWorkId; - + /// /// txtTime 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtTime; - + /// /// txtPlace 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPlace; - + /// /// txtDirectEconomicLoss 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtDirectEconomicLoss; - + /// /// txtRemedialMeasures 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemedialMeasures; - + /// /// txtResponsibilityDetermination 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtResponsibilityDetermination; - + /// /// txtCorrectiveActions 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtCorrectiveActions; - + /// /// Panel2 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -139,7 +137,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + + /// + /// txtRemarkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// drpAudit 控件。 /// @@ -148,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAudit; - + /// /// agree 控件。 /// @@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow agree; - + /// /// rblIsAgree 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsAgree; - + /// /// options 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow options; - + /// /// txtidea 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtidea; - + /// /// Toolbar1 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ToolbarFill1 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// hdAttachUrl 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -220,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -229,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx index 47d044d9..26762a84 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx @@ -15,7 +15,7 @@ @@ -31,6 +31,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs index e2270f9f..7ea4448c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; namespace FineUIPro.Web.CQMS.Comprehensive @@ -325,5 +326,145 @@ namespace FineUIPro.Web.CQMS.Comprehensive PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("ReviewDrawingsDataIn.aspx", "导入 - "))); } #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.ReviewDrawingsTemplateUrl; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; + + var lists = (from x in Funs.DB.Comprehensive_ReviewDrawings + where x.ProjectId == this.CurrUser.LoginProjectId + select x); + if (sdrpCNProfessionalId.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.CNProfessionalId == sdrpCNProfessionalId.SelectedValue); + } + if (!string.IsNullOrEmpty(this.txtDraCode.Text.Trim())) + { + lists = lists.Where(x => x.DraCode.Contains(this.txtDraCode.Text.Trim())); + } + lists = lists.OrderBy(x => x.RemarkCode); + if (lists != null) + { + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("图纸会审管理导入模板", "图纸会审管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle(); + cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font0 = workbook.CreateFont(); + font0.FontHeightInPoints = 12; + font0.IsBold = true; + cellStyle0.SetFont(font0); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 2; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + string proName = string.Empty; + var cnp = BLL.CNProfessionalService.GetCNProfessional(item.CNProfessionalId); + if (cnp != null) + { + proName = cnp.ProfessionalName; + } + cell.SetCellValue(proName);//专业 + + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.DraCode);//编号 + + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + string unitWorkName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitWorkId)) + { + unitWorkName = ConvertUnitWork(item.UnitWorkId); + } + cell.SetCellValue(unitWorkName);//单位工程 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ReviewDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ReviewDate) : "");//图纸会审日期 + + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + string unitName = string.Empty; + if (!string.IsNullOrEmpty(item.ReceiveUnits)) + { + unitName = ConvertCarryUnit(item.ReceiveUnits); + } + cell.SetCellValue(unitName);//参加单位 + + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Remarks);//备注 + + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.designer.cs index 9aef1198..2cbd88d4 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.designer.cs @@ -102,6 +102,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnImport; + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataIn.aspx.cs index 3ff71672..7a8a273c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataIn.aspx.cs @@ -178,7 +178,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); if (string.IsNullOrEmpty(row0)) @@ -250,6 +250,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int t = Convert.ToInt32(row6); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row6 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -399,12 +410,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive && x.SuperUnitWork == null select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { Model.Comprehensive_ReviewDrawings oldViewInfo = new Model.Comprehensive_ReviewDrawings(); string row0 = pds.Rows[i][0].ToString().Trim(); var cn = cns.Where(y => y.ProfessionalName == row0).FirstOrDefault(); - oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][6].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == Funs.GetNewInt(pds.Rows[i][6].ToString().Trim()) ).FirstOrDefault(); if (oldViewInfo == null) { @@ -426,7 +437,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive des.ReceiveUnits = BLL.UnitService.GetUnitIds(pds.Rows[i][4].ToString().Trim()); } des.Remarks = pds.Rows[i][5].ToString().Trim(); - des.RemarkCode = pds.Rows[i][6].ToString().Trim(); + des.RemarkCode = Funs.GetNewInt(pds.Rows[i][6].ToString().Trim()); des.CreateMan = this.CurrUser.UserId; des.CreateDate = DateTime.Now; des.Status = BLL.Const.Comprehensive_Compile; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx index ae1e621e..4b112c3e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx @@ -30,7 +30,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs index 41d86e4b..f63213ef 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs @@ -67,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpUnitIds.SelectedValueArray = model.ReceiveUnits.Split(','); } this.txtRemarks.Text = model.Remarks; - + this.txtRemarkCode.Text = model.RemarkCode.HasValue ? model.RemarkCode.ToString() : ""; var currApprove = DesignDrawingsApproveService.GetCurrentApprove(model.Id); if (currApprove != null) @@ -122,6 +122,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtRemarks.Readonly = true; this.txtReviewDate.Readonly = true; this.drpAudit.Readonly = true; + this.txtRemarkCode.Readonly = true; //this.btnAttach.Enabled = false; } @@ -206,13 +207,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// protected void btnSave_Click(object sender, EventArgs e) { - if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) { Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } - + var q = Funs.DB.Comprehensive_ReviewDrawings.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.Id != this.Id || (this.Id == null && x.Id != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } var designDrawings = new Model.Comprehensive_ReviewDrawings(); designDrawings.ProjectId = this.CurrUser.LoginProjectId; designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; @@ -248,6 +253,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); } designDrawings.ReceiveUnits = unitIds; + designDrawings.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (!string.IsNullOrEmpty(this.Id)) { designDrawings.Id = this.Id; @@ -287,6 +293,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_ReviewDrawings.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.Id != this.Id || (this.Id == null && x.Id != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } var designDrawings = new Model.Comprehensive_ReviewDrawings(); designDrawings.ProjectId = this.CurrUser.LoginProjectId; designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; @@ -322,6 +334,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); } designDrawings.ReceiveUnits = unitIds; + designDrawings.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (!string.IsNullOrEmpty(this.Id)) { designDrawings.Id = this.Id; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs index 63a5870b..92c09c70 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class ReviewDrawingsEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class ReviewDrawingsEdit { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpCNProfessionalId 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// drpUnitWorkIds 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWorkIds; - + /// /// txtDraCode 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtDraCode; - + /// /// txtReviewDate 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtReviewDate; - + /// /// drpUnitIds 控件。 /// @@ -85,7 +83,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitIds; - + + /// + /// txtRemarkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// txtRemarks 控件。 /// @@ -94,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemarks; - + /// /// Panel2 控件。 /// @@ -103,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -112,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -121,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// drpAudit 控件。 /// @@ -130,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAudit; - + /// /// agree 控件。 /// @@ -139,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow agree; - + /// /// rblIsAgree 控件。 /// @@ -148,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsAgree; - + /// /// options 控件。 /// @@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow options; - + /// /// txtidea 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtidea; - + /// /// Toolbar1 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx index be81e641..045cfaf7 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx @@ -15,7 +15,7 @@ diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs index 836026be..ac6399c2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs @@ -33,7 +33,7 @@ namespace FineUIPro.Web.Comprehensive { string strSql = @"select VisaId,VisaCode, VisaReson, VisaDate, Status, EstimatedCost, Confirmation, ConstructionManager, ControlManager, ProcessingState, - AccountingExpenses,VisaContent, Remark, U.UnitName,CN.ProfessionalName ,SignMan,AuditMan,unitWork.UnitWorkName + AccountingExpenses,VisaContent, Remark, U.UnitName,CN.ProfessionalName ,SignMan,AuditMan,unitWork.UnitWorkName,C.RemarkCode from Comprehensive_SiteVisaManagement C left join Base_Unit U on C.UnitId=U.UnitId left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId @@ -310,7 +310,7 @@ namespace FineUIPro.Web.Comprehensive lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("现场签证管理导入模板", "现场签证管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx index 4047a127..409872a4 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx @@ -16,7 +16,7 @@ @@ -34,6 +34,9 @@ + + @@ -98,7 +101,7 @@ - + + + + + + x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.SpecialEquipmentId != this.SpecialEquipmentId || (this.SpecialEquipmentId == null && x.SpecialEquipmentId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_SpecialEquipment specialEquipment = new Model.Comprehensive_SpecialEquipment(); specialEquipment.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) @@ -202,7 +210,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive specialEquipment.ReportTime = Convert.ToDateTime(this.txtReportTime.Text); } specialEquipment.PositionNum = this.txtPositionNum.Text.Trim(); - + specialEquipment.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.SpecialEquipmentId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) @@ -242,6 +250,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择所属单位！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_SpecialEquipment.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.SpecialEquipmentId != this.SpecialEquipmentId || (this.SpecialEquipmentId == null && x.SpecialEquipmentId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_SpecialEquipment specialEquipment = new Model.Comprehensive_SpecialEquipment(); specialEquipment.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) @@ -277,6 +291,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive specialEquipment.ReportTime = Convert.ToDateTime(this.txtReportTime.Text); } specialEquipment.PositionNum = this.txtPositionNum.Text.Trim(); + specialEquipment.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.SpecialEquipmentId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs index 511ab4a8..fbaea3d8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs @@ -102,6 +102,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.TextBox txtPositionNum; + /// + /// txtRemarkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// Panel2 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx index a56facd0..fc76935c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx @@ -15,7 +15,7 @@ diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs index c5f50b58..173e9d12 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs @@ -43,7 +43,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive C.Hours, C.KeynoteSpeaker, C.Remark, - CN.ProfessionalName" + CN.ProfessionalName, + C.RemarkCode" + @" FROM Comprehensive_TrainingRecords C " + @" LEFT JOIN Base_CNProfessional CN ON C.CNProfessionalId=CN.CNProfessionalId" + @" WHERE C.ProjectId = @ProjectId"; @@ -231,7 +232,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { - string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); newUrl = uploadfilepath.Replace("培训记录导入模板", "培训记录（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index cf907db2..bdfcd93c 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -85,3 +85,193 @@ IP地址:::1 出错时间:04/29/2024 23:41:10 + +错误信息开始=====> +错误类型:IOException +错误信息:文件“E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\File\Excel\DataIn\设计交底管理导入模板.xls”已经存在。 +错误堆栈: + 在 System.IO.__Error.WinIOError(Int32 errorCode, String maybeFullPath) + 在 System.IO.File.InternalCopy(String sourceFileName, String destFileName, Boolean overwrite, Boolean checkHost) + 在 System.IO.File.Copy(String sourceFileName, String destFileName) + 在 FineUIPro.Web.Comprehensive.DesignDetails.btnOut_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\DesignDetails.aspx.cs:行号 342 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:04/30/2024 10:12:33 +出错文件:http://localhost:8579/CQMS/Comprehensive/DesignDetails.aspx +IP地址:::1 +操作人员:JT + +出错时间:04/30/2024 10:12:33 + + +错误信息开始=====> +错误类型:DirectoryNotFoundException +错误信息:未能找到路径“E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\File\Excel\DataIn\设备材料报验（史丹利新能源材料前驱体磷酸铁项目及配套工程30万吨/年湿法磷酸装置及氨站20240430).xls”的一部分。 +错误堆栈: + 在 System.IO.__Error.WinIOError(Int32 errorCode, String maybeFullPath) + 在 System.IO.File.InternalCopy(String sourceFileName, String destFileName, Boolean overwrite, Boolean checkHost) + 在 System.IO.File.Copy(String sourceFileName, String destFileName) + 在 FineUIPro.Web.Comprehensive.InspectionEquipment.btnOut_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionEquipment.aspx.cs:行号 314 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:04/30/2024 15:20:59 +出错文件:http://localhost:8579/CQMS/Comprehensive/InspectionEquipment.aspx +IP地址:::1 +操作人员:JT + +出错时间:04/30/2024 15:20:59 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204 + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181 +出错时间:04/30/2024 19:18:03 +出错时间:04/30/2024 19:18:03 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228 + 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046 +出错时间:04/30/2024 19:18:03 +出错时间:04/30/2024 19:18:03 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220 + 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942 +出错时间:04/30/2024 19:18:03 +出错时间:04/30/2024 19:18:03 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020 + 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884 +出错时间:04/30/2024 19:18:03 +出错时间:04/30/2024 19:18:03 + + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:e:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\DesignDrawings.aspx(38): error CS1061: “ASP.cqms_comprehensive_designdrawings_aspx”不包含“btnOut_Click”的定义，并且找不到可接受类型为“ASP.cqms_comprehensive_designdrawings_aspx”的第一个参数的扩展方法“btnOut_Click”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:04/30/2024 22:19:41 +出错文件:http://localhost:8579/CQMS/Comprehensive/DesignDrawings.aspx +IP地址:::1 + +出错时间:04/30/2024 22:19:41 + + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:e:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\ReviewDrawings.aspx(34): error CS1061: “ASP.cqms_comprehensive_reviewdrawings_aspx”不包含“btnOut_Click”的定义，并且找不到可接受类型为“ASP.cqms_comprehensive_reviewdrawings_aspx”的第一个参数的扩展方法“btnOut_Click”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:04/30/2024 22:58:46 +出错文件:http://localhost:8579/CQMS/Comprehensive/ReviewDrawings.aspx +IP地址:::1 + +出错时间:04/30/2024 22:58:46 + diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls index 3e1ec99247f18e795fd2389ec1f0c4838162b9b9..0ffdc0289ac8937f4f466456b0bc87736c2ce747 100644 GIT binary patch delta 3104 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 CU9a>2 delta 1271 zcmaJ>Ye*DP6h3!$X4Y|CXLfdVb}e)5MMY4VScc)a8HLpP*n*;mCWvBzLQ;s-`lEy% zi0;V;1U-HP^`nPO^&^ayC<1$fAw)kS=x;v)38b9Popn`Gy34(s?|kQ;^WA&*O!sZp zJ1L3YL2fjH;#Xaj2oqLF^^=sj7ss2~FA> zz&M1-%mPS;zd``A`Hqm9X0P~sL!KcIh#MSMLsc_Ez6Gq}usW6#>rb=e&_HHhI&%Qq zG=t?}fo@=rrsD%mW(Gd<8TgpcS3)7QDZ*L(p>&pqWbh#daYQrF^vR)xT%J=ug!PoI z*QaBuE-bDv2DmC)vq_> z7js=EBl)Y`0AnSnRZP`Ez6t_}aEAWNj4abXhh5+TGiwfu6gQujKms#wj+a4(fgC&> zSr#8ynsS4{JBFUYS)HpBsC#HAus-EvD*PdVe3;IfLJTULT`43G5{OM97a`Xy5($a3 zNFpQ^%|e-=Jd50f=w8n!JGnR&CXN*54o|_T;*k3B}!snjKdD9#wE9?MkeU)?zaHL5BAc n`Yz#Mb!(!|Ow@G9{EjX&EZkjXy{IW;xKR|X%DPc9cAI|zWe6?~ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸会审记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸会审管理导入模板.xls similarity index 77% rename from SGGL/FineUIPro.Web/File/Excel/DataIn/图纸会审记录导入模板.xls rename to SGGL/FineUIPro.Web/File/Excel/DataIn/图纸会审管理导入模板.xls index 8f0c6317977d3b10e9935e767f4640018400f134..d334e6a117e368faafe51462a6d319df50607e8e 100644 GIT binary patch delta 2794 zcmbVOd010d7C-OhB`*oVmj%tDfv^eUf&>tPU=RU=-war_N~xmaR&^@YVG&sZqD3g8 zc&$~d;M%%Xs!?$RqJUJVQ>z1_I98CU+l)hSsc2I&_XT3VX~%!&-tTVbch0%zcklb| zdHFkt`~$?saKh_YL=!>yATF7$bO!(r+&ppXwb^WJ8;a+?ruF0^ViWZz0i^um%Y5EO zc%yWxko1c}ucK~;>LU=ZUhC&cJ3BUefsnwuq(I=4DEpagbJDPqKOrR)v5 zaA6-BVnJ7htpk?}7@%a+ELT$>a{~1fH;k8i|f!>}xR()k>uFXuBU3 zx+<0vj^2jx`(h~_)Q|Z~SZubVN6FYO@V~H1yEWFZW4eAU)h_Mp-K2d!1NyN9DeKed z=uw_jiY!tdmf_u$DjcZ&+)19H!anpZrvcVA`%J0qKyB9{agmXvXg7qw&1G* z5^qMbBW^^0W9M!_Smt8ADL`A^!y}jbK($J@SZ|%097Z0_NvPUjgJ3LYZ5(A+tlBaX z%YLV6yJ>3&v2jvtTr3a-0dsH#+ijQtd>)VHarrb&3j}snZ z4H=^G8s($$7~wf&h;PWS5u*cwf`Z(9bP=K2@KJ$5TGk065C}w0B89WFLhC-nUHi6T zd>f#(nL)w_AMoQ49zaS6j)br^;3EKni^F9j?k@z%p}0JnFAzFmg_B|+2@Z#(I9x78 zVeMRu10~@~-2=w+Wbe$SJw9^L7L@Pidqy3*Fwi*Vn#C(HWyNZNaFAS~RCy2e@g3$D z6g(y*R2McOIwp3aA#T#tY41*-k@#NHy!i_jF8W~cl0T=VXJoF-T2;7a?Z-vyic2=3 z&7W@hZ0ok|d-m?z|HYRF4jwvgI&tz;_31NbFV;6SUTXU0@|Ej#9~W(08hh`r(V8)g#BjHDvO&A4dXuc$hcLI0n=+df>tREPdhqs&_))vMs=)#tMtdo?}#)2otWI{xTq z2s)f;eA>CKqcprB_kKfB`HoIbdC8OTgnN~q=0%CuN2aFpYKmhH-8`u6wd8g`J#}ZV z&&Dj6@m;{mjE0%!vqc|U6TVEktc~%$bLShwZqbFzz`=R&SI7+0H@X#{YCDk>+?!vW zY5F>`v2pLkdLO0t@-Z)c)MH!gV(zcoIO)pu4+mc{mXg`+^V_GXl6R)=dz5iDeb1BX zQ^hHz*+g0H<2#T=H~oC3GWuFj;?`Zw{4hgj`}$mku8F zdD`lwQ{qC^$`#p#uO-P3x=r<&s;+|CmIcb}8tvS)-4nl^N`<-=INN|YGAn*?LYaQR zSF;l;j5nNDU2fS|Hf37$gCZI>mg?voPh5+@mB_4G64Ewq=l+D{Nmmn|jr(rrm@eJ2 z>}RiLyuYhQaW`jVx4fh(q>$He?6O9Ew02&0se13-ai3P(K-7J&>y-_z8M~}?)@5g_ zio@1ctnW~VbZjV!JlDJ|{J{LOafdj(S2fDpw5xFqDlLKM8;Zh8&sNpf2>-nzY5K`& z3w^vxtY`GI&K%uy{Cx1LP7mtJ&YA-J<4;)Zx&S~n_1s{&&X3bdFD{2~gb`ij(KMPp-*$QeSgsxW=_HWol)Q_-Lj1 zu2b3uUdkU@pN!aER;6+8TBPud$QTv>_m?`KA4+^V=l0;vcFPl-EF%2U6cFP9_+}y! z_g1(GY(8L{6A-=AHE=pl1F8fK?0z4&Yz^?zXdqnCL2 za&MezG9u9A@lTO8oKFrEAYQ~WBZ~mANr+G4e+2v7%wfk!g0aikXOD(NyJ9|$<`?Xk zEjT({YT49>-~XsLbpr70I;>r^Ju|Qt1gf~;|BAvO&LI6O zE=wQsY^M+yeIhstzXy3D~fJ z4|h%G5H5nGeJe-@;VFk|78qm)CoeE}QVULyNuo^oZ zgQI4D3xC2*V!<8E!s~(f==m6t%wZ*tLSrkNjc>QbGBj2{+Jnm;HP+B^$2iTtHrt|+zrhVnHzXmm S;d@^G*2DNe)wCsU3H2X)XGKN; delta 1474 zcmaJ=UrZEd5TEbcWsd{7z1_vzyE6@()@bmIrol!ml>-qHHCxCLz?v#CL5UhMQJY#? zj?lDeY+{Tf^3q)O%_kJk@Pw6@M&pC=0X5MF??s;*6JvwmIrA;YA0^$*e*4Y*W`5sq zW_E|Ji=jWo#d?t#|N5Q~pJRy}SpB|GDDblm0M^r^?D6*F;*x$MnC}gDCq|x$wRl$l zMNZV?j6NvN=gyT>$Xqti7Z3rgGF>#xD1K>1MGzY*T=dMkz%;ZGR}?Q0ddCdLLS(%u zgaM|ZnzpL|rmFK$2_epinML%nWsR1PmV>@Upe211=8It@LvjTf0K zu|MpJ)mUY__*>YJ(F*}MOX9JEn31MKr<6_n^aMH1B460jj2e(^RN>Aw^{UHH_$WO!5RcmO$yi;kk zg7*CU{oIT*xk@ymnTX+|YFq4@-z9S!6K|t3zYP;RBJpe;ry3#+eb7ty8TbNzrTN!< zh3z|~p*UUjWzOQ{a9oc_vAPM`xgI4(G_bu>4x^DR0 zPcH`7fY|KKbzb&voPPOT`H#V)ZC6gT|CdhEr^fzB`p5zHCkGnS&pT%h{{2TWLSN)H zeU9a^dzS{sSBh8~kW{CAtfByAR906lRyWp^aRb)}0FrgMefR6KpZQ0i>v09PHJ!}( z?IjpWC3gcL0Ns+`Ln5VoLiv*XqEVU3#{mIY?$bW<&5;Pc8rAAsf-ENTEeTB-U@G6# zU>7inZ|TsaX75`i&yB}q1+d;#-0{X8yhkyG7$EpaZWpZw+xK|4{tawA{ItagocmJdwBdL}Xy6 vtR0?x(3<;fpCwB>vfQ(&0`Byp+#&8G;1Tazyy@i)`2Jp3VkCFvn`8P1Y4kcJ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸收发记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸收发记录导入模板.xls index c2cbc441544c5e5f3f9b425f70ed86b61cad2ca8..ed68a7f4c88b71a1bdd98eb82920bad7fa3f8a12 100644 GIT binary patch delta 3198 zcmbtX2~<;88vbwcl9$!w1uz7N1QEfFC4%gND4WNEf(tq>h`UauQUn1pAS!~mz_Ybl z72MjoRH~>576pM)oh}DQisGoCb)9htE`wUin|l)|tvYAUoVoAZ<@=ZWFYo5vKUup` zR`Rw0q&^YYfRGI<;Kjd$g__f7L;pSB=t%*bNXCw$!5XHh`Sb(2o@PPIB9ISVGldd<>8E01OA2Q_cP$N(P7%PZ3 zAT+v=37-d?2H@e2db*NzpezjbfQ)moWDL;8>39|h9@wP&E(z+2o$bdvx;naaD+gYf zPPBSkNto6+0@L1-RAw!g zTk9R{9Q6Nl4zTzcRNOMQ0XK9OU{i5jbzM&qE72}x_klKyIIjg8Y_ zXO|&EJ-tSG`}q2e9TyrF9uYY{cJh>|)8eMjFwC33VBw<0OO}3^yfP(qRa$z^y7e1! zH|FIRvD-iTc*iF@ckMrL@X%+Ue{uN8$+A}5@lMJdee5lE!Nua(hM4E-kHo{%kB=&TXM9^_d?PAxVEAO zwR^+^{;Io)T_ROUdf^E_LEBlgK^Qb*dZf$t&JFR0!= z?@Y_78D8C4<*8*~#nsmzxLE6~ar$6Xr?b|-`9kRZjoZdwzVg29-^TqHnaC6 z9(e=y_6 z=x3vU*fXl#;JZBI*{f-PDtT#rd-aG8b$+RLj?s_3DNWU$3LV zg0yKHyJZc7kG*bQ=d~nR8=99;s2Z4%IjXfJu)(n<--Wk*Z@-uI8P=!Ib(~(8@}#z^ zVwi3~eL`&UOXcz6>f6%ft-=Y-PloT>QmS)kUu5kVnBp4sw@zQ@Tlp^hbNlhYT^|cl zBdH0p(HIB=(FLT$pXX{63?Sl=2t?2YzknPIkS+z(Jyi#1*XUr>0v$BQ>fozQI+!v? z49FtNCQ3fpm?i->#owN>0yHJ|z36+hr0G4>gZ{4UP5+o7azOOr<~jWhov{*Zq<+q_ zILjz`)c1w*>0*up3ASXd1CRlWg6u3Uu~~B?*M$?l1s^%GBZ8i?vjW9P%q|KXV0dV! zz;_7+nOKL9pTkTara%Cd_y+3b3xS44X&)vL?)UG*Vh}^9vJXqJKP8GjEX6r^Xko^{ zBV`ZZua?O{86HJEQtJ@skMYSIj1(ps`IgJT-7JV{zv698eA9Ry?C^{r_#ICeHb|t& z4r5HC86gNU+5Hs^gvrDA8nI|*@?o6mhBYG!LU9&)c>;_`O=9K=F(Q?P8POP#^1zHl z7?JYNjBs8|PMeVg!bu%RcoEpV6e4hZ0L@sv8_$;D3jctofD>hWjIk0#MzS$UfC67y z3g8>BkTp=Ik^q6&Xf6SGATdc2|B2H?Vi%rIQf4~QCVu4La~qGB2FSt>HHPFzkWF65 z1$=Wdz+r+2g81Y(XXTJnl$}GkAut1U(3zm!?19llSOW8KEwd7ma808FecW3j*m)za zu1v0LafN!uZ&{$~MP!*a z4DrTxaky-NYVQA-S&xWl)}2zaSrHWi6p#Nau%jc_7L899;_?j&5bF>!zN~J10Ai~n KgHKMVM*jwVp_kAA literal 19968 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 K1LpDH>HY`57S+7~ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/施工组织设计及施工方案导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/施工组织设计及施工方案导入模板.xls index 0b5b85ae2e2a3adb63065f364a44ca7cec6bd419..ccaaf57bcc32f07b94c938287764bed0c9847322 100644 GIT binary patch delta 3012 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 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/检验试验计划导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/检验试验计划导入模板.xls index 30acee98d6eecb2106d382a844d413374ca21dbb..8a07d365af5410e1eb226cde452a7f0238dfa5c5 100644 GIT binary patch delta 2977 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 ahx;8UM6@JmdQEeLAELG4L8qr{(Z2yCIDfVP delta 1055 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 Kb!Vp6qn`nJO>#y6 delta 1047 zcmaJ=-%Aux6h3#Ho!NEQogcgI>}cgwCPac}A{m;aE+(?dE=ExhEB?xO9@yTc(f*ykCK@ft#r~ZJzgs8T2XLo%_X@+y>e)s$Cx!=8WZvHvT zKVb_!%qsMLVC*RRgj@B0N~IEyBLL7$;o(AhnmOY2x|!Z@+1TP2c9;kovtmvNpTVEv z9X5qo-)&awZu_##os;u2ld(xLP*UR9rNmhP`|1oFQ@Z61NYUgt&J+7q37BC*+a(oX z11#!>0E*TYL?O&)m`as>q-jgRr67oH9;>3F8m6{~4S1}MeZ)qp>;`10+fdCM#c9=G z_1L5vIH&6PT9ufA?=%C~2yGEEu|x{5jhNLetJL9-7{`KYpsh*fUarAg-^2;ZHm~V8 zqe))Y<^QVr+Mj6cirUe+1+rIe_puQ3EM)ZkEHqXuet6W?*Af3n4HR6qa`K;U%*z$N9xet~Mr>$fsY4a9Q4p_U+neos_J z0wIA$%czD>%`OrNQQ`{cBjnpf5+P|9$%M#OMd^nD@Dti3g+pI}vw{w5*p_GwaTT{% zD#^0Th6>Dmns~tQeEKD3(#u}7i;^?ke4JmqASvlSKph3g{4(%O@v_$`c!5XV^zbY8 zFe5r6G5L_tnRily?!gg7z@DTZlgT6&lb@yhr3-X#adC9YN!iZWti(@?7A~9{ao>;i QFl-k^H<4OrSUhL{1+x9`h5!Hn diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/设计交底导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/设计交底导入模板.xls deleted file mode 100644 index 917d47970a0ec6ebbbad85ac5de42386d8b34b72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19456 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 literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/质量事故处理记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/质量事故处理记录导入模板.xls index b9fbd11e77e39bf9f9443b8699fe0282d5aa1884..1e09b690e2ebdab295d21103c34b3c21643456fa 100644 GIT binary patch delta 3036 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 W>*}qUrV57pMbU~jPcm$)3;zMHAp=_g diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/超过一定规模的危大施工方案导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/超过一定规模的危大施工方案导入模板.xls index 748c5e9129f785bb0af08917e4bc06ab3caf0f33..8ca36be61f1225507d3df8b971700b195d193f89 100644 GIT binary patch delta 3064 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 diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index c0862b9e..f4096709 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -91448,7 +91448,7 @@ namespace Model private string _AuditMan; - private string _RemarCode; + private System.Nullable _RemarCode; private EntityRef _Base_Project; @@ -91486,7 +91486,7 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnRemarCodeChanging(string value); + partial void OnRemarCodeChanging(System.Nullable value); partial void OnRemarCodeChanged(); #endregion @@ -91785,8 +91785,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarCode", DbType="NVarChar(50)")] - public string RemarCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarCode", DbType="Int")] + public System.Nullable RemarCode { get { @@ -92178,7 +92178,7 @@ namespace Model private string _Remark; - private string _RemarkCode; + private System.Nullable _RemarkCode; private string _UnitWorkId; @@ -92218,7 +92218,7 @@ namespace Model partial void OnReceiveManChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); partial void OnUnitWorkIdChanging(string value); partial void OnUnitWorkIdChanged(); @@ -92480,8 +92480,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -92923,7 +92923,7 @@ namespace Model private string _UnitWorkId; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Base_CNProfessional; @@ -92965,7 +92965,7 @@ namespace Model partial void OnCompileDateChanged(); partial void OnUnitWorkIdChanging(string value); partial void OnUnitWorkIdChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -93270,8 +93270,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -97296,7 +97296,7 @@ namespace Model private System.Nullable _IsReview; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Base_CNProfessional; @@ -97344,7 +97344,7 @@ namespace Model partial void OnExpertReviewManChanged(); partial void OnIsReviewChanging(System.Nullable value); partial void OnIsReviewChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -97709,8 +97709,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -98233,7 +98233,7 @@ namespace Model private string _Problem; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Sys_User; @@ -98285,7 +98285,7 @@ namespace Model partial void OnMeasureChanged(); partial void OnProblemChanging(string value); partial void OnProblemChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -98694,8 +98694,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -99157,7 +99157,7 @@ namespace Model private System.Nullable _ReportTime; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Sys_User; @@ -99195,7 +99195,7 @@ namespace Model partial void OnAuditManChanged(); partial void OnReportTimeChanging(System.Nullable value); partial void OnReportTimeChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -99479,8 +99479,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -99912,7 +99912,7 @@ namespace Model private string _AuditMan; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Base_Project; @@ -99954,7 +99954,7 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -100278,8 +100278,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -100703,7 +100703,7 @@ namespace Model private System.Nullable _CreateDate; - private string _RemarkCode; + private System.Nullable _RemarkCode; #region 可扩展性方法定义 partial void OnLoaded(); @@ -100731,7 +100731,7 @@ namespace Model partial void OnCreateManChanged(); partial void OnCreateDateChanging(System.Nullable value); partial void OnCreateDateChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -100960,8 +100960,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -102058,7 +102058,7 @@ namespace Model private string _PositionNum; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Sys_User; @@ -102096,7 +102096,7 @@ namespace Model partial void OnReportTimeChanged(); partial void OnPositionNumChanging(string value); partial void OnPositionNumChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -102380,8 +102380,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -209177,7 +209177,7 @@ namespace Model private System.Nullable _CreateDate; - private string _RemarkCode; + private System.Nullable _RemarkCode; #region 可扩展性方法定义 partial void OnLoaded(); @@ -209207,7 +209207,7 @@ namespace Model partial void OnCreateManChanged(); partial void OnCreateDateChanging(System.Nullable value); partial void OnCreateDateChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -209456,8 +209456,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get {