diff --git a/.gitignore b/.gitignore index 79ef733..0623f6c 100644 --- a/.gitignore +++ b/.gitignore @@ -5725,3 +5725,9 @@ HJGLPackFile/版本日志/HJGLDB_2024.05.02.sql /HJGL/FineUIPro.Web/ErrLog.txt /HJGL/FineUIPro.Web/File/Excel/20240510091749 /HJGL/FineUIPro.Web/File/Excel/20240510092516 +/HJGL/FineUIPro.Web/File/Excel/20240510100957/out.xlsx +/HJGL/FineUIPro.Web/File/Excel/20240510105614 +/DataBase/hjglDB_7_2024.05.10.rar +/HJGL/FineUIPro.Web/File/Excel +/HJGLPackFile/PackFile +/HJGL/.vs/HJGL/v17/.suo diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index 08690fa..8a86b31 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -240,6 +240,14 @@ + + + + + + + + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo deleted file mode 100644 index d4af0b4..0000000 Binary files a/HJGL/.vs/HJGL/v17/.suo and /dev/null differ diff --git a/HJGL/FineUIPro.Web/Doc/index.aspx b/HJGL/FineUIPro.Web/Doc/index.aspx deleted file mode 100644 index 125efab..0000000 --- a/HJGL/FineUIPro.Web/Doc/index.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="FineUIPro.Web.Doc.index" %> - - - - - - - - - -
-
-
-
- - diff --git a/HJGL/FineUIPro.Web/Doc/index.aspx.cs b/HJGL/FineUIPro.Web/Doc/index.aspx.cs deleted file mode 100644 index 1b35a5e..0000000 --- a/HJGL/FineUIPro.Web/Doc/index.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Doc -{ - public partial class index : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/Doc/index.aspx.designer.cs b/HJGL/FineUIPro.Web/Doc/index.aspx.designer.cs deleted file mode 100644 index 57ac6fa..0000000 --- a/HJGL/FineUIPro.Web/Doc/index.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.Doc -{ - - - public partial class index - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/HJGL/FineUIPro.Web/Downloads/index.aspx b/HJGL/FineUIPro.Web/Downloads/index.aspx deleted file mode 100644 index 3e0081a..0000000 --- a/HJGL/FineUIPro.Web/Downloads/index.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="FineUIPro.Web.Downloads.index" %> - - - - - - - - - -
-
-
-
- - diff --git a/HJGL/FineUIPro.Web/Downloads/index.aspx.cs b/HJGL/FineUIPro.Web/Downloads/index.aspx.cs deleted file mode 100644 index 8786baa..0000000 --- a/HJGL/FineUIPro.Web/Downloads/index.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Downloads -{ - public partial class index : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/Downloads/index.aspx.designer.cs b/HJGL/FineUIPro.Web/Downloads/index.aspx.designer.cs deleted file mode 100644 index 745e4c8..0000000 --- a/HJGL/FineUIPro.Web/Downloads/index.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.Downloads -{ - - - public partial class index - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/HJGL/FineUIPro.Web/File/Excel/20240510105118/out.xlsx b/HJGL/FineUIPro.Web/File/Excel/20240510105118/out.xlsx deleted file mode 100644 index 8cb3e60..0000000 Binary files a/HJGL/FineUIPro.Web/File/Excel/20240510105118/out.xlsx and /dev/null differ diff --git a/HJGL/FineUIPro.Web/File/index.aspx b/HJGL/FineUIPro.Web/File/index.aspx deleted file mode 100644 index f9e96a5..0000000 --- a/HJGL/FineUIPro.Web/File/index.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="FineUIPro.Web.File.index" %> - - - - - - - - - -
-
-
-
- - diff --git a/HJGL/FineUIPro.Web/File/index.aspx.cs b/HJGL/FineUIPro.Web/File/index.aspx.cs deleted file mode 100644 index 901f526..0000000 --- a/HJGL/FineUIPro.Web/File/index.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.File -{ - public partial class index : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/File/index.aspx.designer.cs b/HJGL/FineUIPro.Web/File/index.aspx.designer.cs deleted file mode 100644 index 454aac7..0000000 --- a/HJGL/FineUIPro.Web/File/index.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.File -{ - - - public partial class index - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index 734d1dc..ef34884 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -246,11 +246,8 @@ - - - @@ -263,7 +260,6 @@ - @@ -354,7 +350,6 @@ - @@ -392,8 +387,6 @@ - - @@ -3474,20 +3467,6 @@ WelderManageView.aspx - - index.aspx - ASPXCodeBehind - - - index.aspx - - - index.aspx - ASPXCodeBehind - - - index.aspx - Encrypt.aspx ASPXCodeBehind @@ -3495,13 +3474,6 @@ Encrypt.aspx - - index.aspx - ASPXCodeBehind - - - index.aspx - HardFeedback.aspx ASPXCodeBehind @@ -3586,13 +3558,6 @@ HotProessTrustItemEdit.aspx - - index.aspx - ASPXCodeBehind - - - index.aspx - Components.aspx ASPXCodeBehind @@ -4424,20 +4389,6 @@ imageUp.ashx - - index.aspx - ASPXCodeBehind - - - index.aspx - - - index.aspx - ASPXCodeBehind - - - index.aspx - CheckManage.aspx ASPXCodeBehind @@ -4902,6 +4853,7 @@ + diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 126cdf8..046bc87 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -11,37 +11,5 @@ - - - - - Login.aspx - SpecificPage - True - False - False - False - - - - - - - - - True - False - True - True - 0 - / - http://localhost:50794/ - False - False - - - - - - + \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/Global.asax.cs b/HJGL/FineUIPro.Web/Global.asax.cs index 618cce5..834db2a 100644 --- a/HJGL/FineUIPro.Web/Global.asax.cs +++ b/HJGL/FineUIPro.Web/Global.asax.cs @@ -115,15 +115,18 @@ } else { - int rnum = Funs.GetRandomNum(1, jotList.Count()); - int j = 1; - foreach (var g in jotList) + if (jotList.Count() > 0) { - if (rnum == j) + int rnum = Funs.GetRandomNum(1, jotList.Count()); + int j = 1; + foreach (var g in jotList) { - BLL.Batch_PointBatchItemService.UpdatePointBatchItem(g.PointBatchItemId, "1", System.DateTime.Now, null); + if (rnum == j) + { + BLL.Batch_PointBatchItemService.UpdatePointBatchItem(g.PointBatchItemId, "1", System.DateTime.Now, null); + } + j++; } - j++; } } diff --git a/HJGL/FineUIPro.Web/Images/index.aspx b/HJGL/FineUIPro.Web/Images/index.aspx deleted file mode 100644 index 03f1726..0000000 --- a/HJGL/FineUIPro.Web/Images/index.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="FineUIPro.Web.Images.index" %> - - - - - - - - - -
-
-
-
- - diff --git a/HJGL/FineUIPro.Web/Images/index.aspx.cs b/HJGL/FineUIPro.Web/Images/index.aspx.cs deleted file mode 100644 index 7a39b97..0000000 --- a/HJGL/FineUIPro.Web/Images/index.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Images -{ - public partial class index : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/Images/index.aspx.designer.cs b/HJGL/FineUIPro.Web/Images/index.aspx.designer.cs deleted file mode 100644 index c086ed8..0000000 --- a/HJGL/FineUIPro.Web/Images/index.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.Images -{ - - - public partial class index - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/HJGL/FineUIPro.Web/Scripts/index.aspx b/HJGL/FineUIPro.Web/Scripts/index.aspx deleted file mode 100644 index 12a7e2b..0000000 --- a/HJGL/FineUIPro.Web/Scripts/index.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="FineUIPro.Web.Scripts.index" %> - - - - - - - - - -
-
-
-
- - diff --git a/HJGL/FineUIPro.Web/Scripts/index.aspx.cs b/HJGL/FineUIPro.Web/Scripts/index.aspx.cs deleted file mode 100644 index 5a2e749..0000000 --- a/HJGL/FineUIPro.Web/Scripts/index.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Scripts -{ - public partial class index : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/Scripts/index.aspx.designer.cs b/HJGL/FineUIPro.Web/Scripts/index.aspx.designer.cs deleted file mode 100644 index 18650e6..0000000 --- a/HJGL/FineUIPro.Web/Scripts/index.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.Scripts -{ - - - public partial class index - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/HJGL/FineUIPro.Web/Styles/index.aspx b/HJGL/FineUIPro.Web/Styles/index.aspx deleted file mode 100644 index bed758a..0000000 --- a/HJGL/FineUIPro.Web/Styles/index.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="FineUIPro.Web.Styles.index" %> - - - - - - - - - -
-
-
-
- - diff --git a/HJGL/FineUIPro.Web/Styles/index.aspx.cs b/HJGL/FineUIPro.Web/Styles/index.aspx.cs deleted file mode 100644 index 72eafe6..0000000 --- a/HJGL/FineUIPro.Web/Styles/index.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Styles -{ - public partial class index : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/Styles/index.aspx.designer.cs b/HJGL/FineUIPro.Web/Styles/index.aspx.designer.cs deleted file mode 100644 index c34bdbf..0000000 --- a/HJGL/FineUIPro.Web/Styles/index.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.Styles -{ - - - public partial class index - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index 9ecdad1..8868ed3 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -9,7 +9,7 @@
- + @@ -51,7 +51,7 @@ - + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs index 0966a87..6c475bd 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs @@ -303,7 +303,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport ws.SetColumnWidth(6, (int)(6.33 * 256)); ws.SetColumnWidth(7, (int)(9.11 * 256)); ws.SetColumnWidth(8, (int)(8.33 * 256)); - ws.SetColumnWidth(9, (int)(7.44 * 256)); + ws.SetColumnWidth(9, (int)(8.40 * 256)); ws.SetColumnWidth(10, (int)(15.67 * 256)); ws.SetColumnWidth(11, (int)(11.67 * 256)); ws.SetColumnWidth(12, (int)(8.22 * 256)); @@ -315,70 +315,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport ws.SetColumnWidth(18, (int)(7.89 * 256)); ws.SetColumnWidth(19, (int)(9.33 * 256)); #endregion - - //#region 数据部分 - //DataTable dt = GetDataTable(); - //int totalCount = dt.Rows.Count; - //int pageSize = 62; - //var pageNum = - //totalCount < pageSize ? 1 - // : Math.Ceiling((float)(totalCount - pageSize) / pageSize) + 1; - //var style3 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 9, false, false, "sans-serif"); - - //for (int i = 1; i <= pageNum; i++) - //{ - - - // ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 3, rowIndex + 66, style3, 0, 19); - // var tIndex = 3 + rowIndex; - // var dStart = 0; - // var dEnd = 0; - // if (i == 1) - // { - // dStart = 0; - // dEnd = pageSize; - // } - // else - // { - // dStart = i == 2 ? pageSize : ((i - 2) * pageSize) + pageSize; - // dEnd = ((i - 1) * pageSize) + pageSize; - // } - - // var pageTb = GetPageToTable(dt, dStart, dEnd); - // for (int j = 0; j < pageTb.Rows.Count; j++) - // { - // int dataIndex = tIndex + j; - // ws.GetRow(dataIndex).GetCell(0).SetCellValue(j + 1); - // ws.GetRow(dataIndex).GetCell(1).SetCellValue(pageTb.Rows[j]["SingleNumber"].ToString()); - // ws.GetRow(dataIndex).GetCell(2).SetCellValue(pageTb.Rows[j]["DrawingsNum"].ToString()); - // ws.GetRow(dataIndex).GetCell(3).SetCellValue(pageTb.Rows[j]["WeldJointCode"].ToString()); - // ws.GetRow(dataIndex).GetCell(4).SetCellValue(pageTb.Rows[j]["WeldTypeCode"].ToString()); - // ws.GetRow(dataIndex).GetCell(5).SetCellValue(pageTb.Rows[j]["WeldingLocationCode"].ToString()); - // ws.GetRow(dataIndex).GetCell(6).SetCellValue(pageTb.Rows[j]["Size"].ToString()); - // ws.GetRow(dataIndex).GetCell(7).SetCellValue(pageTb.Rows[j]["Specification"].ToString()); - // ws.GetRow(dataIndex).GetCell(8).SetCellValue(pageTb.Rows[j]["WelderCode"].ToString()); - // ws.GetRow(dataIndex).GetCell(9).SetCellValue(pageTb.Rows[j]["ComponentsName1"].ToString()); - // ws.GetRow(dataIndex).GetCell(10).SetCellValue(pageTb.Rows[j]["MaterialCode1"].ToString()); - // ws.GetRow(dataIndex).GetCell(11).SetCellValue(pageTb.Rows[j]["HeartNo1"].ToString()); - // ws.GetRow(dataIndex).GetCell(12).SetCellValue(pageTb.Rows[j]["ComponentsName2"].ToString()); - // ws.GetRow(dataIndex).GetCell(13).SetCellValue(pageTb.Rows[j]["MaterialCode2"].ToString()); - // ws.GetRow(dataIndex).GetCell(14).SetCellValue(pageTb.Rows[j]["HeartNo2"].ToString()); - // ws.GetRow(dataIndex).GetCell(15).SetCellValue(pageTb.Rows[j]["WeldingMethodName"].ToString()); - // ws.GetRow(dataIndex).GetCell(16).SetCellValue("ACC"); - // ws.GetRow(dataIndex).GetCell(17).SetCellValue("ACC"); - // ws.GetRow(dataIndex).GetCell(18).SetCellValue(pageTb.Rows[j]["WeldingDate"].ToString()); - // ws.GetRow(dataIndex).GetCell(19).SetCellValue(pageTb.Rows[j]["Remark"].ToString()); - // ws.GetRow(dataIndex).Height = 10 * 20; - // } - // rowIndex += tIndex + 63; - //} - - //#endregion + const int pageSize = 64; DataTable dt = GetDataTable(); var style3 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 9, false, false, "sans-serif"); - ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 3, dt.Rows.Count+3, style3, 0, 19); + ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 3, dt.Rows.Count+2, style3, 0, 19); for (int i = 0; i < dt.Rows.Count; i++) { int startIndex = (i + 3); @@ -410,6 +352,34 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport } } + if (dt.Rows.Count > 0) + { + string weldingDate = string.Empty; + if (txtStarTime.Text == txtEndTime.Text) + { + weldingDate = txtStarTime.Text; + } + else + { + weldingDate = txtStarTime.Text + "-" + txtEndTime.Text; + } + var style4 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 10, true,true, "Arial"); + + ws = ExcelCreateRow(ws, hssfworkbook, dt.Rows.Count + 3, dt.Rows.Count + 3, style4, 0, 19); + var distinctPipelineCode = dt.AsEnumerable().GroupBy(row => row.Field("PipelineCode")).Select(group => group.First()); + var distinctWelder = dt.AsEnumerable().GroupBy(row => row.Field("WelderCode")).Select(group => group.First()); + decimal sumSize = decimal.Parse(dt.Compute("sum(Size)", "").ToString()); + + ws.GetRow(dt.Rows.Count + 3).GetCell(0).SetCellValue("合计"); + ws.GetRow(dt.Rows.Count + 3).GetCell(1).SetCellValue($"{distinctPipelineCode.Count().ToString()}"); + ws.GetRow(dt.Rows.Count + 3).GetCell(3).SetCellValue($"{dt.Rows.Count}"); + ws.GetRow(dt.Rows.Count + 3).GetCell(6).SetCellValue($"{sumSize}"); + ws.GetRow(dt.Rows.Count + 3).GetCell(8).SetCellValue($"{distinctWelder.Count().ToString()}"); + + + + } + #region 页脚部分 IFooter footer = ws.Footer; string str = "CC7: 监理： Worley:"; @@ -420,9 +390,6 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport #endregion - #region - - #endregion ws.FitToPage = false; ws.SetMargin(MarginType.LeftMargin, (double)1.2 / 3); @@ -459,53 +426,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport Response.End(); } - /// - /// 导出方法 - /// - /// - /// - //private string GetGridTableHtml(Grid grid) - //{ - // StringBuilder sb = new StringBuilder(); - // grid.PageSize = 500000; - // BindGrid(); - - // sb.Append(""); - // sb.Append(""); - // sb.Append(""); - // foreach (GridColumn column in grid.Columns) - // { - // sb.AppendFormat("", column.HeaderText); - // } - // sb.Append(""); - // foreach (GridRow row in grid.Rows) - // { - // sb.Append(""); - // foreach (GridColumn column in grid.Columns) - // { - // string html = row.Values[column.ColumnIndex].ToString(); - // if (column.ColumnID == "tfNumber") - // { - // html = (row.FindControl("labNumber") as AspNet.Label).Text; - // } - // if (column.ColumnID == "tfIsHotProess") - // { - // html = (row.FindControl("lblIsHotProess") as AspNet.Label).Text; - // } - // //if (column.ColumnID == "tfif_dk") - // //{ - // // html = (row.FindControl("lblif_dk") as AspNet.Label).Text; - // //} - // sb.AppendFormat("", html); - // } - - // sb.Append(""); - // } - // sb.Append("
{0}
{0}
"); - - // return sb.ToString(); - //} - #endregion + #endregion #region 格式化字符串 /// diff --git a/HJGL/WebApi/WebApi.csproj.user b/HJGL/WebApi/WebApi.csproj.user index 6db81e9..33091aa 100644 --- a/HJGL/WebApi/WebApi.csproj.user +++ b/HJGL/WebApi/WebApi.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU FolderProfile diff --git a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache index 2d1ab93..ad71a05 100644 Binary files a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache and b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache differ