From ac7aec17178c512e011acfab534e3c39d7380d8f Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Mon, 28 Aug 2023 09:47:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?20230828=E4=BA=BA=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/Person/Person_PersonsService.cs | 2 +- SGGL/FineUIPro.Web/ErrLog.txt | 41 ------------------------ 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs index 92002ff1..487406ed 100644 --- a/SGGL/BLL/Person/Person_PersonsService.cs +++ b/SGGL/BLL/Person/Person_PersonsService.cs @@ -94,7 +94,7 @@ namespace BLL } } - if (workPostIds.Count() > 0) + if (workPostIds != null && workPostIds.Count() > 0) { getDataList = getDataList.Where(e => workPostIds.Contains(e.WorkPostId)); } diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index f421dbbd..e69de29b 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,41 +0,0 @@ - -错误信息开始=====> -错误类型:SqlException -错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.ExecuteReader() - 在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult) - 在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries) - 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) - 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression) - 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) - 在 FineUIPro.Web.common.main.getSitePerson() 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 90 - 在 FineUIPro.Web.common.main.Page_Load(Object sender, EventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 20 - 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) - 在 System.EventHandler.Invoke(Object sender, EventArgs e) - 在 System.Web.UI.Control.OnLoad(EventArgs e) - 在 System.Web.UI.Control.LoadRecursive() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -----错误类型:Win32Exception -----错误信息: -----等待的操作过时。 -----错误堆栈: - 出错时间:08/25/2023 15:46:55 -出错文件:http://localhost:8797/common/main.aspx -IP地址:::1 -操作人员:JT - -出错时间:08/25/2023 15:46:55 - From 991eb07f0bbdede38f85d550fccc9b559db20e51 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 30 Aug 2023 14:52:34 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-08-30.sql | 124 ++++++ SGGL/BLL/BLL.csproj | 1 + SGGL/BLL/CQMS/WBS/WorkPackageService.cs | 18 +- SGGL/BLL/Common/Const.cs | 4 + .../CQMS/WBS/ControlItemAndCycleShow.aspx | 14 +- .../CQMS/WBS/ControlItemAndCycleShow.aspx.cs | 99 +++++ .../ControlItemAndCycleShow.aspx.designer.cs | 27 ++ .../CQMS/WBS/WorkPackageSet1.aspx.cs | 6 +- .../CQMS/WBS/WorkPackageSet2.aspx.cs | 6 +- .../CQMS/WBS/WorkPackageSet2In.aspx.cs | 2 +- .../Controls/ChartControl.ascx.cs | 48 +-- SGGL/FineUIPro.Web/ErrLog.txt | 51 +++ .../File/Excel/DataIn/WBS编码规则.xlsx | Bin 0 -> 15695 bytes .../HJGL/PreDesign/MaterialManageIn.aspx.cs | 10 +- .../JDGL/Check/CompleteInput.aspx | 18 +- .../JDGL/Check/CompleteInput.aspx.cs | 44 ++- .../JDGL/Check/EarnedValueCurve.aspx | 16 +- .../JDGL/Check/EarnedValueCurve.aspx.cs | 44 +-- SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx | 12 + SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs | 18 +- .../JDGL/Check/PlanSet.aspx.designer.cs | 27 ++ SGGL/Model/Model.cs | 368 +++++++++++++++++- 22 files changed, 862 insertions(+), 95 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-08-30.sql create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/WBS编码规则.xlsx diff --git a/DataBase/版本日志/SGGLDB_V2023-08-30.sql b/DataBase/版本日志/SGGLDB_V2023-08-30.sql new file mode 100644 index 00000000..f1429d8a --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-08-30.sql @@ -0,0 +1,124 @@ + +ALTER VIEW [dbo].[View_WBS] +AS +select '1' as Id,'0' as SupId ,'JZ' as Code, '' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate, +ProjectId from dbo.WBS_UnitWork +Union +select '2' as Id,'0' as SupId ,'AZ' as Code, 'װ' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate, +ProjectId from dbo.WBS_UnitWork +Union +select UnitWorkId as Id,ProjectType as SupId ,UnitWorkCode as Code, UnitWorkCode+'-'+UnitWorkName as Name,'UnitWork' as WBSType,PlanStartDate, PlanEndDate, +ProjectId from dbo.WBS_UnitWork +Union all +select WorkPackageId as id,UnitWorkId as SupId,WorkPackageCode as Code,WorkPackageCode+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate, +ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is null +Union all +select WorkPackageId as id,SuperWorkPackageId as SupId,WorkPackageCode as Code, WorkPackageCode+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate, +ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is not null + + + + + + +GO + + +alter table WBS_UnitWork add WBSCode nvarchar(50) null +GO +alter table WBS_WorkPackage add WBSCode nvarchar(50) null +GO +alter table WBS_ControlItemAndCycle add WBSCode nvarchar(50) null +GO + + +ALTER VIEW [dbo].[View_WBS] +AS +select '1' as Id,'0' as SupId ,'JZ' as Code, '' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as WBSCode, +ProjectId from dbo.WBS_UnitWork +Union +select '2' as Id,'0' as SupId ,'AZ' as Code, 'װ' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as WBSCode, +ProjectId from dbo.WBS_UnitWork +Union +select UnitWorkId as Id,ProjectType as SupId ,UnitWorkCode as Code, WBSCode+'-'+UnitWorkName as Name,'UnitWork' as WBSType,PlanStartDate, PlanEndDate,WBSCode, +ProjectId from dbo.WBS_UnitWork +Union all +select WorkPackageId as id,UnitWorkId as SupId,WorkPackageCode as Code,WBSCode+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,WBSCode, +ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is null +Union all +select WorkPackageId as id,SuperWorkPackageId as SupId,WorkPackageCode as Code, WBSCode+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,WBSCode, +ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is not null + + + + + + + +GO + + +update WBS_WorkPackage set PackageCode=(select PackageCode from WBS_WorkPackageInit w where w.WorkPackageCode=InitWorkPackageCode) +GO + +alter table [dbo].[WBS_WorkPackageDetail] add PlanValue decimal(18,2) null +alter table [dbo].[WBS_WorkPackageDetail] add ThisValue decimal(18,2) null +alter table [dbo].[WBS_WorkPackageParentDetail] add PlanValue decimal(18,2) null +alter table [dbo].[WBS_WorkPackageParentDetail] add ThisValue decimal(18,2) null +GO + + + +ALTER VIEW [dbo].[View_WBS_WorkPackageDetail] +AS +/********ϸ********/ +SELECT detail.WorkPackageDetailId, +detail.WorkPackageId, +detail.Months, +c.WorkPackageCode, +c.PackageContent, +c.ProjectId, +c.Unit, --λ +c.PlanProjectQuantity, --㹤 +c.RealProjectQuantity, --ʵʹ +CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from WBS_WorkPackageDetail where WorkPackageId=detail.WorkPackageId and Months<=detail.Months)) as TotalPlanNum, --ۼƼƻ +CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from WBS_WorkPackageDetail where WorkPackageId=detail.WorkPackageId and Months<=detail.Months)) as TotalThisNum, --ۼ +CONVERT(FLOAT,(select sum(ISNULL(PlanValue,0)) from WBS_WorkPackageDetail where WorkPackageId=detail.WorkPackageId and Months<=detail.Months)) as TotalPlanValue, --ۼƸ +CONVERT(FLOAT,(select sum(ISNULL(ThisValue,0)) from WBS_WorkPackageDetail where WorkPackageId=detail.WorkPackageId and Months<=detail.Months)) as TotalThisValue, --ۼʵʷ +CONVERT(FLOAT,ISNULL(detail.PlanNum,0)) as PlanNum, --¼ƻ +CONVERT(FLOAT,ISNULL(detail.ThisNum,0)) as ThisNum, -- +CONVERT(FLOAT,ISNULL(detail.PlanValue,0)) as PlanValue, --¸ +CONVERT(FLOAT,ISNULL(detail.ThisValue,0)) as ThisValue --ʵʷ +FROM dbo.WBS_WorkPackageDetail AS detail +LEFT JOIN WBS_WorkPackage AS c ON c.WorkPackageId=detail.WorkPackageId + + +GO + + + +ALTER VIEW [dbo].[View_WBS_WorkPackageParentDetail] +AS +/********ϸ********/ +SELECT detail.WorkPackageParentDetailId, +detail.ParentId, +detail.ProjectId, +detail.Months, +CONVERT(FLOAT,ISNULL(detail.PlanNum,0)) as PlanNum, --¼ƻ +CONVERT(FLOAT,ISNULL(detail.ThisNum,0)) as ThisNum, --ʵ +CONVERT(FLOAT,ISNULL(detail.PlanValue,0)) as PlanValue, --¸ +CONVERT(FLOAT,ISNULL(detail.ThisValue,0)) as ThisValue, --ʵʷ +CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from WBS_WorkPackageParentDetail +where ParentId=detail.ParentId and Months<=detail.Months)) as TotalPlanNum, --ۼƼƻ +CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from WBS_WorkPackageParentDetail +where ParentId=detail.ParentId and Months<=detail.Months)) as TotalThisNum, --ۼ +CONVERT(FLOAT,(select sum(ISNULL(PlanValue,0)) from WBS_WorkPackageParentDetail +where ParentId=detail.ParentId and Months<=detail.Months)) as TotalPlanValue, --ۼƸ +CONVERT(FLOAT,(select sum(ISNULL(ThisValue,0)) from WBS_WorkPackageParentDetail +where ParentId=detail.ParentId and Months<=detail.Months)) as TotalThisValue --ۼʵʷ +FROM dbo.WBS_WorkPackageParentDetail AS detail + + +GO + + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 1625bc72..b528abf7 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -41,6 +41,7 @@ prompt 4 false + latest diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs index 3489bc14..99ffa9fa 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs @@ -245,7 +245,7 @@ namespace BLL /// 获取模拟树表格 /// /// - public static DataTable GetAllTreeDataTable(string projectId, string IsOut) + public static DataTable GetAllTreeDataTable(string projectId, string IsOut, string startTime, string endTime) { using (var db = new Model.SGGLDB(Funs.ConnString)) { @@ -308,11 +308,11 @@ namespace BLL newList.Add(item); if (string.IsNullOrEmpty(IsOut)) { - AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString()); + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime); } else { - AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty); + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime); } a++; } @@ -427,29 +427,29 @@ namespace BLL } } - private static void AddDetail(List newList, List oldList, string id, string preCode) + private static void AddDetail(List newList, List oldList, string id, string preCode, string startTime, string endTime) { - var items = oldList.Where(x => x.SupId == id).OrderBy(x => x.Code); + var items = oldList.Where(x => x.SupId == id && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.WBSCode); int b = 1; foreach (var item in items) { item.Code = preCode + "." + b.ToString(); newList.Add(item); - AddDetail(newList, oldList, item.Id, item.Code); + AddDetail(newList, oldList, item.Id, item.Code, startTime, endTime); b++; } } - private static void AddDetail(List newList, List oldList, string id, string preCode, string prefix) + private static void AddDetail(List newList, List oldList, string id, string preCode, string prefix, string startTime, string endTime) { - var items = oldList.Where(x => x.SupId == id).OrderBy(x => x.Code); + var items = oldList.Where(x => x.SupId == id && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.WBSCode); int b = 1; foreach (var item in items) { item.Code = preCode + "." + b.ToString(); item.Name = prefix + "...." + item.Name; newList.Add(item); - AddDetail(newList, oldList, item.Id, item.Code, prefix + "...."); + AddDetail(newList, oldList, item.Id, item.Code, prefix + "....", startTime, endTime); b++; } } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 38850782..7de98660 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3290,6 +3290,10 @@ namespace BLL /// public const string WBSWorkPackageTemplateUrl = "File\\Excel\\DataIn\\WBS定制导入模板.xls"; /// + /// WBS编码规则 + /// + public const string WBSCodeTemplateUrl = "File\\Excel\\DataIn\\WBS编码规则.xlsx"; + /// /// 管道等级导入模板 /// public const string PipingClassTemplateUrl = "File\\Excel\\DataIn\\管道等级导入模板.xls"; diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx index 1967decd..380318f7 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx @@ -21,7 +21,7 @@
- + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs index 22fb1466..dd7ff903 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; using System.Web.UI.WebControls; @@ -557,5 +558,103 @@ namespace FineUIPro.Web.CQMS.WBS } return s; } + + /// + /// 生成项目WBS编码 + /// + /// + /// + protected void btnCreateCode_Click(object sender, EventArgs e) + { + Model.SGGLDB db = Funs.DB; + string projectCode = BLL.ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId); + var unitWorks = from x in db.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var workPackages = (from x in db.WBS_WorkPackage where x.ProjectId == this.CurrUser.LoginProjectId && x.IsApprove == true select x).ToList(); + var controlItemAndCycles = (from x in db.WBS_ControlItemAndCycle where x.ProjectId == this.CurrUser.LoginProjectId && x.IsApprove == true select x).ToList(); + foreach (var unitWork in unitWorks) + { + unitWork.WBSCode = projectCode + unitWork.UnitWorkCode; + var workPackage1s = workPackages.Where(x => x.UnitWorkId == unitWork.UnitWorkId && x.SuperWorkPack == null).OrderBy(x => x.WorkPackageCode); + foreach (var workPackage1 in workPackage1s) + { + if (!workPackage1.PackageContent.Contains("-")) + { + workPackage1.WBSCode = projectCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode; + } + else + { + workPackage1.WBSCode = projectCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode + workPackage1.WorkPackageCode.Substring(workPackage1.WorkPackageCode.Length - 2, 2); + } + UpdateWBSCode(db, workPackages, workPackage1.WorkPackageId, workPackage1.WBSCode, controlItemAndCycles); + } + } + db.SubmitChanges(); + ShowNotify("生成成功！", MessageBoxIcon.Success); + } + + private void UpdateWBSCode(Model.SGGLDB db, List workPackages, string workPackageId, string wbsCode, List controlItemAndCycles) + { + var childWorkPackages = workPackages.Where(x => x.SuperWorkPackageId == workPackageId); + if (childWorkPackages.Count() > 0) + { + foreach (var childWorkPackage in childWorkPackages) + { + if (!childWorkPackage.PackageContent.Contains("-")) + { + childWorkPackage.WBSCode = wbsCode + childWorkPackage.PackageCode; + } + else + { + childWorkPackage.WBSCode = wbsCode + childWorkPackage.PackageCode + childWorkPackage.WorkPackageCode.Substring(childWorkPackage.WorkPackageCode.Length - 2, 2); + } + UpdateWBSCode(db, workPackages, childWorkPackage.WorkPackageId, childWorkPackage.WBSCode, controlItemAndCycles); + } + } + else + { + var controlItemAndCycleItems = controlItemAndCycles.Where(x => x.WorkPackageId == workPackageId); + foreach (var controlItemAndCycleItem in controlItemAndCycleItems) + { + controlItemAndCycleItem.WBSCode = wbsCode + controlItemAndCycleItem.InitControlItemCode.Substring(controlItemAndCycleItem.InitControlItemCode.Length - 2, 2); + } + } + } + + #region 下载WBS编码规则文件 + /// + /// 下载WBS编码规则文件按钮 + /// + /// + /// + protected void btnFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载WBS编码规则文件吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel"))); + } + + /// + /// 下载导入模板 + /// + /// + /// + protected void PageManager1_CustomEvent(object sender, CustomEventArgs e) + { + if (e.EventArgument == "Confirm_OK") + { + string rootPath = Server.MapPath("~/"); + string filePath = Const.WBSCodeTemplateUrl; + string uploadfilepath = rootPath + filePath; + string fileName = Path.GetFileName(filePath); + FileInfo info = new FileInfo(uploadfilepath); + long fileSize = info.Length; + Response.ClearContent(); + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.ContentType = "excel/plain"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + Response.AddHeader("Content-Length", fileSize.ToString().Trim()); + Response.TransmitFile(uploadfilepath, 0, fileSize); + Response.End(); + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.designer.cs index 7fb27f27..4c7b00ed 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.designer.cs @@ -84,6 +84,33 @@ namespace FineUIPro.Web.CQMS.WBS { /// protected global::FineUIPro.Grid Grid1; + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnFile; + + /// + /// btnCreateCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnCreateCode; + /// /// Label3 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet1.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet1.aspx.cs index 5dc96655..4cc958cf 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet1.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet1.aspx.cs @@ -558,7 +558,7 @@ namespace FineUIPro.Web.CQMS.WBS newWorkPackage.PackageContent = workPackageProject.PackageContent + name; newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack; newWorkPackage.IsChild = workPackageProject.IsChild; - newWorkPackage.PackageCode = code; + newWorkPackage.PackageCode = workPackageProject.PackageCode; newWorkPackage.ProjectType = workPackageProject.ProjectType; newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode; newWorkPackage.SubItemType = GetSubItemTypeId(values.Value("SubItemType")); @@ -661,7 +661,7 @@ namespace FineUIPro.Web.CQMS.WBS newWorkPackage.PackageContent = workPackageProject.PackageContent + name; newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack; newWorkPackage.IsChild = workPackageProject.IsChild; - newWorkPackage.PackageCode = code; + newWorkPackage.PackageCode = workPackageProject.PackageCode; newWorkPackage.IsApprove = true; newWorkPackage.ProjectType = workPackageProject.ProjectType; newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode; @@ -732,7 +732,7 @@ namespace FineUIPro.Web.CQMS.WBS newWorkPackage.PackageContent = workPackageProject.PackageContent + name; newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack; newWorkPackage.IsChild = workPackageProject.IsChild; - newWorkPackage.PackageCode = code; + newWorkPackage.PackageCode = workPackageProject.PackageCode; newWorkPackage.ProjectType = workPackageProject.ProjectType; newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode; newWorkPackage.SubItemType = GetSubItemTypeId(values.Value("SubItemType")); diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs index 1a87f7f1..f47e26b6 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs @@ -590,7 +590,7 @@ namespace FineUIPro.Web.CQMS.WBS newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack; newWorkPackage.SuperWorkPackageId = WorkPackageId; newWorkPackage.IsChild = workPackageProject.IsChild; - newWorkPackage.PackageCode = code; + newWorkPackage.PackageCode = workPackageProject.PackageCode; newWorkPackage.ProjectType = workPackageProject.ProjectType; newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode; newWorkPackage.SubItemType = GetSubItemTypeId(values.Value("SubItemType")); @@ -690,7 +690,7 @@ namespace FineUIPro.Web.CQMS.WBS newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack; newWorkPackage.SuperWorkPackageId = WorkPackageId; newWorkPackage.IsChild = workPackageProject.IsChild; - newWorkPackage.PackageCode = code; + newWorkPackage.PackageCode = workPackageProject.PackageCode; newWorkPackage.IsApprove = true; newWorkPackage.ProjectType = workPackageProject.ProjectType; newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode; @@ -762,7 +762,7 @@ namespace FineUIPro.Web.CQMS.WBS newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack; newWorkPackage.SuperWorkPackageId = WorkPackageId; newWorkPackage.IsChild = workPackageProject.IsChild; - newWorkPackage.PackageCode = code; + newWorkPackage.PackageCode = workPackageProject.PackageCode; newWorkPackage.ProjectType = workPackageProject.ProjectType; newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode; newWorkPackage.SubItemType = GetSubItemTypeId(values.Value("SubItemType")); diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In.aspx.cs index d5d3e983..83d01fde 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In.aspx.cs @@ -519,7 +519,7 @@ namespace FineUIPro.Web.CQMS.WBS newWorkPackage.PackageContent = workPackageProject.PackageContent + "-" + txtName; newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack; newWorkPackage.SuperWorkPackageId = WorkPackageId; - newWorkPackage.PackageCode = code; + newWorkPackage.PackageCode = workPackageProject.PackageCode; newWorkPackage.ProjectType = workPackageProject.ProjectType; newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode; newWorkPackage.IsApprove = true; diff --git a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs index e34ec2fc..13fefb1b 100644 --- a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs +++ b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs @@ -322,47 +322,47 @@ namespace Web.Controls chartArea.Area3DStyle.Enable3D = false; chart1.ChartAreas.Add(chartArea); - chart1.Series.Add("本月概算工程量"); - chart1.Series.Add("本月实际工程量"); - chart1.Series.Add("累计概算工程量"); - chart1.Series.Add("累计实际工程量"); + chart1.Series.Add("本月概算费用"); + chart1.Series.Add("本月实际费用"); + chart1.Series.Add("累计概算费用"); + chart1.Series.Add("累计实际费用"); DataView dv = dt.DefaultView; - chart1.Series["本月概算工程量"].Points.DataBindXY(dv, "月份", dv, "本月概算工程量"); - chart1.Series["本月概算工程量"].ChartType = SeriesChartType.Column; + chart1.Series["本月概算费用"].Points.DataBindXY(dv, "月份", dv, "本月概算费用"); + chart1.Series["本月概算费用"].ChartType = SeriesChartType.Column; - for (int i = 0; i < chart1.Series["本月概算工程量"].Points.Count; i++) + for (int i = 0; i < chart1.Series["本月概算费用"].Points.Count; i++) { - chart1.Series["本月概算工程量"].Points[i].ToolTip = "本月概算工程量\n#VALX\n#VALY"; + chart1.Series["本月概算费用"].Points[i].ToolTip = "本月概算费用\n#VALX\n#VALY"; } - chart1.Series["本月实际工程量"].Points.DataBindXY(dv, "月份", dv, "本月实际工程量"); - chart1.Series["本月实际工程量"].ChartType = SeriesChartType.Column; + chart1.Series["本月实际费用"].Points.DataBindXY(dv, "月份", dv, "本月实际费用"); + chart1.Series["本月实际费用"].ChartType = SeriesChartType.Column; - for (int i = 0; i < chart1.Series["本月实际工程量"].Points.Count; i++) + for (int i = 0; i < chart1.Series["本月实际费用"].Points.Count; i++) { - chart1.Series["本月实际工程量"].Points[i].ToolTip = "本月实际工程量\n#VALX\n#VALY"; + chart1.Series["本月实际费用"].Points[i].ToolTip = "本月实际费用\n#VALX\n#VALY"; } - chart1.Series["累计概算工程量"].Points.DataBindXY(dv, "月份", dv, "累计概算工程量"); - chart1.Series["累计概算工程量"].ChartType = SeriesChartType.Spline; - chart1.Series["累计概算工程量"].Color = Color.MediumSeaGreen; - chart1.Series["累计概算工程量"].BorderWidth = 2; + chart1.Series["累计概算费用"].Points.DataBindXY(dv, "月份", dv, "累计概算费用"); + chart1.Series["累计概算费用"].ChartType = SeriesChartType.Spline; + chart1.Series["累计概算费用"].Color = Color.MediumSeaGreen; + chart1.Series["累计概算费用"].BorderWidth = 2; - for (int i = 0; i < chart1.Series["累计概算工程量"].Points.Count; i++) + for (int i = 0; i < chart1.Series["累计概算费用"].Points.Count; i++) { - chart1.Series["累计概算工程量"].Points[i].ToolTip = "累计概算工程量\n#VALX\n#VALY"; + chart1.Series["累计概算费用"].Points[i].ToolTip = "累计概算费用\n#VALX\n#VALY"; } - chart1.Series["累计实际工程量"].Points.DataBindXY(dv, "月份", dv, "累计实际工程量"); - chart1.Series["累计实际工程量"].ChartType = SeriesChartType.Spline; - chart1.Series["累计实际工程量"].Color = Color.Red; - chart1.Series["累计实际工程量"].BorderWidth = 2; + chart1.Series["累计实际费用"].Points.DataBindXY(dv, "月份", dv, "累计实际费用"); + chart1.Series["累计实际费用"].ChartType = SeriesChartType.Spline; + chart1.Series["累计实际费用"].Color = Color.Red; + chart1.Series["累计实际费用"].BorderWidth = 2; - for (int i = 0; i < chart1.Series["累计实际工程量"].Points.Count; i++) + for (int i = 0; i < chart1.Series["累计实际费用"].Points.Count; i++) { - chart1.Series["累计实际工程量"].Points[i].ToolTip = "累计实际工程量\n#VALX\n#VALY"; + chart1.Series["累计实际费用"].Points[i].ToolTip = "累计实际费用\n#VALX\n#VALY"; } Controls.Add(chart1); diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e69de29b..b1ff6990 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -0,0 +1,51 @@ + +错误信息开始=====> +错误类型:ThreadAbortException +错误信息:正在中止线程。 +错误堆栈: + 在 SNIReadSyncOverAsync(SNI_ConnWrapper* , SNI_Packet** , Int32 ) + 在 SNINativeMethodWrapper.SNIReadSyncOverAsync(SafeHandle pConn, IntPtr& packet, Int32 timeout) + 在 System.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync() + 在 System.Data.SqlClient.TdsParserStateObject.TryReadNetworkPacket() + 在 System.Data.SqlClient.TdsParserStateObject.TryPrepareBuffer() + 在 System.Data.SqlClient.TdsParserStateObject.TryReadByte(Byte& value) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.ExecuteReader() + 在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult) + 在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries) + 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) + 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression) + 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) + 在 BLL.GetDataService.CorrectingPersonInOutNumber(String projectId) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\OpenService\GetDataService.cs:行号 148 + 在 BLL.MonitorService.DoSynchData() 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\OpenService\MonitorService.cs:行号 2129 + 在 BLL.MonitorService.ColligateFormConfirmProcessEve(Object sender, ElapsedEventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\OpenService\MonitorService.cs:行号 110 +出错时间:08/30/2023 11:27:45 +出错时间:08/30/2023 11:27:45 + + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 FineUIPro.Web.indexProject.MenuSwitchMethod(String type) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 581 + 在 FineUIPro.Web.indexProject.btnJDGL_Click(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 711 + 在 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) +出错时间:08/30/2023 14:19:32 +出错文件:http://localhost:8797/indexProject.aspx?projectId=d93b0835-ffbd-4039-bed3-2df806adae56 +IP地址:::1 + +出错时间:08/30/2023 14:19:32 + diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/WBS编码规则.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/WBS编码规则.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..25446e959af2c40c7bc42e4f09ff9c2547fe4d26 GIT binary patch literal 15695 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 x.MainItemName == row2); if (mainItem == null) diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx index 1e536781..8812e0f3 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx @@ -39,18 +39,18 @@ <%----%> - + HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left"> + - - - - + + + + @@ -91,11 +91,11 @@ function onGridAfterEdit(event, value, params) { var me = this, columnId = params.columnId, rowId = params.rowId; - var str = F(hdIdClientID).ooIl1; - if (str == undefined) { + var str = F(hdIdClientID).getValue(); + if (str == undefined || str == '') { str = rowId; } - else { + else if(str.indexOf(rowId) == -1){ str = str + "," + rowId; } F(hdIdClientID).setValue(str); diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs index dfa3e85f..1fd43eaa 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs @@ -132,7 +132,7 @@ namespace FineUIPro.Web.JDGL.Check { errorInfos = string.Empty; string Id = Request.Params["Id"]; - DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty); + DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, null, null); Grid1.DataSource = table; Grid1.DataBind(); for (int i = 0; i < this.Grid1.Rows.Count; i++) @@ -178,9 +178,9 @@ namespace FineUIPro.Web.JDGL.Check private void Save() { - decimal changePlanNum = 0, changeThisNum = 0, //当月总变化完成成本、完成预算 - oldPlanNum = 0, oldThisNum = 0, - PlanNum = 0, ThisNum = 0; + decimal changePlanNum = 0, changePlanValue = 0, changeThisNum = 0, //当月总变化完成成本、完成预算 + oldPlanNum = 0, oldThisNum = 0, oldPlanValue = 0, + PlanNum = 0, ThisNum = 0, PlanValue = 0, PlanCost = 0, PlanProjectQuantity = 0; Model.SGGLDB db = Funs.DB; var oldViewInfos = from x in db.WBS_WorkPackage where x.ProjectId == this.CurrUser.LoginProjectId @@ -201,13 +201,17 @@ namespace FineUIPro.Web.JDGL.Check if (WorkPackage != null) { string WorkPackageId = WorkPackage.WorkPackageId; + PlanCost = WorkPackage.PlanCost ?? 0; + PlanProjectQuantity = WorkPackage.PlanProjectQuantity ?? 0; BLL.WorkPackageService.UpdateWorkPackage(WorkPackage); for (int j = 0; j < months.Count; j++) { oldPlanNum = 0; oldThisNum = 0; + oldPlanValue = 0; changePlanNum = 0; changeThisNum = 0; + changePlanValue = 0; string planNum = values.Value(string.Format("{0:yyyy-MM}", months[j]) + "Plan"); string thisNum = values.Value(string.Format("{0:yyyy-MM}", months[j]) + "This"); Model.WBS_WorkPackageDetail WorkPackageDetail = BLL.WorkPackageDetailService.GetWorkPackageDetailByWorkPackageIdAndMonths(WorkPackageId, months[j]); @@ -215,10 +219,20 @@ namespace FineUIPro.Web.JDGL.Check { oldPlanNum = WorkPackageDetail.PlanNum ?? 0; oldThisNum = WorkPackageDetail.ThisNum ?? 0; + oldPlanValue = WorkPackageDetail.PlanValue ?? 0; WorkPackageDetail.PlanNum = Funs.GetNewDecimalOrZero(planNum); WorkPackageDetail.ThisNum = Funs.GetNewDecimalOrZero(thisNum); + if (PlanProjectQuantity > 0 && WorkPackageDetail.PlanNum > 0) + { + WorkPackageDetail.PlanValue = decimal.Round(PlanCost * Funs.GetNewDecimalOrZero(planNum) / PlanProjectQuantity, 2); + } + else + { + WorkPackageDetail.PlanValue = 0; + } PlanNum = WorkPackageDetail.PlanNum ?? 0; ThisNum = WorkPackageDetail.ThisNum ?? 0; + PlanValue = WorkPackageDetail.PlanValue ?? 0; } else { @@ -228,21 +242,32 @@ namespace FineUIPro.Web.JDGL.Check WorkPackageDetail.Months = months[j]; WorkPackageDetail.PlanNum = Funs.GetNewDecimalOrZero(planNum); WorkPackageDetail.ThisNum = Funs.GetNewDecimalOrZero(thisNum); + if (PlanProjectQuantity > 0 && WorkPackageDetail.PlanNum > 0) + { + WorkPackageDetail.PlanValue = decimal.Round(PlanCost * Funs.GetNewDecimalOrZero(planNum) / PlanProjectQuantity, 2); + } + else + { + WorkPackageDetail.PlanValue = 0; + } PlanNum = WorkPackageDetail.PlanNum ?? 0; ThisNum = WorkPackageDetail.ThisNum ?? 0; + PlanValue = WorkPackageDetail.PlanValue ?? 0; db.WBS_WorkPackageDetail.InsertOnSubmit(WorkPackageDetail); } //累加变化值，计算总的变化值 changePlanNum += PlanNum - oldPlanNum; changeThisNum += ThisNum - oldThisNum; + changePlanValue += PlanValue - oldPlanValue; ////更新分部分项 - UpdateWorkPackageParent(db, WorkPackage.SuperWorkPackageId, months[j], changePlanNum, changeThisNum); + UpdateWorkPackageParent(db, WorkPackage.SuperWorkPackageId, months[j], changePlanNum, changeThisNum, changePlanValue); ////更新单位工程 Model.WBS_WorkPackageParentDetail unitWorkDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(WorkPackage.UnitWorkId, months[j]); if (unitWorkDetail != null) { unitWorkDetail.PlanNum += changePlanNum; unitWorkDetail.ThisNum += changeThisNum; + unitWorkDetail.PlanValue += changePlanValue; //BLL.WorkPackageParentDetailService.UpdateWorkPackageParentDetail(unitWorkDetail); } else @@ -253,6 +278,7 @@ namespace FineUIPro.Web.JDGL.Check unitWorkDetail.Months = months[j]; unitWorkDetail.PlanNum = changePlanNum; unitWorkDetail.ThisNum = changeThisNum; + unitWorkDetail.PlanValue = changePlanValue; //BLL.WorkPackageParentDetailService.AddWorkPackageParentDetail(unitWorkDetail); db.WBS_WorkPackageParentDetail.InsertOnSubmit(unitWorkDetail); } @@ -265,6 +291,7 @@ namespace FineUIPro.Web.JDGL.Check { projectType.PlanNum += changePlanNum; projectType.ThisNum += changeThisNum; + projectType.PlanValue += changePlanValue; //BLL.WorkPackageParentDetailService.UpdateWorkPackageParentDetail(cnProfessionDetail); } else @@ -276,6 +303,7 @@ namespace FineUIPro.Web.JDGL.Check projectType.Months = months[j]; projectType.PlanNum = changePlanNum; projectType.ThisNum = changeThisNum; + projectType.PlanValue = changePlanValue; //BLL.WorkPackageParentDetailService.AddWorkPackageParentDetail(cnProfessionDetail); db.WBS_WorkPackageParentDetail.InsertOnSubmit(projectType); } @@ -296,7 +324,7 @@ namespace FineUIPro.Web.JDGL.Check /// /// /// - private void UpdateWorkPackageParent(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal changePlanNum, decimal changeThisNum) + private void UpdateWorkPackageParent(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal changePlanNum, decimal changeThisNum, decimal changePlanValue) { Model.WBS_WorkPackage workPackage = db.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == SuperWorkPackageId); if (workPackage != null) @@ -306,6 +334,7 @@ namespace FineUIPro.Web.JDGL.Check { parentDetail.PlanNum += changePlanNum; parentDetail.ThisNum += changeThisNum; + parentDetail.PlanValue += changePlanValue; //BLL.WorkPackageParentDetailService.UpdateWorkPackageParentDetail(parentDetail); } else @@ -316,12 +345,13 @@ namespace FineUIPro.Web.JDGL.Check parentDetail.Months = months; parentDetail.PlanNum = changePlanNum; parentDetail.ThisNum = changeThisNum; + parentDetail.PlanValue = changePlanValue; //BLL.WorkPackageParentDetailService.AddWorkPackageParentDetail(parentDetail); db.WBS_WorkPackageParentDetail.InsertOnSubmit(parentDetail); } if (workPackage.SuperWorkPackageId != null) //还存在上级节点，需要继续循环 { - UpdateWorkPackageParent(db, workPackage.SuperWorkPackageId, months, changePlanNum, changeThisNum); + UpdateWorkPackageParent(db, workPackage.SuperWorkPackageId, months, changePlanNum, changeThisNum, changePlanValue); } } } diff --git a/SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx b/SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx index bc35682e..b513a780 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx @@ -42,17 +42,17 @@ - + - + - + - + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx.cs index f8ea22d8..6070e46f 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx.cs @@ -214,7 +214,7 @@ namespace FineUIPro.Web.JDGL.Check if (WorkPackage != null && BLL.WorkPackageService.GetAllWorkPackagesBySuperWorkPackageId(WorkPackage.WorkPackageId).Count == 0) { string strSql = "select distinct (cast(YEAR(Months) as varchar(4))+'.'+cast(MONTH(Months) as varchar(2))) as 月份,t.Months," + - "PlanNum as '本月概算工程量',ThisNum as '本月实际工程量',TotalPlanNum as '累计概算工程量',TotalThisNum as '累计实际工程量' " + + "PlanValue as '本月概算费用',ThisValue as '本月实际费用',TotalPlanValue as '累计概算费用',TotalThisValue as '累计实际费用' " + "from dbo.View_WBS_WorkPackageDetail as t where WorkPackageId=@Id order by t.Months"; //string date = DateTime.Now.Year + "-" + DateTime.Now.Month + "-01"; SqlParameter[] parameter = new SqlParameter[] @@ -228,39 +228,39 @@ namespace FineUIPro.Web.JDGL.Check decimal lastacwp = 0, acwp = 0, lastbcwp = 0, bcwp = 0; for (int i = 0; i < dt.Rows.Count; i++) { - dt.Rows[i]["本月概算工程量"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月概算工程量"].ToString()); - dt.Rows[i]["本月实际工程量"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月实际工程量"].ToString()); - acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计概算工程量"].ToString()); - bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计实际工程量"].ToString()); + dt.Rows[i]["本月概算费用"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月概算费用"].ToString()); + dt.Rows[i]["本月实际费用"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月实际费用"].ToString()); + acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计概算费用"].ToString()); + bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计实际费用"].ToString()); if (acwp == lastacwp) { if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now) { - dt.Rows[i]["累计概算工程量"] = DBNull.Value; + dt.Rows[i]["累计概算费用"] = DBNull.Value; } else { - dt.Rows[i]["累计概算工程量"] = acwp; + dt.Rows[i]["累计概算费用"] = acwp; } } else { - dt.Rows[i]["累计概算工程量"] = acwp; + dt.Rows[i]["累计概算费用"] = acwp; } if (bcwp == lastbcwp) { if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now) { - dt.Rows[i]["累计实际工程量"] = DBNull.Value; + dt.Rows[i]["累计实际费用"] = DBNull.Value; } else { - dt.Rows[i]["累计实际工程量"] = bcwp; + dt.Rows[i]["累计实际费用"] = bcwp; } } else { - dt.Rows[i]["累计实际工程量"] = bcwp; + dt.Rows[i]["累计实际费用"] = bcwp; } lastacwp = acwp; lastbcwp = bcwp; @@ -270,7 +270,7 @@ namespace FineUIPro.Web.JDGL.Check else { string strSql = "select distinct (cast(YEAR(Months) as varchar(4))+'.'+cast(MONTH(Months) as varchar(2))) as 月份,t.Months," + - "PlanNum as '本月概算工程量',ThisNum as '本月实际工程量',TotalPlanNum as '累计概算工程量',TotalThisNum as '累计实际工程量' " + + "PlanValue as '本月概算费用',ThisValue as '本月实际费用',TotalPlanValue as '累计概算费用',TotalThisValue as '累计实际费用' " + "from dbo.View_WBS_WorkPackageParentDetail as t where ParentId=@Id order by t.Months"; //string date = DateTime.Now.Year + "-" + DateTime.Now.Month + "-01"; SqlParameter[] parameter = new SqlParameter[] @@ -288,39 +288,39 @@ namespace FineUIPro.Web.JDGL.Check decimal lastacwp = 0, acwp = 0, lastbcwp = 0, bcwp = 0; for (int i = 0; i < dt.Rows.Count; i++) { - dt.Rows[i]["本月概算工程量"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月概算工程量"].ToString()); - dt.Rows[i]["本月实际工程量"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月实际工程量"].ToString()); - acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计概算工程量"].ToString()); - bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计实际工程量"].ToString()); + dt.Rows[i]["本月概算费用"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月概算费用"].ToString()); + dt.Rows[i]["本月实际费用"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月实际费用"].ToString()); + acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计概算费用"].ToString()); + bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计实际费用"].ToString()); if (acwp == lastacwp) { if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now) { - dt.Rows[i]["累计概算工程量"] = DBNull.Value; + dt.Rows[i]["累计概算费用"] = DBNull.Value; } else { - dt.Rows[i]["累计概算工程量"] = acwp; + dt.Rows[i]["累计概算费用"] = acwp; } } else { - dt.Rows[i]["累计概算工程量"] = acwp; + dt.Rows[i]["累计概算费用"] = acwp; } if (bcwp == lastbcwp) { if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now) { - dt.Rows[i]["累计实际工程量"] = DBNull.Value; + dt.Rows[i]["累计实际费用"] = DBNull.Value; } else { - dt.Rows[i]["累计实际工程量"] = bcwp; + dt.Rows[i]["累计实际费用"] = bcwp; } } else { - dt.Rows[i]["累计实际工程量"] = bcwp; + dt.Rows[i]["累计实际费用"] = bcwp; } lastacwp = acwp; lastbcwp = bcwp; diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx index c71bec83..935b788c 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx @@ -14,6 +14,10 @@ white-space: normal; word-break: break-all; } + + .f-grid-row.red { + background-color: red; + } @@ -29,6 +33,14 @@ + + + + + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs index 18ebb89c..a4f42f4c 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs @@ -28,7 +28,7 @@ namespace FineUIPro.Web.JDGL.Check private void BindGrid() { - DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty); + DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty,this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim()); Grid1.DataSource = table; Grid1.DataBind(); for (int i = 0; i < this.Grid1.Rows.Count; i++) @@ -54,6 +54,15 @@ namespace FineUIPro.Web.JDGL.Check cbIsMileStone.Checked = true; } } + if (!string.IsNullOrEmpty(this.Grid1.Rows[i].Values[10].ToString())) + { + DateTime planEndDate = Convert.ToDateTime(this.Grid1.Rows[i].Values[10].ToString()); + DateTime realEndDate = Funs.GetNewDateTimeOrNow(this.Grid1.Rows[i].Values[12].ToString()); + if (planEndDate < realEndDate) + { + Grid1.Rows[i].RowCssClass = "red"; + } + } } } @@ -180,7 +189,7 @@ namespace FineUIPro.Web.JDGL.Check { try { - DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, "Out"); + DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, "Out",this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim()); string projectNmae = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); if (!string.IsNullOrEmpty(projectNmae)) { @@ -357,5 +366,10 @@ namespace FineUIPro.Web.JDGL.Check } } #endregion + + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs index 0da2811c..77af5e57 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs @@ -66,6 +66,33 @@ namespace FineUIPro.Web.JDGL.Check { /// protected global::FineUIPro.TextBox hdId; + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + /// /// btnSave 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index f4242a3b..b9c7c7cd 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -289636,6 +289636,12 @@ namespace Model private string _WBSType; + private System.Nullable _PlanStartDate; + + private System.Nullable _PlanEndDate; + + private string _WBSCode; + private string _ProjectId; public View_WBS() @@ -289690,7 +289696,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(81)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(101)")] public string Name { get @@ -289722,6 +289728,54 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanStartDate", DbType="DateTime")] + public System.Nullable PlanStartDate + { + get + { + return this._PlanStartDate; + } + set + { + if ((this._PlanStartDate != value)) + { + this._PlanStartDate = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanEndDate", DbType="DateTime")] + public System.Nullable PlanEndDate + { + get + { + return this._PlanEndDate; + } + set + { + if ((this._PlanEndDate != value)) + { + this._PlanEndDate = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WBSCode", DbType="NVarChar(50)")] + public string WBSCode + { + get + { + return this._WBSCode; + } + set + { + if ((this._WBSCode != value)) + { + this._WBSCode = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] public string ProjectId { @@ -290134,10 +290188,18 @@ namespace Model private System.Nullable _TotalThisNum; + private System.Nullable _TotalPlanValue; + + private System.Nullable _TotalThisValue; + private System.Nullable _PlanNum; private System.Nullable _ThisNum; + private System.Nullable _PlanValue; + + private System.Nullable _ThisValue; + public View_WBS_WorkPackageDetail() { } @@ -290318,6 +290380,38 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalPlanValue", DbType="Float")] + public System.Nullable TotalPlanValue + { + get + { + return this._TotalPlanValue; + } + set + { + if ((this._TotalPlanValue != value)) + { + this._TotalPlanValue = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalThisValue", DbType="Float")] + public System.Nullable TotalThisValue + { + get + { + return this._TotalThisValue; + } + set + { + if ((this._TotalThisValue != value)) + { + this._TotalThisValue = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanNum", DbType="Float")] public System.Nullable PlanNum { @@ -290349,6 +290443,38 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanValue", DbType="Float")] + public System.Nullable PlanValue + { + get + { + return this._PlanValue; + } + set + { + if ((this._PlanValue != value)) + { + this._PlanValue = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ThisValue", DbType="Float")] + public System.Nullable ThisValue + { + get + { + return this._ThisValue; + } + set + { + if ((this._ThisValue != value)) + { + this._ThisValue = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_WBS_WorkPackageParentDetail")] @@ -290367,10 +290493,18 @@ namespace Model private System.Nullable _ThisNum; + private System.Nullable _PlanValue; + + private System.Nullable _ThisValue; + private System.Nullable _TotalPlanNum; private System.Nullable _TotalThisNum; + private System.Nullable _TotalPlanValue; + + private System.Nullable _TotalThisValue; + public View_WBS_WorkPackageParentDetail() { } @@ -290471,6 +290605,38 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanValue", DbType="Float")] + public System.Nullable PlanValue + { + get + { + return this._PlanValue; + } + set + { + if ((this._PlanValue != value)) + { + this._PlanValue = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ThisValue", DbType="Float")] + public System.Nullable ThisValue + { + get + { + return this._ThisValue; + } + set + { + if ((this._ThisValue != value)) + { + this._ThisValue = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalPlanNum", DbType="Float")] public System.Nullable TotalPlanNum { @@ -290502,6 +290668,38 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalPlanValue", DbType="Float")] + public System.Nullable TotalPlanValue + { + get + { + return this._TotalPlanValue; + } + set + { + if ((this._TotalPlanValue != value)) + { + this._TotalPlanValue = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalThisValue", DbType="Float")] + public System.Nullable TotalThisValue + { + get + { + return this._TotalThisValue; + } + set + { + if ((this._TotalThisValue != value)) + { + this._TotalThisValue = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Welder_WelderQualify")] @@ -292136,6 +292334,8 @@ namespace Model private System.Nullable _RealEndDate; + private string _WBSCode; + private EntityRef _WBS_WorkPackage; #region 可扩展性方法定义 @@ -292184,6 +292384,8 @@ namespace Model partial void OnCheckAcceptTypeChanged(); partial void OnRealEndDateChanging(System.Nullable value); partial void OnRealEndDateChanged(); + partial void OnWBSCodeChanging(string value); + partial void OnWBSCodeChanged(); #endregion public WBS_ControlItemAndCycle() @@ -292616,6 +292818,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WBSCode", DbType="NVarChar(50)")] + public string WBSCode + { + get + { + return this._WBSCode; + } + set + { + if ((this._WBSCode != value)) + { + this.OnWBSCodeChanging(value); + this.SendPropertyChanging(); + this._WBSCode = value; + this.SendPropertyChanged("WBSCode"); + this.OnWBSCodeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ControlItemAndCycle_WBS_ControlItemAndCycle", Storage="_WBS_WorkPackage", ThisKey="WorkPackageId", OtherKey="WorkPackageId", IsForeignKey=true)] public WBS_WorkPackage WBS_WorkPackage { @@ -293779,6 +294001,8 @@ namespace Model private System.Nullable _JDWeights; + private string _WBSCode; + private EntitySet _Accident_AccidentPersonRecord; private EntitySet _Accident_AccidentReport; @@ -293869,6 +294093,8 @@ namespace Model partial void OnPlanCostChanged(); partial void OnJDWeightsChanging(System.Nullable value); partial void OnJDWeightsChanged(); + partial void OnWBSCodeChanging(string value); + partial void OnWBSCodeChanged(); #endregion public WBS_UnitWork() @@ -294292,6 +294518,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WBSCode", DbType="NVarChar(50)")] + public string WBSCode + { + get + { + return this._WBSCode; + } + set + { + if ((this._WBSCode != value)) + { + this.OnWBSCodeChanging(value); + this.SendPropertyChanging(); + this._WBSCode = value; + this.SendPropertyChanged("WBSCode"); + this.OnWBSCodeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_ProjectData_WorkArea", Storage="_Accident_AccidentPersonRecord", ThisKey="UnitWorkId", OtherKey="WorkAreaId", DeleteRule="NO ACTION")] public EntitySet Accident_AccidentPersonRecord { @@ -295006,6 +295252,8 @@ namespace Model private string _PreWorkCode; + private string _WBSCode; + private EntitySet _WBS_ControlItemAndCycle; private EntityRef _WBS_UnitWork; @@ -295076,6 +295324,8 @@ namespace Model partial void OnJDWeightsChanged(); partial void OnPreWorkCodeChanging(string value); partial void OnPreWorkCodeChanged(); + partial void OnWBSCodeChanging(string value); + partial void OnWBSCodeChanged(); #endregion public WBS_WorkPackage() @@ -295690,6 +295940,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WBSCode", DbType="NVarChar(50)")] + public string WBSCode + { + get + { + return this._WBSCode; + } + set + { + if ((this._WBSCode != value)) + { + this.OnWBSCodeChanging(value); + this.SendPropertyChanging(); + this._WBSCode = value; + this.SendPropertyChanged("WBSCode"); + this.OnWBSCodeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ControlItemAndCycle_WBS_ControlItemAndCycle", Storage="_WBS_ControlItemAndCycle", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")] public EntitySet WBS_ControlItemAndCycle { @@ -295811,6 +296081,10 @@ namespace Model private System.Nullable _ThisNum; + private System.Nullable _PlanValue; + + private System.Nullable _ThisValue; + private EntityRef _WBS_WorkPackage; #region 可扩展性方法定义 @@ -295827,6 +296101,10 @@ namespace Model partial void OnPlanNumChanged(); partial void OnThisNumChanging(System.Nullable value); partial void OnThisNumChanged(); + partial void OnPlanValueChanging(System.Nullable value); + partial void OnPlanValueChanged(); + partial void OnThisValueChanging(System.Nullable value); + partial void OnThisValueChanged(); #endregion public WBS_WorkPackageDetail() @@ -295939,6 +296217,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanValue", DbType="Decimal(18,2)")] + public System.Nullable PlanValue + { + get + { + return this._PlanValue; + } + set + { + if ((this._PlanValue != value)) + { + this.OnPlanValueChanging(value); + this.SendPropertyChanging(); + this._PlanValue = value; + this.SendPropertyChanged("PlanValue"); + this.OnPlanValueChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ThisValue", DbType="Decimal(18,2)")] + public System.Nullable ThisValue + { + get + { + return this._ThisValue; + } + set + { + if ((this._ThisValue != value)) + { + this.OnThisValueChanging(value); + this.SendPropertyChanging(); + this._ThisValue = value; + this.SendPropertyChanged("ThisValue"); + this.OnThisValueChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_WorkPackageDetail_WBS_WorkPackage", Storage="_WBS_WorkPackage", ThisKey="WorkPackageId", OtherKey="WorkPackageId", IsForeignKey=true)] public WBS_WorkPackage WBS_WorkPackage { @@ -296246,6 +296564,10 @@ namespace Model private System.Nullable _ThisNum; + private System.Nullable _PlanValue; + + private System.Nullable _ThisValue; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -296262,6 +296584,10 @@ namespace Model partial void OnPlanNumChanged(); partial void OnThisNumChanging(System.Nullable value); partial void OnThisNumChanged(); + partial void OnPlanValueChanging(System.Nullable value); + partial void OnPlanValueChanged(); + partial void OnThisValueChanging(System.Nullable value); + partial void OnThisValueChanged(); #endregion public WBS_WorkPackageParentDetail() @@ -296389,6 +296715,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanValue", DbType="Decimal(18,2)")] + public System.Nullable PlanValue + { + get + { + return this._PlanValue; + } + set + { + if ((this._PlanValue != value)) + { + this.OnPlanValueChanging(value); + this.SendPropertyChanging(); + this._PlanValue = value; + this.SendPropertyChanged("PlanValue"); + this.OnPlanValueChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ThisValue", DbType="Decimal(18,2)")] + public System.Nullable ThisValue + { + get + { + return this._ThisValue; + } + set + { + if ((this._ThisValue != value)) + { + this.OnThisValueChanging(value); + this.SendPropertyChanging(); + this._ThisValue = value; + this.SendPropertyChanged("ThisValue"); + this.OnThisValueChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; From d6ea8320fa036800ebccad7b09c9805445b11aea Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 30 Aug 2023 16:19:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=84=8A=E6=8E=A5?= =?UTF-8?q?=E6=A8=A1=E5=9D=97WBS=E6=A0=91=E6=98=BE=E7=A4=BA=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataImport/MaterialInformation.aspx.cs | 26 +++++++++---------- .../HJGL/HotProcessHard/HardReport.aspx.cs | 26 +++++++++---------- .../HJGL/HotProcessHard/HardTrust.aspx.cs | 26 +++++++++---------- .../HotProcessHard/HotProessReport.aspx.cs | 26 +++++++++---------- .../HotProcessHard/HotProessTrust.aspx.cs | 26 +++++++++---------- .../HJGL/InfoQuery/JointQuery.aspx.cs | 26 +++++++++---------- .../HJGL/InfoQuery/PipelineQuery.aspx.cs | 26 +++++++++---------- .../HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs | 26 +++++++++---------- SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs | 26 +++++++++---------- .../HJGL/PointTrust/PointBatch.aspx.cs | 26 +++++++++---------- .../HJGL/PointTrust/TrustBatch.aspx.cs | 26 +++++++++---------- .../HJGL/PreDesign/MaterialManageIn.aspx.cs | 5 +++- .../HJGL/PreDesign/PipelingDivide.aspx.cs | 26 +++++++++---------- .../HJGL/PreDesign/PrePipeline.aspx.cs | 26 +++++++++---------- .../HJGL/PreDesign/YardPlanning.aspx.cs | 26 +++++++++---------- .../PurgingCleaningEdit.aspx.cs | 26 +++++++++---------- .../RepairAndExpand/RepairAndExpand.aspx.cs | 26 +++++++++---------- .../HJGL/RepairAndExpand/RepairTrust.aspx.cs | 26 +++++++++---------- .../HJGL/TestPackage/ItemEndCheck.aspx.cs | 26 +++++++++---------- .../HJGL/TestPackage/TestPackageAudit.aspx.cs | 26 +++++++++---------- .../TestPackage/TestPackageComplete.aspx.cs | 26 +++++++++---------- .../HJGL/TestPackage/TestPackageEdit.aspx.cs | 26 +++++++++---------- .../HJGL/WeldingManage/JotTwoDesign.aspx.cs | 26 +++++++++---------- .../HJGL/WeldingManage/WeldJointList.aspx.cs | 24 ++++++++--------- .../HJGL/WeldingManage/WeldMatMatch.aspx.cs | 26 +++++++++---------- .../HJGL/WeldingManage/WeldReport.aspx.cs | 26 +++++++++---------- .../HJGL/WeldingManage/WeldTask.aspx.cs | 26 +++++++++---------- .../HJGL/WeldingManage/WeldingConDate.aspx.cs | 26 +++++++++---------- .../HJGL/WeldingManage/WeldingPlan.aspx.cs | 26 +++++++++---------- 29 files changed, 367 insertions(+), 364 deletions(-) diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs index e6e2702f..0912557b 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs @@ -72,21 +72,21 @@ namespace FineUIPro.Web.HJGL.DataImport List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} //var dbpipeLineMat = from x in Funs.DB.HJGL_PipeLineMat select x; //var DBpipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId select x; if (unitWork1.Count() > 0) diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs index 5699c6a8..73e8f774 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs @@ -78,21 +78,21 @@ namespace FineUIPro.Web.HJGL.HotProcessHard List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} var TrustItemList = (from x in Funs.DB.HJGL_Hard_TrustItem join y in Funs.DB.HJGL_Hard_Trust on x.HardTrustID equals y.HardTrustID where y.ProjectId == this.CurrUser.LoginProjectId diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs index 85183bb1..9118787b 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs @@ -111,21 +111,21 @@ namespace FineUIPro.Web.HJGL.HotProcessHard List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} var ReportList = (from x in Funs.DB.HJGL_HotProess_Report join y in Funs.DB.HJGL_HotProess_TrustItem on x.HotProessTrustItemId equals y.HotProessTrustItemId join z in Funs.DB.HJGL_HotProess_Trust on y.HotProessTrustId equals z.HotProessTrustId diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs index d571d558..7ca825c2 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs @@ -80,21 +80,21 @@ namespace FineUIPro.Web.HJGL.HotProcessHard List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} var TrustItemList = (from x in Funs.DB.HJGL_HotProess_TrustItem join y in Funs.DB.HJGL_HotProess_Trust on x.HotProessTrustId equals y.HotProessTrustId where y.ProjectId == this.CurrUser.LoginProjectId diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs index d1cfd2c7..25df1a1e 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs @@ -113,21 +113,21 @@ namespace FineUIPro.Web.HJGL.HotProcessHard List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} var WeldJointList = (from x in Funs.DB.HJGL_WeldJoint join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId where x.ProjectId == this.CurrUser.LoginProjectId && x.WeldingDailyId != null && x.IsHotProess == true diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index 5c8e25a8..6fb7b129 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -134,21 +134,21 @@ namespace FineUIPro.Web.HJGL.InfoQuery List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { foreach (var q in unitWork1) diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs index eb6d3121..d113bbc9 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs @@ -81,21 +81,21 @@ namespace FineUIPro.Web.HJGL.InfoQuery List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs index 9db9ffd7..f2b88799 100644 --- a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs @@ -79,21 +79,21 @@ namespace FineUIPro.Web.HJGL.LeakVacuum List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs index df2fff4c..1357380d 100644 --- a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs @@ -136,21 +136,21 @@ namespace FineUIPro.Web.HJGL.NDT List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs index f9dd6429..aab12ce5 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs @@ -80,21 +80,21 @@ namespace FineUIPro.Web.HJGL.PointTrust List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs index ff88dc8f..b635ce52 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs @@ -57,21 +57,21 @@ namespace FineUIPro.Web.HJGL.PointTrust List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageIn.aspx.cs index 0f9f6abb..dec1a23c 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageIn.aspx.cs @@ -403,7 +403,10 @@ namespace FineUIPro.Web.HJGL.PreDesign materialCheck.ProjectId = this.CurrUser.LoginProjectId; materialCheck.ContractNo = pds.Rows[i][0].ToString().Trim(); materialCheck.UnitId = units.First(e => e.UnitName == pds.Rows[i][1].ToString().Trim()).UnitId; - materialCheck.MainItemId = mainItems.First(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()).MainItemId; + if (mainItems.FirstOrDefault(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()) != null) + { + materialCheck.MainItemId = mainItems.First(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()).MainItemId; + } materialCheck.MaterialName = pds.Rows[i][3].ToString().Trim(); materialCheck.SpecificationAndModel = pds.Rows[i][4].ToString().Trim(); materialCheck.MaterialCode = pds.Rows[i][5].ToString().Trim(); diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs index 8aa0fe9a..be81ca9e 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs @@ -98,21 +98,21 @@ namespace FineUIPro.Web.HJGL.PreDesign List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs index 3ebbaf32..cd01605b 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs @@ -65,21 +65,21 @@ namespace FineUIPro.Web.HJGL.PreDesign List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs index 1fdc5cf8..a2c36c67 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs @@ -99,21 +99,21 @@ namespace FineUIPro.Web.HJGL.PreDesign List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs index d6b5156e..c2d32771 100644 --- a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs @@ -80,21 +80,21 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs index 96b4452f..21cbc5bd 100644 --- a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs @@ -180,21 +180,21 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs index 5ea454a7..6ba7cdb4 100644 --- a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs @@ -55,21 +55,21 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs index 8846eaec..03aff233 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs @@ -99,21 +99,21 @@ namespace FineUIPro.Web.HJGL.TestPackage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs index 8a576ba4..2f560e8b 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs @@ -92,21 +92,21 @@ namespace FineUIPro.Web.HJGL.TestPackage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs index 2f5ead1a..92eb0d36 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs @@ -142,21 +142,21 @@ List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs index b2030a7f..c740f07f 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs @@ -100,21 +100,21 @@ namespace FineUIPro.Web.HJGL.TestPackage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs index 3f719833..88e201d5 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs @@ -63,21 +63,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs index 9528b728..76bcebb3 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs @@ -100,20 +100,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork2 = null; // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs index f39873ec..bd909b93 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs @@ -80,21 +80,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs index 8460014d..6d985624 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs @@ -59,21 +59,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { foreach (var q in unitWork1) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs index 1ee2fd29..b45da0d1 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs @@ -101,21 +101,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { foreach (var q in unitWork1) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs index 7e351f38..2df80bc0 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs @@ -56,21 +56,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs index baa10565..f6e51e41 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs @@ -63,21 +63,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { From 5f83d3938560e6790bf9cde6697d1668c1bcbad5 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 30 Aug 2023 17:32:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx index 935b788c..7ae0a73d 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx @@ -139,11 +139,11 @@ function onGridAfterEdit(event, value, params) { var me = this, columnId = params.columnId, rowId = params.rowId; - var str = F(hdIdClientID).ooIl1; - if (str == undefined) { + var str = F(hdIdClientID).getValue(); + if (str == undefined || str == '') { str = rowId; } - else { + else if(str.indexOf(rowId) == -1){ str = str + "," + rowId; } F(hdIdClientID).setValue(str); From 8e32d0d8bacaa2e96cfc187f6117476fd7b4dcfa Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 31 Aug 2023 09:49:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=BC=96=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/CQMS/WBS/WorkPackageService.cs | 35 ++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs index 99ffa9fa..e3f23512 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs @@ -328,12 +328,12 @@ namespace BLL if (item.WBSType == "WorkPackage") { var childWorkPackages = from x in workPackages where x.SuperWorkPackageId == item.Id && x.IsApprove == true select x; - if (childWorkPackages.Count() == 0) + var workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == item.Id); + if (workPackage != null) { - row[5] = item.Id; - var workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == item.Id); - if (workPackage != null) + if (childWorkPackages.Count() == 0) { + row[5] = item.Id; if (workPackage.JDWeights != null) { row[6] = decimal.Round(Convert.ToDecimal(workPackage.JDWeights), 2); @@ -386,6 +386,33 @@ namespace BLL } } } + else + { + if (workPackage.JDWeights != null) + { + row[6] = decimal.Round(Convert.ToDecimal(workPackage.JDWeights), 2); + } + if (workPackage.PlanStartDate != null) + { + row[10] = workPackage.PlanStartDate; + } + if (workPackage.PlanEndDate != null) + { + row[11] = workPackage.PlanEndDate; + } + if (workPackage.RealStartDate != null) + { + row[12] = workPackage.RealStartDate; + } + if (workPackage.RealEndDate != null) + { + row[13] = workPackage.RealEndDate; + } + if (workPackage.PlanCost != null) + { + row[15] = decimal.Round(Convert.ToDecimal(workPackage.PlanCost), 2); + } + } } } else if (item.WBSType == "UnitWork")