diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index b25f68f8..8d9736a5 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3286,6 +3286,11 @@
///
public const string EquipmentTemplateUrl = "File\\Excel\\DataIn\\设备信息导入模板.xls";
+ ///
+ /// 策划评审意见收集汇总表模板文件原始虚拟路径
+ ///
+ public const string OpinionTemplateUrl = "File\\Excel\\DataOut\\策划评审意见收集汇总表.xlsx";
+
#endregion
#region 初始化上传路径
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index ae0d9ca7..13fede0f 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -65,3 +65,159 @@ IP地址:::1
出错时间:06/05/2023 15:21:11
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:空文件名是非法的。
+参数名: sourceFileName
+错误堆栈:
+ 在 System.IO.File.Copy(String sourceFileName, String destFileName)
+ 在 FineUIPro.Web.ZHGL.Plan.MainContract.Grid1_RowCommand(Object sender, GridCommandEventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\ZHGL\Plan\MainContract.aspx.cs:行号 371
+ 在 FineUIPro.Grid.OnRowCommand(GridCommandEventArgs e)
+ 在 (Grid , GridCommandEventArgs )
+ 在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
+ 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+ 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/05/2023 20:03:01
+出错文件:http://localhost:14646/ZHGL/Plan/MainContract.aspx
+IP地址:::1
+操作人员:王志亮
+
+出错时间:06/05/2023 20:03:01
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:空文件名是非法的。
+参数名: sourceFileName
+错误堆栈:
+ 在 System.IO.File.Copy(String sourceFileName, String destFileName)
+ 在 FineUIPro.Web.ZHGL.Plan.MainContract.Grid1_RowCommand(Object sender, GridCommandEventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\ZHGL\Plan\MainContract.aspx.cs:行号 371
+ 在 FineUIPro.Grid.OnRowCommand(GridCommandEventArgs e)
+ 在 (Grid , GridCommandEventArgs )
+ 在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
+ 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+ 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/05/2023 20:03:06
+出错文件:http://localhost:14646/ZHGL/Plan/MainContract.aspx
+IP地址:::1
+操作人员:王志亮
+
+出错时间:06/05/2023 20:03:06
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:服务器无法在发送 HTTP 标头之后设置内容类型。
+错误堆栈:
+ 在 System.Web.HttpResponse.set_ContentType(String value)
+ 在 (HttpResponse , String )
+ 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM()
+ 在 (xCmAQBtUiwmKoGvxhPONMYvYbMln )
+ 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM(Object , EventArgs )
+ 在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/05/2023 20:07:48
+出错文件:http://localhost:14646/ZHGL/Plan/MainContract.aspx
+IP地址:::1
+操作人员:王志亮
+
+出错时间:06/05/2023 20:07:48
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:服务器无法在发送 HTTP 标头之后设置内容类型。
+错误堆栈:
+ 在 System.Web.HttpResponse.set_ContentType(String value)
+ 在 (HttpResponse , String )
+ 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM()
+ 在 (xCmAQBtUiwmKoGvxhPONMYvYbMln )
+ 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM(Object , EventArgs )
+ 在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/05/2023 20:12:29
+出错文件:http://localhost:14646/ZHGL/Plan/MainContract.aspx
+IP地址:::1
+操作人员:王志亮
+
+出错时间:06/05/2023 20:12:29
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:服务器无法在发送 HTTP 标头之后设置内容类型。
+错误堆栈:
+ 在 System.Web.HttpResponse.set_ContentType(String value)
+ 在 (HttpResponse , String )
+ 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM()
+ 在 (xCmAQBtUiwmKoGvxhPONMYvYbMln )
+ 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM(Object , EventArgs )
+ 在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/05/2023 20:16:08
+出错文件:http://localhost:14646/ZHGL/Plan/MainContract.aspx
+IP地址:::1
+操作人员:王志亮
+
+出错时间:06/05/2023 20:16:08
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:服务器无法在发送 HTTP 标头之后设置内容类型。
+错误堆栈:
+ 在 System.Web.HttpResponse.set_ContentType(String value)
+ 在 (HttpResponse , String )
+ 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM()
+ 在 (xCmAQBtUiwmKoGvxhPONMYvYbMln )
+ 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM(Object , EventArgs )
+ 在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/05/2023 20:17:29
+出错文件:http://localhost:14646/ZHGL/Plan/MainContract.aspx
+IP地址:::1
+操作人员:王志亮
+
+出错时间:06/05/2023 20:17:29
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:服务器无法在发送 HTTP 标头之后设置内容类型。
+错误堆栈:
+ 在 System.Web.HttpResponse.set_ContentType(String value)
+ 在 (HttpResponse , String )
+ 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM()
+ 在 (xCmAQBtUiwmKoGvxhPONMYvYbMln )
+ 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM(Object , EventArgs )
+ 在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/05/2023 20:20:05
+出错文件:http://localhost:14646/ZHGL/Plan/MainContract.aspx
+IP地址:::1
+操作人员:王志亮
+
+出错时间:06/05/2023 20:20:05
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:服务器无法在发送 HTTP 标头之后设置内容类型。
+错误堆栈:
+ 在 System.Web.HttpResponse.set_ContentType(String value)
+ 在 (HttpResponse , String )
+ 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM()
+ 在 (xCmAQBtUiwmKoGvxhPONMYvYbMln )
+ 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM(Object , EventArgs )
+ 在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/05/2023 20:24:09
+出错文件:http://localhost:14646/ZHGL/Plan/MainContract.aspx
+IP地址:::1
+操作人员:王志亮
+
+出错时间:06/05/2023 20:24:09
+
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/策划评审意见收集汇总表.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/策划评审意见收集汇总表.xlsx
new file mode 100644
index 00000000..dc15dbc7
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataOut/策划评审意见收集汇总表.xlsx differ
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 9dbf19bd..806eddba 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -95,6 +95,9 @@
False
..\FineUIPro\FineUIPro.dll
+
+ ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll
+
False
False
@@ -110,17 +113,38 @@
..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll
+
+ ..\packages\DotNetCore.NPOI.Core.1.2.3\lib\net461\NPOI.dll
+
+
+ ..\packages\DotNetCore.NPOI.1.2.3\lib\net461\NPOI.OOXML.dll
+
+
+ ..\packages\DotNetCore.NPOI.OpenXml4Net.1.2.3\lib\net461\NPOI.OpenXml4Net.dll
+
+
+ ..\packages\DotNetCore.NPOI.OpenXmlFormats.1.2.3\lib\net461\NPOI.OpenXmlFormats.dll
+
..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll
+
+ ..\packages\System.Drawing.Common.4.5.0\lib\net461\System.Drawing.Common.dll
+
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+
+
+ ..\packages\System.Text.Encoding.CodePages.4.5.0\lib\net461\System.Text.Encoding.CodePages.dll
+
@@ -1094,6 +1118,7 @@
+
diff --git a/SGGL/FineUIPro.Web/NOTICE.TXT b/SGGL/FineUIPro.Web/NOTICE.TXT
new file mode 100644
index 00000000..eb262a7c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/NOTICE.TXT
@@ -0,0 +1,181 @@
+dotnetcore/NPOI is a downstream project of the tonyqus/NPOI project, which is licensed under the Apache 2.0 license and available at: https://github.com/nissl-lab/npoi
+
+----------------------------------------------
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "{}" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx
index c91b6941..38c4e31d 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx
@@ -18,7 +18,7 @@
DataIDField="MainContractId" AllowSorting="true" ForceFit="true"
SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
- EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
+ EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
EnableTextSelection="True">
@@ -118,6 +118,9 @@
+
+