From a433d38b6f073f94ff7e39c4ac153ef773651ce4 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Wed, 8 May 2024 21:51:39 +0800 Subject: [PATCH] =?UTF-8?q?20240508=20=E5=85=B1=E6=A3=80=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8D=95=E5=A4=8D=E5=88=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2024-05-08-bwj.sql | 4 + SGGL/BLL/BaseInfo/CNProfessionalService.cs | 37 +++++- .../InspectionManagementService.cs | 26 +++- SGGL/BLL/Common/Const.cs | 5 + SGGL/BLL/SysManage/UserService.cs | 13 ++ .../BaseInfo/CNProfessional.aspx.cs | 2 +- .../CQMS/Check/CheckList.aspx.cs | 12 +- .../CQMS/Check/JointCheck.aspx.cs | 12 +- .../CQMS/Check/JointCheckStatistics.aspx.cs | 12 +- .../ConTechnologyDisclosure.aspx.cs | 12 +- .../Comprehensive/DataReceivingDoc.aspx.cs | 12 +- .../DataReceivingDocEdit.aspx.cs | 2 +- .../Comprehensive/DesignChangeOrder.aspx.cs | 12 +- .../CQMS/Comprehensive/DesignDetails.aspx.cs | 12 +- .../CQMS/Comprehensive/DesignDrawings.aspx.cs | 12 +- .../Comprehensive/GeneralPlanApproval.aspx.cs | 12 +- .../Comprehensive/InspectionEquipment.aspx.cs | 13 +- .../Comprehensive/InspectionMachine.aspx.cs | 9 +- .../Comprehensive/InspectionPerson.aspx.cs | 13 +- .../Comprehensive/InspectionTestPlan.aspx.cs | 12 +- .../Comprehensive/MajorPlanApproval.aspx.cs | 12 +- .../CQMS/Comprehensive/NCRManagement.aspx.cs | 12 +- .../CQMS/Comprehensive/PressurePipe.aspx.cs | 12 +- .../Comprehensive/QualityAccident.aspx.cs | 12 +- .../CQMS/Comprehensive/ReviewDrawings.aspx.cs | 12 +- .../Comprehensive/SiteVisaManagement.aspx.cs | 12 +- .../Comprehensive/SpecialEquipment.aspx.cs | 12 +- .../Comprehensive/TrainingRecords.aspx.cs | 12 +- .../CQMS/ManageReport/CheckStatisc.aspx.cs | 12 +- .../ManageReport/DesignChangeStatisc.aspx.cs | 12 +- .../CQMS/ManageReport/HJGLStatisc.aspx.cs | 12 +- .../CQMS/ManageReport/NCRStatisc.aspx.cs | 12 +- .../ProcessControl/CheckManStatistics.aspx.cs | 12 +- .../ProcessControl/HotProessManage.aspx.cs | 12 +- .../InspectionManagement.aspx.cs | 12 +- .../InspectionManagementStatistics.aspx | 3 +- .../InspectionManagementStatistics.aspx.cs | 68 ++++++++-- .../CQMS/ProcessControl/InspectionNotice.aspx | 4 +- .../ProcessControl/InspectionNotice.aspx.cs | 121 ++++++++++++++---- .../InspectionNotice.aspx.designer.cs | 81 ++++++------ .../InspectionNoticeEdit.aspx.cs | 1 + .../NondestructiveTest_New.aspx.cs | 12 +- .../TestPackageManagement.aspx.cs | 12 +- .../File/Excel/CQMS/NCR统计模板.xls | Bin 20992 -> 20992 bytes .../File/Excel/CQMS/共检通知单模板.xls | Bin 14336 -> 14336 bytes .../CQMS/控制点检查检测合格率统计模板.xls | Bin 20992 -> 20992 bytes .../File/Excel/CQMS/控制点检查检测模板.xls | Bin 14336 -> 14336 bytes .../File/Excel/CQMS/现场检查情况模板.xls | Bin 20992 -> 20992 bytes .../File/Excel/CQMS/问题统计模板.xls | Bin 14336 -> 14336 bytes .../File/Excel/DataIn/NCR管理导入模板.xls | Bin 22528 -> 23040 bytes .../File/Excel/DataIn/人员报验导入模板.xls | Bin 14848 -> 14848 bytes .../Excel/DataIn/图纸收发记录导入模板.xls | Bin 14848 -> 14848 bytes .../File/Excel/DataIn/培训记录导入模板.xls | Bin 14336 -> 14336 bytes .../File/Excel/DataIn/机具报验导入模板.xls | Bin 18432 -> 18432 bytes .../Excel/DataIn/设计交底管理导入模板.xls | Bin 14848 -> 14848 bytes .../File/Excel/DataIn/设计变更单导入模板.xls | Bin 22016 -> 22016 bytes .../DataIn/资料收发文登记记录导入模板.xls | Bin 15360 -> 15360 bytes .../超过一定规模的危大施工方案导入模板.xls | Bin 21504 -> 21504 bytes SGGL/FineUIPro.Web/Web.config | 2 +- 59 files changed, 328 insertions(+), 400 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-05-08-bwj.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-08-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-08-bwj.sql new file mode 100644 index 00000000..49a3b09c --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-05-08-bwj.sql @@ -0,0 +1,4 @@ + +insert into Base_CNProfessional(CNProfessionalId,CNProfessionalCode,ProfessionalName,SortIndex) +values('BD344C54-66CC-4547-89AF-04C297D60CD7','HSE','ȫ',111) +go diff --git a/SGGL/BLL/BaseInfo/CNProfessionalService.cs b/SGGL/BLL/BaseInfo/CNProfessionalService.cs index 43ca4316..c88d25eb 100644 --- a/SGGL/BLL/BaseInfo/CNProfessionalService.cs +++ b/SGGL/BLL/BaseInfo/CNProfessionalService.cs @@ -81,6 +81,19 @@ namespace BLL Funs.FineUIPleaseSelect(dropName); } } + + public static void InitCNProfessionalDocDownList(FineUIPro.DropDownList dropName, bool isShowPlease) + { + dropName.DataValueField = "Value"; + dropName.DataTextField = "Text"; + dropName.DataSource = GetCNProfessionalDocItem(); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + /// /// 专业下拉框 /// @@ -104,7 +117,29 @@ namespace BLL /// public static ListItem[] GetCNProfessionalItem() { - var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x).ToList(); + var q = (from x in Funs.DB.Base_CNProfessional + where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId + && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId + orderby x.SortIndex + select x).ToList(); + ListItem[] list = new ListItem[q.Count()]; + for (int i = 0; i < q.Count(); i++) + { + list[i] = new ListItem(q[i].ProfessionalName ?? "", q[i].CNProfessionalId); + } + return list; + } + + /// + /// 资料收发文专用 + /// + /// + public static ListItem[] GetCNProfessionalDocItem() + { + var q = (from x in Funs.DB.Base_CNProfessional + where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId + orderby x.SortIndex + select x).ToList(); ListItem[] list = new ListItem[q.Count()]; for (int i = 0; i < q.Count(); i++) { diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs index 220d3ddc..6a36c534 100644 --- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs @@ -339,10 +339,10 @@ namespace BLL { InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId==cNProfessionalId select x).ToList(); } - if (isOnceQualified == true) - { + //if (isOnceQualified == true) + //{ InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); - } + //} if (startDate != null && SoptDate != null) { InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList(); @@ -357,10 +357,10 @@ namespace BLL { InspectionMangementList = (from x in InspectionMangementList where x.UnitId == unitId select x).ToList(); } - if (isOnceQualified == true) - { + //if (isOnceQualified == true) + //{ InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); - } + //} if (startDate != null && SoptDate != null) { InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList(); @@ -369,6 +369,20 @@ namespace BLL return InspectionMangementList; } + public static List getInspectionManagementDetailListByDate(string projectId, DateTime startDate, DateTime SoptDate, bool isOnceQualified) + { + List InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail where x.ProjectId == projectId select x).ToList(); + //if (isOnceQualified == true) + //{ + InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); + //} + if (startDate != null && SoptDate != null) + { + InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList(); + } + return InspectionMangementList; + } + /// /// 根据主键获取视图信息 /// diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 4d251f9e..a4e7d619 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3891,6 +3891,11 @@ namespace BLL /// public const string CNProfessionalConstructId = "96EE9000-CAB3-46F0-9392-74BC6AD5D57B"; + /// + /// 安全专业ID + /// + public const string CNProfessionalHSEId = "BD344C54-66CC-4547-89AF-04C297D60CD7"; + /// /// 设备材料报验 /// diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs index 9d6a40c2..157ca65b 100644 --- a/SGGL/BLL/SysManage/UserService.cs +++ b/SGGL/BLL/SysManage/UserService.cs @@ -1293,6 +1293,19 @@ namespace BLL Funs.FineUIPleaseSelect(dropName); } } + + public static void InitUserNameProjectIdUnitTypeDropDownList(FineUIPro.DropDownList dropName, string projectId, string unitType, bool isShowPlease) + { + dropName.DataValueField = "UserName"; + dropName.DataTextField = "UserName"; + dropName.DataSource = BLL.UserService.GetUserListByProjectIdAndUnitType(projectId, unitType); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + /// /// Ŀź͵λͻȡûѡ /// diff --git a/SGGL/FineUIPro.Web/BaseInfo/CNProfessional.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/CNProfessional.aspx.cs index 05168107..521c3dcc 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/CNProfessional.aspx.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/CNProfessional.aspx.cs @@ -42,7 +42,7 @@ namespace FineUIPro.Web.BaseInfo protected DataTable BindData() { - string strSql = @"select CNProfessionalId,CNProfessionalCode,ProfessionalName,SortIndex from [dbo].[Base_CNProfessional] where CNProfessionalId !='"+Const.CNProfessionalConstructId+"' "; + string strSql = @"select CNProfessionalId,CNProfessionalCode,ProfessionalName,SortIndex from [dbo].[Base_CNProfessional] where CNProfessionalId !='" + Const.CNProfessionalConstructId + "' and CNProfessionalId !='" + Const.CNProfessionalHSEId + "' "; List listStr = new List(); if (!string.IsNullOrEmpty(this.txtCNProfessionalCode.Text.Trim())) diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs index 0d123acd..f2584260 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs @@ -654,20 +654,10 @@ namespace FineUIPro.Web.CQMS.Check cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs index d99bd26a..5a129aea 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs @@ -456,20 +456,10 @@ namespace FineUIPro.Web.CQMS.Check cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs index 3ec4559a..9725f413 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs @@ -350,20 +350,10 @@ namespace FineUIPro.Web.CQMS.Check cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs index b1957133..cc2861fb 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs @@ -280,20 +280,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs index 528aca21..fb537b1c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs @@ -368,20 +368,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs index ebe28ca5..d7b57600 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs @@ -92,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive BLL.UnitService.GetUnit(this.drpSendUnitId, this.CurrUser.LoginProjectId, false);//发件单位 BLL.UnitService.GetUnit(this.drpReceiveUnit, this.CurrUser.LoginProjectId, false);//接收单位 BLL.UnitService.GetUnit(this.drpIssueToUnit, this.CurrUser.LoginProjectId, false);//下发至单位 - BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//专业 + BLL.CNProfessionalService.InitCNProfessionalDocDownList(this.drpCNProfessionalId, true);//专业 //LoadAuditSelect(); //this.agree.Hidden = true; //this.options.Hidden = true; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs index 474ecd6f..877a7142 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs @@ -333,20 +333,10 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs index 3ce2d892..29da87aa 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs @@ -355,20 +355,10 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs index 7f8dc3d6..a49dfe19 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs @@ -394,20 +394,10 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs index 946783be..95f3d39b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs @@ -322,20 +322,10 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs index a7627848..afaedd1b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs @@ -327,20 +327,23 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Right; cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; var font0 = workbook.CreateFont(); - font0.FontHeightInPoints = 12; - font0.IsBold = true; + font0.FontHeightInPoints = 11; + //font0.IsBold = true; cellStyle0.SetFont(font0); + // 第二步：创建新数据行 NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); NPOI.SS.UserModel.IRow row = sheet.GetRow(0); @@ -388,7 +391,7 @@ namespace FineUIPro.Web.Comprehensive cell.SetCellValue(item.Supplier);//供货厂商 cell = row.CreateCell(7); - cell.CellStyle = cellStyle; + cell.CellStyle = cellStyle0; cell.SetCellValue(item.Counts);//本次数量 cell = row.CreateCell(8); @@ -396,7 +399,7 @@ namespace FineUIPro.Web.Comprehensive cell.SetCellValue(item.Unit);//单位 cell = row.CreateCell(9); - cell.CellStyle = cellStyle; + cell.CellStyle = cellStyle0; cell.SetCellValue(item.SamplingCount);//本次抽检数量 cell = row.CreateCell(10); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs index b788b077..41427d4a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs @@ -346,19 +346,20 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Right; cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; var font0 = workbook.CreateFont(); - font0.FontHeightInPoints = 12; - font0.IsBold = true; + font0.FontHeightInPoints = 11; cellStyle0.SetFont(font0); // 第二步：创建新数据行 NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); @@ -445,7 +446,7 @@ namespace FineUIPro.Web.Comprehensive cell.SetCellValue(isO);//是否在校验期内 cell = row.CreateCell(11); - cell.CellStyle = cellStyle; + cell.CellStyle = cellStyle0; cell.SetCellValue(item.UnitsCount.HasValue ? item.UnitsCount.ToString() : "");//台数 cell = row.CreateCell(12); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs index 570f9cb5..25d54dd2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs @@ -413,20 +413,11 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs index 70b59d90..67b39dc2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs @@ -288,20 +288,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs index 3e65c307..fa084818 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs @@ -323,20 +323,10 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs index e2034bc8..61c7cb53 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs @@ -378,20 +378,10 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs index 43613d57..ac9df4fe 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs @@ -315,20 +315,10 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs index 6cd67ae8..bd982a97 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs @@ -321,20 +321,10 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs index 7ea4448c..890bd48b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs @@ -372,20 +372,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs index ac6399c2..54414dac 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs @@ -328,20 +328,10 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs index e44a11cf..e4337bb2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs @@ -309,20 +309,10 @@ namespace FineUIPro.Web.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs index 173e9d12..82136871 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs @@ -250,20 +250,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs index 89ab0863..7b6003c0 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs @@ -429,20 +429,10 @@ namespace FineUIPro.Web.CQMS.ManageReport cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs index 4bc3a73c..491a51d3 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs @@ -225,20 +225,10 @@ namespace FineUIPro.Web.CQMS.ManageReport cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs index a6cd63f5..efcad6d3 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs @@ -177,20 +177,10 @@ namespace FineUIPro.Web.CQMS.ManageReport cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs index 53c5a5d6..60ca2d1f 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs @@ -194,20 +194,10 @@ namespace FineUIPro.Web.CQMS.ManageReport cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs index b11d0dba..43d89ba3 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs @@ -114,20 +114,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/HotProessManage.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/HotProessManage.aspx.cs index acf0782d..9ba330af 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/HotProessManage.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/HotProessManage.aspx.cs @@ -287,20 +287,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs index a9d4f145..76a8d003 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs @@ -288,20 +288,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx index e41e3da7..12620a86 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx @@ -21,7 +21,8 @@ - + + diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs index dd91818a..5044cf3c 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs @@ -29,7 +29,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, false);//专业 drpCNProfessional.Items.Insert(0, new FineUIPro.ListItem("- 请选择专业 -", BLL.Const._Null)); } - else + else if(drpZhType.SelectedValue.Equals("2")) { BLL.UnitService.InitUnitDownList(this.drpCNProfessional, this.CurrUser.LoginProjectId, false);//施工分包商 drpCNProfessional.Items.Insert(0, new FineUIPro.ListItem("- 请选择单位名称 -", BLL.Const._Null)); @@ -73,14 +73,20 @@ namespace FineUIPro.Web.CQMS.ProcessControl //统计所给时间段的合格数量 managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); } - else + else if (ZyType == "2") { //统计所给时间段的全部数量 managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); //统计所给时间段的合格数量 managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); } - + else + { + //统计所给事件段的全部数量 + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, false); + //统计所给事件段的合格数量 + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, true); + } Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", DateTime.Now); Statistics.SunNumber = managementListSunNumber.Count(); Statistics.OneStatisticsSunNumber = managementListOneNumber.Count(); @@ -108,13 +114,20 @@ namespace FineUIPro.Web.CQMS.ProcessControl //统计所给事件段的合格数量 managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, true); } - else + else if (ZyType == "2") { //统计所给事件段的全部数量 managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, false); //统计所给事件段的合格数量 managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, true); } + else + { + //统计所给事件段的全部数量 + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, false); + //统计所给事件段的合格数量 + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, true); + } Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", NextDate); Statistics.SunNumber = managementListSunNumber.Count(); Statistics.OneStatisticsSunNumber = managementListOneNumber.Count(); @@ -142,7 +155,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); } - else + else if(ZyType=="2") { //统计所给事件段的全部数量 managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); @@ -150,6 +163,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); } + else + { + //统计所给事件段的全部数量 + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, false); + //统计所给事件段的合格数量 + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, true); + } Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", DateTime.Now); @@ -178,13 +198,20 @@ namespace FineUIPro.Web.CQMS.ProcessControl //统计所给事件段的合格数量 managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true); } - else + else if (ZyType == "2") { //统计所给事件段的全部数量 managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, false); //统计所给事件段的合格数量 managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true); } + else + { + //统计所给事件段的全部数量 + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, false); + //统计所给事件段的合格数量 + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, true); + } Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", NewDate); Statistics.SunNumber = managementListSunNumber.Count(); Statistics.OneStatisticsSunNumber = managementListOneNumber.Count(); @@ -226,7 +253,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl //统计所给事件段的合格数量 managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); } - else + else if(ZyType=="2") { //统计所给事件段的全部数量 managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); @@ -234,6 +261,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); } + else + { + //统计所给事件段的全部数量 + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, false); + //统计所给事件段的合格数量 + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, true); + } Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", DateTime.Now); Statistics.SunNumber = managementListSunNumber.Count(); Statistics.OneStatisticsSunNumber = managementListOneNumber.Count(); @@ -260,12 +294,19 @@ namespace FineUIPro.Web.CQMS.ProcessControl //统计所给事件段的合格数量 managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true); } - else + else if(ZyType=="2") { //统计所给事件段的全部数量 managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, false); //统计所给事件段的合格数量 managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true); } + else + { + //统计所给事件段的全部数量 + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, false); + //统计所给事件段的合格数量 + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, true); + } Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", NewDate); Statistics.SunNumber = managementListSunNumber.Count(); Statistics.OneStatisticsSunNumber = managementListOneNumber.Count(); @@ -333,13 +374,20 @@ namespace FineUIPro.Web.CQMS.ProcessControl managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, EndDate, true); } - else + else if(ZyType=="2") { //统计所给时间段的全部数量 managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, EndDate, false); //统计所给时间段的合格数量 managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, EndDate, true); } + else + { + //统计所给事件段的全部数量 + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, false); + //统计所给事件段的合格数量 + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, true); + } Statistics.CheckDate = string.Format("{0:yyyy-MM-dd}", StartDate) + " 至 " + string.Format("{0:yyyy-MM-dd}", EndDate); Statistics.SunNumber = managementListSunNumber.Count(); Statistics.OneStatisticsSunNumber = managementListOneNumber.Count(); @@ -515,7 +563,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, false);//专业 drpCNProfessional.Items.Insert(0, new FineUIPro.ListItem("- 请选择专业 -", BLL.Const._Null)); } - else + else if(drpZhType.SelectedValue.Equals("2")) { BLL.UnitService.InitUnitDownList(this.drpCNProfessional, this.CurrUser.LoginProjectId, false);//施工分包商 drpCNProfessional.Items.Insert(0, new FineUIPro.ListItem("- 请选择单位 -", BLL.Const._Null)); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx index 14cd79aa..ae285275 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx @@ -105,11 +105,13 @@ + - diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs index 421e60bf..a5c44d64 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs @@ -8,6 +8,7 @@ using System.Data.SqlClient; using System.IO; using System.Linq; using System.Text; +using System.Text.RegularExpressions; namespace FineUIPro.Web.CQMS.ProcessControl { @@ -185,7 +186,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl } //合格的情况下不允许修改 var model = Funs.DB.ProcessControl_InspectionManagement.FirstOrDefault(x => x.InspectionId == Grid1.SelectedRowID); - if (model.IsOnceQualified==true) + if (model.IsOnceQualified == true) { Alert.ShowInTop("该共检通知单已合格，不允许修改！", MessageBoxIcon.Warning); return; @@ -253,6 +254,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl { this.btnMenuDel.Hidden = false; } + if (buttonList.Contains(BLL.Const.BtnSave)) + { + this.btnMenuCopy.Hidden = false; + } } } #endregion @@ -311,20 +316,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); @@ -435,17 +430,17 @@ namespace FineUIPro.Web.CQMS.ProcessControl var units = (from x in db.Base_Unit join y in db.Project_ProjectUnit on x.UnitId equals y.UnitId - where y.ProjectId==this.CurrUser.LoginProjectId && y.UnitType== BLL.Const.ProjectUnitType_4 + where y.ProjectId == this.CurrUser.LoginProjectId && y.UnitType == BLL.Const.ProjectUnitType_4 orderby x.UnitName select x).FirstOrDefault(); - if (units!=null) + if (units != null) { bookmarkUnitName.Text = units.UnitName; } } var projectModel = db.Base_Project.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).FirstOrDefault(); var inspectionModel = db.ProcessControl_InspectionManagement.Where(x => x.InspectionId == Id).FirstOrDefault(); - + //项目编号 Bookmark bookmarkProjectCode = doc.Range.Bookmarks["projectCode"]; if (bookmarkProjectCode != null) @@ -575,7 +570,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl builder.StartTable(); builder.CellFormat.Borders.LineStyle = Aspose.Words.LineStyle.Single; builder.CellFormat.Borders.Color = System.Drawing.Color.Black; - + builder.Bold = false; builder.RowFormat.Height = 20; builder.Font.Size = 10; @@ -591,7 +586,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl { builder.RowFormat.Height = 200 / ManagementDetaillList.Count; } - else { + else + { builder.RowFormat.Height = 20; } builder.CellFormat.Borders.Left.LineWidth = 1; @@ -602,7 +598,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl builder.CellFormat.Width = 156; builder.Write(ConvertControlPointType(item.ControlPointType)); builder.CellFormat.Borders.Left.LineWidth = 0; - // 控制点等级 + // 控制点等级 builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First; @@ -612,11 +608,12 @@ namespace FineUIPro.Web.CQMS.ProcessControl var ControlPointType = ConvertClass(item.ControlPointType); #region 控制点等级 - if (ControlPointType.Contains("A") ) + if (ControlPointType.Contains("A")) { builder.Write("■A "); } - else { + else + { builder.Write("□A "); } if (ControlPointType.Contains("B")) @@ -838,8 +835,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl builder.Write("注：如果业主有规定，执行业主的规定。 "); #endregion - - doc.Save(newUrl); + + doc.Save(newUrl); string fileName = Path.GetFileName(newUrl); FileInfo info = new FileInfo(newUrl); long fileSize = info.Length; @@ -860,7 +857,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl } } - public class WorkBranchList { + public class WorkBranchList + { public string UnitWorkId { get; set; } public string Branch { get; set; } } @@ -974,9 +972,84 @@ namespace FineUIPro.Web.CQMS.ProcessControl uname = CarryUnitIds.ToString(); } return uname; - + } #endregion + #endregion + + /// + /// 复制 + /// + /// + /// + protected void btnMenuCopy_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + var inspection = BLL.InspectionManagementService.GetInspectionManagementById(this.Grid1.SelectedRowID); + if (inspection != null) + { + Model.ProcessControl_InspectionManagement newInspection = new Model.ProcessControl_InspectionManagement(); + newInspection.InspectionId = SQLHelper.GetNewID(typeof(Model.ProcessControl_InspectionManagement)); + newInspection.ProjectId = this.CurrUser.LoginProjectId; + newInspection.UnitId = inspection.UnitId; + newInspection.CNProfessionalId = inspection.CNProfessionalId; + newInspection.InspectionCode = inspection.InspectionCode; + newInspection.UnitWorkId = inspection.UnitWorkId; + newInspection.Branch = inspection.Branch; + newInspection.ControlPointType = inspection.ControlPointType; + newInspection.AcceptanceSite = inspection.AcceptanceSite; + newInspection.IsOnceQualified = inspection.IsOnceQualified; + newInspection.InspectionDate = inspection.InspectionDate; + newInspection.AttachUrl = inspection.AttachUrl; + newInspection.CheckDate = inspection.CheckDate; + newInspection.CheckMan = inspection.CheckMan; + newInspection.UnqualifiedReason = inspection.UnqualifiedReason; + + //通知单编号后有字母递增，无则加“a” + string fisrtE = inspection.NoticeCode.Substring(0,inspection.NoticeCode.Length - 1); + string lastE = inspection.NoticeCode.Substring(inspection.NoticeCode.Length - 1, 1); + bool b = Regex.IsMatch(lastE, "[a-zA-Z]"); + if (b) + { + int x = (int)Convert.ToByte(Convert.ToChar(lastE)); + newInspection.NoticeCode = fisrtE + Convert.ToChar(x + 1); + } + else + { + newInspection.NoticeCode = inspection.NoticeCode + "a"; + } + + newInspection.AcceptanceCheckMan = inspection.AcceptanceCheckMan; + newInspection.ParentDivisionProjectId = inspection.ParentDivisionProjectId; + newInspection.CompileMan = this.CurrUser.UserId; + newInspection.CompileDate = DateTime.Now; + newInspection.FileType = inspection.FileType; + newInspection.AttachUrl2 = inspection.AttachUrl2; + BLL.InspectionManagementService.AddInspectionManagement(newInspection); + + var details = InspectionManagementDetailService.GetInspectionDetails(inspection.InspectionId); + if (details.Count > 0) + { + foreach (var item in details) + { + Model.ProcessControl_InspectionManagementDetail newDetail = new Model.ProcessControl_InspectionManagementDetail(); + newDetail.InspectionDetailId = SQLHelper.GetNewID(typeof(Model.ProcessControl_InspectionManagementDetail)); + newDetail.InspectionId = newInspection.InspectionId; + newDetail.UnitWorkId = item.UnitWorkId; + newDetail.Branch = item.Branch; + newDetail.ControlPointType = item.ControlPointType; + newDetail.CreateDate = DateTime.Now; + BLL.InspectionManagementDetailService.AddInspectionDetail(newDetail); + } + } + ShowNotify("复制成功！"); + BindGrid(); + } + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs index 9f1a0b58..6aa89952 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.ProcessControl -{ - - - public partial class InspectionNotice - { - +namespace FineUIPro.Web.CQMS.ProcessControl { + + + public partial class InspectionNotice { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// ToolSearch 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar ToolSearch; - + /// /// drpUnitWork 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWork; - + /// /// drpCNProfessional 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessional; - + /// /// txtStarTime 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtStarTime; - + /// /// Label1 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// txtEndTime 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtEndTime; - + /// /// btnSearch 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// btnNew 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnOut 控件。 /// @@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// lblPageIndex 控件。 /// @@ -139,7 +137,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - + /// /// Label3 控件。 /// @@ -148,7 +146,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label3; - + /// /// lbtnFileUrl 控件。 /// @@ -157,7 +155,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl; - + /// /// ToolbarText1 控件。 /// @@ -166,7 +164,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -175,7 +173,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -184,7 +182,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Menu1 控件。 /// @@ -193,7 +191,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuModify 控件。 /// @@ -202,16 +200,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuModify; - - /// - /// btnPrinter 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnPrinter; - + /// /// btnMenuDel 控件。 /// @@ -220,5 +209,23 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuDel; + + /// + /// btnPrinter 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnPrinter; + + /// + /// btnMenuCopy 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuCopy; } } diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs index 7f16cf78..dbaec460 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs @@ -22,6 +22,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//专业 UserService.InitUserProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, string.Empty, false); + //UserService.InitUserNameProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, string.Empty, false); this.hdInspectionNoticeId.Text = Request.Params["inspectionId"]; if (!string.IsNullOrEmpty(Request.Params["View"])) { diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.cs index 15f2fd7a..9bf5f2ac 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.cs @@ -272,20 +272,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs index ba811d35..08fa8539 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs @@ -259,20 +259,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 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); diff --git a/SGGL/FineUIPro.Web/File/Excel/CQMS/NCR统计模板.xls b/SGGL/FineUIPro.Web/File/Excel/CQMS/NCR统计模板.xls index 2b2ee259039d6c6b6017759fa3afc16d0189a8b0..ee483fc8cd98212625653d739d1218b8cba09a32 100644 GIT binary patch delta 235 zcmZoz!q~8caYGIZn}g~v@6ZL4i&)wi=WqVWqGe*V-;x0c*cgKuG8j^Uu!O;op_M^| zq1_f;+z2c#Y(F{F(nWtKD?bCnhmEXYMIRJE6b}OfGmv5eVn!%t1JYoy`G92(tAaBF z_Xi0ezmd_Afq`Q`qX2^d!vRJIAp1Wf2LlJgWC#0r#)QcW?2VaTTThdp6$=1xSvEod delta 237 zcmZoz!q~8caYGIZ+ksDsA=~FoE@Ek8?B4v7Ma#r!wIu@(urUTRWH6)xVF`mFLo0&_ zL$NKoxDiDavp}sjm|QYui6VSUALaR*7?)s+YTm-j4YD{oV+$o*&42z1O2r*%y$(F0I!KS761SM diff --git a/SGGL/FineUIPro.Web/File/Excel/CQMS/共检通知单模板.xls b/SGGL/FineUIPro.Web/File/Excel/CQMS/共检通知单模板.xls index 09e863ef1efb9cbd1c2c8287eb82dc9f91d1f9d2..8af57e880c8ae4a1c7341f4449efc47e925c4381 100644 GIT binary patch delta 210 zcmZoDXeii_!@`!Za(77Rg2_cJZHzxQ|71y$GPF=&00K6~V1^8aR3I#2Fl1f)P$H^lqUbv{507|T~knpAE<|gp%y6341})~C%38JVpN)(sNoGH*J{jW aRNCyRxt?W{ULY&$^<1FyH-{OoVgUfrGc%O{ delta 201 zcmZoDXeii_!@?F|%DMdbyvao@ZHyl_|71y$GBi+N00K6~V1^8aR3I#2Fl18f(@RF7B!em`F zV@8|JiE1*8f_D5sWh@M}3_J|XK)A|ya-aGwMuo|l8s0#1tHx|bh0TGQ>sclnuyAbB S3uI;e)UfRMyv diff --git a/SGGL/FineUIPro.Web/File/Excel/CQMS/控制点检查检测合格率统计模板.xls b/SGGL/FineUIPro.Web/File/Excel/CQMS/控制点检查检测合格率统计模板.xls index 076a94adfafdcbdb04a6e8995c91c054d4e4a19f..8939a178bc6ac1cc3f984d8395f984d97dc3975d 100644 GIT binary patch delta 192 zcmZoz!q~8caYGIZ+l1ITNudiS7qPT47H|H^qGe)u*^&VW*cgKuG8j^Uu!O;op_M^| zA=(yQ+z2fGd~%4TtNKA!eg=jQJ6XYMK4^d_0R{#ZAjJg4j8M!qS&>C}^J&X3tc)3x z57-+s?YEv>>HKN(bB8aCoRjZ3dIL!fr`bUAh?C#sH7>l2%$pUQZ?J6g2w-Jnh*btU Kb#s{SDi#3JEHUH& delta 210 zcmZoz!q~8caYGIZTR;e(#GHAPi&)wivp4@_(K0bSZOH%xY>dGS84RgFSi)e)(8?gf z5NwMsZUh#;KRLwGRedKbKLf*ujjUib9~3|o4+8@;kYWO2Mkwaoe8TcSD_a843Lb{Z z4_#y?zqA)(+HO6$(fQNl_YPkeIVL}G^ahd!PP2jJ87DtJcBp1{1|W-Zvxf5xmdOSz W9Gg4>SlJpjtP-CyZ*!RMDi#15g);yE diff --git a/SGGL/FineUIPro.Web/File/Excel/CQMS/控制点检查检测模板.xls b/SGGL/FineUIPro.Web/File/Excel/CQMS/控制点检查检测模板.xls index 394f8d82c74663d6ebe387785797d6e9e2d2652c..e49cb770a7778bbc0442d87c04cf24d86c30d5e4 100644 GIT binary patch delta 202 zcmZoDXeii_!@_pK#xW;!!Q>*AHpalsKUvbG7!4;U$csx_sxSZn8)Gm-2168D%%GSLb46dHb&3QKUvbG7&Rv+$csxFsxSZn8)Gm-216v~azr{u_wr}42R(6SA0E7q&D zJ@jpv?^C_0fAVI2^HyxBOY3RcHo84Z_mI<0cgLpgxFhq&oh;6_&F2L4!8RzyUaF+xbkMN9XqcINox18Y6J$N99v6?>^kyKQJgy&0uHYGF+r~ z6Ar^&y81`Q{*L#nxSz*sxzfIuI^BEynXX9n{c@n^Lkj_oI@|1>*vH-AbMBkYUg5i; z0rn+GW`PtR~vYjJ|Q=8hdw0F!Ut+j2^(5fBMg7#IsVK$ctm$dAL==dCv^{>>Utpy0Nc9; zzy?&sa1dbKjbH$B_(A6+7qcXfEu9zignVV1YsIx9(0)l8s2jXscGX&~t)7yqg_Ar?{rEALmJ~-pQTVlGQ8ssALzccJ3w1!6l0kjxCGJ$~#q&5qx0{;U8<} zV*Kj_EU`eQ>ASw0tWqjY_ldhc-OJ;;eV9$dyUp6yaMON&bnLqqPsYd`T!(9--Gfnh zEVg@Y;{W)VjJGCn)hi$SqKe($T2Upm<;F%FoQyDv=%mxNaQO7DO77#ZKTckUSNt7P z2;eUq5JUz7$rFVMk3xXAr}*VE#C|+SMRJPJDiEiMzfwf20PA|0ltxpUn$j4Y!D#BZ zIQiM&oOsU%ZwU*32U&{Ih3dzdK}DNTzHRp{Oou~fi^?H@azhh&_FAmXUc%;V#OnQ? LxMAU&^Ec=}{!PCe diff --git a/SGGL/FineUIPro.Web/File/Excel/CQMS/问题统计模板.xls b/SGGL/FineUIPro.Web/File/Excel/CQMS/问题统计模板.xls index bc5207106c3bf7f716ce86eea6be42652ed3d315..7f7d2ca0113fd4d00761e0d000534dcbf0e2f1a9 100644 GIT binary patch delta 212 zcmZoDXeii_!@~BVr?)9|!Q>*AHpb4)KUtEb3^f%PfPjrLm?4896$nch3>jJ(L>LNH z(8Z0w;(sUi$h)c^WaVdI_^^`|tmcCTh!S96U;$E0K+FimT$2@9gf}xQ2(hs(kY`}v zVVL}0TV}Gknh?`frOEwTpC;R?R|s8|=Lc$HVWhyvao@ZH$eZf3hS=87e9;00A3gFhd4IDiD@17&5dnh%jWT zpo<%U#lKGOk#|+!$;!{b@L?k>Sj`6o5XHm5zzn3AfS3`AIX5ZDvN6t>ET?A7bXIBd zbgfU5UDYdu8bbJi%2*g`fqFQA@POs!^XgiRj2x4HX?O!kH_h3M9Gf3$%CSr~VBy%L S7s$$L^h^2lyvjPvKH*pMoC`Qw&F9b z5f`)ozR@PtAvo=roG=sq^R@UzkKorG9-)J}rL%fBc98u6G1seA-4O2Pek_Zh^xZ5c z)`f!5+9sbr%h+k2Oi&evHPFk@rd+!1}TxeAh)t z5Wq<&(PY)xir3^$^Iq(gs-8Ij;026jf><&drO&;1BC~<>eNoM5JxD<^oTGgQjpa}R z-}ZIsMthxYcT(!LV6V+CaKTzQfqMUq*(4nX@Ek%U85qz znQeKu)J*-!Kd#-pn@ya=(cvwfajCGtZy_!vg)Ubt7MkMzG4~(Cn{o)tBY{#*#t*}{ j)uMZxekq(8Nt6mxDo=fh;aE0fz9{rCa*RJdQf7YvWcJNg delta 797 zcmZ{iO=uHQ5Xa|jb~m4!RW~ga6)TA*6%-62NMaLX+N8TlX=_q@P{e~EA_bwBVl_d? zO;L6bp@LKoB8bws;@6?HQV={T4IA4rgD=bQbDo%?P;babfi&xld zoR%&zzx7Mnsfe2ZM9gdb_*^?AZUIQ*NN5}W)WWzwG$|M1y75M{?uV`hQIAB?2>a|h z)2@%h349Tbq8jnpHQlZkBMH)VS+(7_w#H{t^bs@1y4{mPkLT-L(b_TQ6%Lbv|0T%Y<@Ohwt(q1(T-xZ9t}|b3matMf rW0qgapnU$=n8k&1#+*o-<5My{2)M@Z-mq>hk0+Uxo>*i!Kb-yxLp-{a diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/人员报验导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/人员报验导入模板.xls index ebd30f0592e7e19847c8286ebc8d16618f3e2078..6bea5e18658cd6cd417b39e9b63aeee35ba6d9cf 100644 GIT binary patch delta 292 zcmZoDX(-u{!@{<}*hn{Y!Q>*AHb%3}KUqroCeIU=n4BkUuz8!XERSKBA_EYxF$Oba zFr)%u34BGMlNGvI8D%ERs|5*)Gcbk*`}#kP<*wol`B2HlFu6hP0HeWVM|ESSCY8xnI-e$I zXh<-1>r8Ia&|?x;oV-cn1EbsI#hT8Hu9Kf@nlrjjme-QzcV*xP+VGcw3uqHJgX?5Z ztzbsc$#b>5f#gfA*^Hu_TeS;WHW^4Tv9!sl8f}&_GGLmlVPr5n4Bjpv3Z-YERUg&A_EYxF$Oba zFr)%u34lGU+5tw5$=>S5j1`;f)wvmqL1 zXy`HN8BgA$@qy8G@>)%2MwiJSHO(2_CTnU*^Sd)}1I_-+zy-8}o56i@uvRdm$mHc( z-azuR)@(+R&HdViERzjbxHcI`FtIdlJ)XW<#>jwavWbb*<}?!_MmC0X;lSY7TxZ(E F0sx}5NRa>l diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸收发记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸收发记录导入模板.xls index ed68a7f4c88b71a1bdd98eb82920bad7fa3f8a12..7bb81f379dc36ecf184cf936810294bc4b858d25 100644 GIT binary patch delta 218 zcmZoDX(-u{!@`!J&9@|E!Q>*AHpZo!f3n$i%U*sQE*j1$;!{b@ZlgUSj`6m5GBIE0OB$MF(VX$te5{U4q33d&a{aI0N*(b&LEG@YJ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/培训记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/培训记录导入模板.xls index 969e47a4da30f3d32b7228267b5d1865d736987b..f861c908f03d6105cb6a0a9e78b6d15f8d85ad88 100644 GIT binary patch delta 199 zcmZoDXeii_!@?$DXCxE4U~&;l8{_iLKUr2u8MZ4h00A3gFhd4IDiD@17&5dnh%of4 zpo<%U#ib`-k#|);$;!{b@ZlgUSj`6m5GBIE0OB$MF(VXarfAM)6r7~x$HxfP3exufKMTv|7_BADlMPrnHtEH(vPv}p LUA#HTcpeJ?D9SB_ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/机具报验导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/机具报验导入模板.xls index 57d5dc569d1ffd158db37e28753d110a50fecd5e..3ba4c985f1ffbbf6c2408c98b0c55d193d2cb65b 100644 GIT binary patch delta 214 zcmZpez}PT>aYGIZn?avzL&$>3MJ#QM0h@oaT+?6-n0!H3T++gX0SMR_gBdayQh~69 z!HA)iL4@JRBt2L4o2>i{3?DACf|Y!508ugw4D3LP35Xe?SZ4A>7VXXLdTZI(bo3Y) zco-(nvzD10W-7!q$7r&h)u+iZW)earI{ZLQEDW_kc_tuqRhisorpM$eGkKd?6&o)D vFT+Ky&1&XVjEvHg7g~4&$+s4>8KpOOT86W1va4WaYv{EBdSG*%a}x^yl5I4? delta 211 zcmZpez}PT>aYGIZn}YE99bB^}7qPT48f^Z_a!rHLVe$oCaY+di1|VQ#3}(n+NCm*AHpalsKUuh>4Gk3;fPjrLm?4896$nch3>jJ(L>Mep z(Z!9x;zuW&D7dO$WaVdI_;8XHtmcCSh>`%B0;HILm=TJ_Cr@Ni-n?5OiH$L0vYfgx z(_H1r;o6@jyJ|=>>P(K;uw!D-*gRiDijh%l@-9tpAjziHEEx^d{Tqk{KL81aSOzr) rQ3fFf4hFHwi?q}k87F_xHQxMJ>o?0LgNdxHzDJot7i^wpn#BSD&j2%; delta 238 zcmZoDX(-u{!@_nTE5CEutjR?zZH%6qf3k2%8)_;t00A3gFhd4IDiD@17&5dnh%gwc zqKg}W#rIA&QE*j1$;!{b@ZlgUSj`6m5GBIE0OB$MF(VX=gUUBiw^%VhI%4Jk%O(aDE2y@4d3Ro-5PF|&@J~>;*WHYPwZ}|_P2`Je%!1Q-}tfD{uDGeWVzWJMO?&Btw*vN5Ji z&UG?z0*BHwStwXWryf!OGU~cOlSCo9hCb FSO9K7EwKOq delta 185 zcmZoz!`QHfaYGIZTfv$6`R=nO7qPT4{czp}4ah%NO`DyYTR|}>WoSUz?&SGTbnOx}Z4J7xv&t~M=9O5H0sxlwFx3D6 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls index b8ab3ffe66463956887d54cdfb03ca180b76522f..da32b34d143fb6a1852a878b3dd52cd64f4ab125 100644 GIT binary patch delta 194 zcmZpuXsFnb!@?$DINKt0!Q>*AHpU&Bf3h5sGF+g@00eA|!3-G;sX$o5V93zQAi}Uf z9bMcAEUq*8jl8S+NmhOah7Si>!D>DjfG80L1`wACh#8?+Zn7ea^yX{@MRrDx$-U~v zjITByRF`ICiZ$JQPeY5DQFbz?jyI4D)tL<>KkE2Rt~KCg6yEHsyP9Q_Q4A{^gIN~P Lxto*B=dl0)5{oUN delta 207 zcmZpuXsFnb!@{=UZxPSWnUjlH+88%%{>gGk%5a7v0}!w=1~X(Zqyk|HgCRpJg9yV6 zb#!qfu(-0ipyL7+8Q56A&{(vCL#e7U9js3X1HE43np- z8#6xId{SMSkxATT^D_-CW=84Bf;!$nGFE3cko>9R$HxrR3DVCDgbWOuLv>fPOg3QQ U*klyL%GO{b3v~PDB=dPJ01me=ApigX diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/超过一定规模的危大施工方案导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/超过一定规模的危大施工方案导入模板.xls index 8ca36be61f1225507d3df8b971700b195d193f89..1731459bac68f7a21a66d1501a62dad42e0bdb4d 100644 GIT binary patch delta 418 zcmZoz!Pu~ZaYGIZ+k!=&pF$Q)E@Ek8ygT_POFiSH&6TXbd3mH57%T(@9TXf`7#JpJ z2*!lNUPeVsx7vl|e*o5T?5tS!-aOqDv5jM2G02hxB5H>JU8$ zGQvX_Pf^V&gEaaDo;nwFsSb;mh$tE(c82#JAIzJ1Fr^wP)yU-rm70fbxn997x=U{H zlNQMy%Zpzs9(Wg|6!bk^U9e}bPbEpLh62nJ{^$)XPXb>O$-+9U@x2YBPzE2IV@T^E zBRHWML-(Q^z`7CtPFj&p@c>X>1Rmr+Bn(q8YiRo-31T|7>h=R!%FbtAR+NIeXyx%P z#-uR~pbM~J^dnAp3yvv#Gun6(j|jOaKE&(9z@0>*s6*$mZ*cM3MbJUAC2=`yIk;q7 zGMCeqlgnkx1qo1WDUjr206g;UA6|Vh4DZkeHwe}%0LFBch-m6*o-6t(&*O%P11Xg# r?8w-pXw3{>&-(fNLbc^Dr&w? - +