From 6f82435bd26d253823f71bfbda12608c6ef1d91b Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 24 Jul 2024 11:36:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/BLL/Common/Const.cs | 4 +
SGGL/FineUIPro.Web/ErrLog.txt | 56 ++++
.../File/Excel/DataOut/周进度计划.xlsx | Bin 0 -> 10048 bytes
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +-
.../HSSE/SitePerson/PersonListEdit.aspx.cs | 16 +-
SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx | 5 +-
.../FineUIPro.Web/JDGL/Check/WeekPlan.aspx.cs | 273 ++++++++++++++++++
.../JDGL/Check/WeekPlan.aspx.designer.cs | 9 +
8 files changed, 356 insertions(+), 9 deletions(-)
create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataOut/周进度计划.xlsx
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 8127544e..52fcad0c 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -4735,6 +4735,10 @@ namespace BLL
/// 月度计划情况模板文件原始虚拟路径
///
public const string MonthPlanOutTemplateUrl = "File\\Excel\\DataOut\\月度计划情况.xlsx";
+ ///
+ /// 周进度计划模板文件原始虚拟路径
+ ///
+ public const string WeekPlanOutTemplateUrl = "File\\Excel\\DataOut\\周进度计划.xlsx";
#endregion
#endregion
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index f2ada3bd..54e8e448 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -450,3 +450,59 @@ IP地址:::1
出错时间:07/15/2024 13:19:20
出错时间:07/15/2024 13:19:20
+
+错误信息开始=====>
+错误类型:ChangeConflictException
+错误信息:2 的 1 更新失败。
+错误堆栈:
+ 在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
+ 在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
+ 在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\ProjectData\ProjectService.cs:行号 193
+ 在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 284
+ 在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 189
+ 在 FineUIPro.Button.OnClick(EventArgs e)
+ 在 (Button , EventArgs )
+ 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+ 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+ 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/23/2024 17:52:24
+出错文件:http://localhost:8579/ProjectData/ProjectSetSave.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/23/2024 17:52:24
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能添加已经存在的实体。
+错误堆栈:
+ 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
+ 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
+ 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 318
+出错时间:07/23/2024 18:18:27
+出错时间:07/23/2024 18:18:27
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能添加已经存在的实体。
+错误堆栈:
+ 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
+ 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
+ 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 318
+出错时间:07/24/2024 10:37:35
+出错时间:07/24/2024 10:37:35
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能添加已经存在的实体。
+错误堆栈:
+ 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
+ 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
+ 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 318
+出错时间:07/24/2024 11:14:23
+出错时间:07/24/2024 11:14:23
+
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/周进度计划.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/周进度计划.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..91778178280f1fd49d50f0a820af6cd2161bd710
GIT binary patch
literal 10048
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
-
+