diff --git a/FCL/BLL/bin/Debug/Newtonsoft.Json.pdb b/FCL/BLL/bin/Debug/Newtonsoft.Json.pdb new file mode 100644 index 0000000..acfc3fe Binary files /dev/null and b/FCL/BLL/bin/Debug/Newtonsoft.Json.pdb differ diff --git a/FCL/FineUIPro.Web/File/Excel/20240925031650/out.xlsx b/FCL/FineUIPro.Web/File/Excel/20240925031650/out.xlsx new file mode 100644 index 0000000..7f44c2a Binary files /dev/null and b/FCL/FineUIPro.Web/File/Excel/20240925031650/out.xlsx differ diff --git a/FCL/FineUIPro.Web/File/Excel/Punishment.xlsx b/FCL/FineUIPro.Web/File/Excel/Punishment.xlsx index 9405ffd..85543ba 100644 Binary files a/FCL/FineUIPro.Web/File/Excel/Punishment.xlsx and b/FCL/FineUIPro.Web/File/Excel/Punishment.xlsx differ diff --git a/FCL/FineUIPro.Web/FineUIPro.Web.csproj b/FCL/FineUIPro.Web/FineUIPro.Web.csproj index b905e50..40f71c3 100644 --- a/FCL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/FCL/FineUIPro.Web/FineUIPro.Web.csproj @@ -3550,7 +3550,7 @@ - + diff --git a/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user b/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user index accb770..fcf3204 100644 --- a/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - Release|Any CPU + Debug|Any CPU true diff --git a/FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs b/FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs index 378506c..425c074 100644 --- a/FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs +++ b/FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs @@ -1,15 +1,12 @@ using BLL; -using NPOI.XSSF.UserModel; using NPOI.SS.UserModel; +using NPOI.XSSF.UserModel; using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.IO; using System.Linq; -using System.Text; -using AspNet = System.Web.UI.WebControls; -using System.Web.UI.DataVisualization.Charting; namespace FineUIPro.Web.SES { @@ -559,64 +556,77 @@ namespace FineUIPro.Web.SES // Contract No. if (reportModel.GetRow(i).GetCell(2) == null) reportModel.GetRow(i).CreateCell(2); reportModel.GetRow(i).GetCell(2).SetCellValue(Grid1.Rows[i - 1].Values[3].ToString()); - - // Discipline + //是否框架合格 if (reportModel.GetRow(i).GetCell(3) == null) reportModel.GetRow(i).CreateCell(3); - reportModel.GetRow(i).GetCell(3).SetCellValue(Grid1.Rows[i - 1].Values[4].ToString()); - // Contractor + reportModel.GetRow(i).GetCell(3).SetCellValue(Grid1.Rows[i - 1].Values[4].ToString() == "True" ? "是" : "否"); + + // Discipline if (reportModel.GetRow(i).GetCell(4) == null) reportModel.GetRow(i).CreateCell(4); reportModel.GetRow(i).GetCell(4).SetCellValue(Grid1.Rows[i - 1].Values[5].ToString()); - // Location + // Contractor if (reportModel.GetRow(i).GetCell(5) == null) reportModel.GetRow(i).CreateCell(5); reportModel.GetRow(i).GetCell(5).SetCellValue(Grid1.Rows[i - 1].Values[6].ToString()); - - // Violation Description + // Location if (reportModel.GetRow(i).GetCell(6) == null) reportModel.GetRow(i).CreateCell(6); reportModel.GetRow(i).GetCell(6).SetCellValue(Grid1.Rows[i - 1].Values[7].ToString()); - - // Company(RMB) + //Violation Person if (reportModel.GetRow(i).GetCell(7) == null) reportModel.GetRow(i).CreateCell(7); reportModel.GetRow(i).GetCell(7).SetCellValue(Grid1.Rows[i - 1].Values[8].ToString()); - // Individual(RMB) + // Violation Description if (reportModel.GetRow(i).GetCell(8) == null) reportModel.GetRow(i).CreateCell(8); reportModel.GetRow(i).GetCell(8).SetCellValue(Grid1.Rows[i - 1].Values[9].ToString()); - // Backcharge(RMB) + //Violation Clause if (reportModel.GetRow(i).GetCell(9) == null) reportModel.GetRow(i).CreateCell(9); reportModel.GetRow(i).GetCell(9).SetCellValue(Grid1.Rows[i - 1].Values[10].ToString()); - // Violation Degree + // Company(RMB) if (reportModel.GetRow(i).GetCell(10) == null) reportModel.GetRow(i).CreateCell(10); reportModel.GetRow(i).GetCell(10).SetCellValue(Grid1.Rows[i - 1].Values[11].ToString()); - // Contract Admin + // Individual(RMB) if (reportModel.GetRow(i).GetCell(11) == null) reportModel.GetRow(i).CreateCell(11); reportModel.GetRow(i).GetCell(11).SetCellValue(Grid1.Rows[i - 1].Values[12].ToString()); - // Main Coordinator + // Backcharge(RMB) if (reportModel.GetRow(i).GetCell(12) == null) reportModel.GetRow(i).CreateCell(12); reportModel.GetRow(i).GetCell(12).SetCellValue(Grid1.Rows[i - 1].Values[13].ToString()); - // M.C.Dept + + // Violation Degree if (reportModel.GetRow(i).GetCell(13) == null) reportModel.GetRow(i).CreateCell(13); reportModel.GetRow(i).GetCell(13).SetCellValue(Grid1.Rows[i - 1].Values[14].ToString()); - // User Representative + // Contract Admin if (reportModel.GetRow(i).GetCell(14) == null) reportModel.GetRow(i).CreateCell(14); reportModel.GetRow(i).GetCell(14).SetCellValue(Grid1.Rows[i - 1].Values[15].ToString()); - // BYC RU + // Main Coordinator if (reportModel.GetRow(i).GetCell(15) == null) reportModel.GetRow(i).CreateCell(15); reportModel.GetRow(i).GetCell(15).SetCellValue(Grid1.Rows[i - 1].Values[16].ToString()); - // Violation Inspector + // M.C.Dept if (reportModel.GetRow(i).GetCell(16) == null) reportModel.GetRow(i).CreateCell(16); reportModel.GetRow(i).GetCell(16).SetCellValue(Grid1.Rows[i - 1].Values[17].ToString()); - // Inspection Department + // User Representative if (reportModel.GetRow(i).GetCell(17) == null) reportModel.GetRow(i).CreateCell(17); reportModel.GetRow(i).GetCell(17).SetCellValue(Grid1.Rows[i - 1].Values[18].ToString()); - // Backcharge SES No. + // BYC RU if (reportModel.GetRow(i).GetCell(18) == null) reportModel.GetRow(i).CreateCell(18); reportModel.GetRow(i).GetCell(18).SetCellValue(Grid1.Rows[i - 1].Values[19].ToString()); + // Violation Inspector + if (reportModel.GetRow(i).GetCell(19) == null) reportModel.GetRow(i).CreateCell(19); + reportModel.GetRow(i).GetCell(19).SetCellValue(Grid1.Rows[i - 1].Values[20].ToString()); + // Inspection Department + if (reportModel.GetRow(i).GetCell(20) == null) reportModel.GetRow(i).CreateCell(20); + reportModel.GetRow(i).GetCell(20).SetCellValue(Grid1.Rows[i - 1].Values[21].ToString()); + //Requistioner + if (reportModel.GetRow(i).GetCell(21) == null) reportModel.GetRow(i).CreateCell(21); + reportModel.GetRow(i).GetCell(21).SetCellValue(Grid1.Rows[i - 1].Values[22].ToString()); + + // Backcharge SES No. + if (reportModel.GetRow(i).GetCell(22) == null) reportModel.GetRow(i).CreateCell(22); + reportModel.GetRow(i).GetCell(22).SetCellValue(Grid1.Rows[i - 1].Values[23].ToString()); // Backcharge Completion Date - if (Grid1.Rows[i - 1].Values[20] != null && Grid1.Rows[i - 1].Values[20].ToString() != "") + if (reportModel.GetRow(i).GetCell(23) == null) reportModel.GetRow(i).CreateCell(23); + if (Grid1.Rows[i - 1].Values[24] != null && Grid1.Rows[i - 1].Values[24].ToString() != "") { - DateTime cdate = Convert.ToDateTime(Grid1.Rows[i - 1].Values[20]); - reportModel.GetRow(i).GetCell(19).SetCellValue(cdate.ToString("yyyy/MM/dd")); - reportModel.GetRow(i).GetCell(19).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式 + DateTime date = Convert.ToDateTime(Grid1.Rows[i - 1].Values[24]); + reportModel.GetRow(i).GetCell(23).SetCellValue(date.ToString("yyyy/MM/dd")); + // reportModel.GetRow(i).GetCell(0).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式 } #endregion } diff --git a/FCL/FineUIPro.Web/Web.config b/FCL/FineUIPro.Web/Web.config index 0bc7abb..0e9c536 100644 --- a/FCL/FineUIPro.Web/Web.config +++ b/FCL/FineUIPro.Web/Web.config @@ -54,7 +54,7 @@ - + diff --git a/FCL/WebApi/WebApi.csproj.user b/FCL/WebApi/WebApi.csproj.user index 643f3e5..ca0d73e 100644 --- a/FCL/WebApi/WebApi.csproj.user +++ b/FCL/WebApi/WebApi.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU