diff --git a/DataBase/版本日志/SGGLDB_V2023-09-22.sql b/DataBase/版本日志/SGGLDB_V2023-09-22.sql new file mode 100644 index 00000000..56389702 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-09-22.sql @@ -0,0 +1,134 @@ +alter table [dbo].[ZHGL_ConstructionLog] add FileCode nvarchar(50) null +GO + +update Sys_Menu set MenuName='ʩ־',IsEnd=0 where MenuId='4CB03F8B-C967-4082-ADF1-08776FE40E21' +GO + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('0383A4A1-1565-4F11-BAF3-2B84CB621796','ʩ־','PZHGL/InformationProject/ConstructionLog.aspx',10,'4CB03F8B-C967-4082-ADF1-08776FE40E21','Menu_PZHGL',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('D853D4D4-4D31-45D2-ADF4-F8799EC68B02','0383A4A1-1565-4F11-BAF3-2B84CB621796','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('3A559270-B5F8-4FD3-B6DA-37D5D5C7CAFB','0383A4A1-1565-4F11-BAF3-2B84CB621796','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('86812B35-34D8-42DE-B989-BC1DDA6B7CD3','0383A4A1-1565-4F11-BAF3-2B84CB621796','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('C179D43F-10C7-48F1-A06D-D09A9C0433D2','0383A4A1-1565-4F11-BAF3-2B84CB621796','',4) + GO + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('D3F67A7B-2FC4-468A-98BB-5F3DF2F193C4','Ŀʩ־','PZHGL/InformationProject/ProjectConstructionLog.aspx',20,'4CB03F8B-C967-4082-ADF1-08776FE40E21','Menu_PZHGL',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('D7CE42E6-2641-453B-9AE5-11F0570E00F8','D3F67A7B-2FC4-468A-98BB-5F3DF2F193C4','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('2B47E22C-6A37-4E16-A6A1-70386DDC5F81','D3F67A7B-2FC4-468A-98BB-5F3DF2F193C4','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('817A0F17-C2F9-4EF7-9889-844064933757','D3F67A7B-2FC4-468A-98BB-5F3DF2F193C4','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('7CA03E95-00EA-4118-A8EA-F27CE48ACBA7','D3F67A7B-2FC4-468A-98BB-5F3DF2F193C4','',4) + GO + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('1C190A15-CC04-441C-AEF3-C945A53A81A6','־ļ','PZHGL/InformationProject/ConstructionLogFileCabinet.aspx',30,'4CB03F8B-C967-4082-ADF1-08776FE40E21','Menu_PZHGL',0,1,1) + GO + +alter table [dbo].[WBS_UnitWork] add ContractId nvarchar(50) null +GO +alter table [dbo].[WBS_UnitWork] add MainItemCode nvarchar(50) null +GO +alter table [dbo].[ZHGL_ConstructionLog] alter column ContractNo nvarchar(500) null +GO +alter table [dbo].[ZHGL_ConstructionLog] add WorkPostId nvarchar(1000) null +GO +alter table [dbo].[ZHGL_ConstructionLog] add MachineId nvarchar(1000) null +GO +alter table [dbo].[Person_Persons] add LogWorkPostId nvarchar(1000) null +GO +alter table [dbo].[Person_Persons] add LogMachineId nvarchar(1000) null +GO +drop table [dbo].[ZHGL_ConstructionLogPerson] +GO + +CREATE TABLE [dbo].[ZHGL_ConstructionLogPerson]( + [ConstructionLogPersonId] [nvarchar](50) NOT NULL, + [ConstructionLogId] [nvarchar](50) NULL, + [UnitWorkId] [nvarchar](50) NULL, + [WorkPostId] [nvarchar](50) NULL, + [Num] [int] NULL, + CONSTRAINT [PK_ZHGL_ConstructionLogPerson] PRIMARY KEY CLUSTERED +( + [ConstructionLogPersonId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[ZHGL_ConstructionLogPerson] WITH CHECK ADD CONSTRAINT [FK_ZHGL_ConstructionLogPerson_ZHGL_ConstructionLog] FOREIGN KEY([ConstructionLogId]) +REFERENCES [dbo].[ZHGL_ConstructionLog] ([ConstructionLogId]) +GO + +ALTER TABLE [dbo].[ZHGL_ConstructionLogPerson] CHECK CONSTRAINT [FK_ZHGL_ConstructionLogPerson_ZHGL_ConstructionLog] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogPerson', @level2type=N'COLUMN',@level2name=N'ConstructionLogPersonId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogPerson', @level2type=N'COLUMN',@level2name=N'ConstructionLogId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogPerson', @level2type=N'COLUMN',@level2name=N'UnitWorkId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogPerson', @level2type=N'COLUMN',@level2name=N'WorkPostId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'߹' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogPerson', @level2type=N'COLUMN',@level2name=N'Num' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩ־ҵԱϸ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogPerson' +GO + + +drop table [dbo].[ZHGL_ConstructionLogMachine] +GO + + +CREATE TABLE [dbo].[ZHGL_ConstructionLogMachine]( + [ConstructionLogMachineId] [nvarchar](50) NOT NULL, + [ConstructionLogId] [nvarchar](50) NULL, + [UnitWorkId] [nvarchar](50) NULL, + [MachineId] [nvarchar](50) NULL, + [Num] [int] NULL, + CONSTRAINT [PK_ZHGL_ConstructionLogMachine] PRIMARY KEY CLUSTERED +( + [ConstructionLogMachineId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[ZHGL_ConstructionLogMachine] WITH CHECK ADD CONSTRAINT [FK_ZHGL_ConstructionLogMachine_ZHGL_ConstructionLog] FOREIGN KEY([ConstructionLogId]) +REFERENCES [dbo].[ZHGL_ConstructionLog] ([ConstructionLogId]) +GO + +ALTER TABLE [dbo].[ZHGL_ConstructionLogMachine] CHECK CONSTRAINT [FK_ZHGL_ConstructionLogMachine_ZHGL_ConstructionLog] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogMachine', @level2type=N'COLUMN',@level2name=N'ConstructionLogMachineId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogMachine', @level2type=N'COLUMN',@level2name=N'ConstructionLogId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogMachine', @level2type=N'COLUMN',@level2name=N'UnitWorkId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ڻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogMachine', @level2type=N'COLUMN',@level2name=N'Num' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩ־еϸ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogMachine' +GO + + diff --git a/DataBase/菜单初始化脚本/1-8综合管理（Menu_PZHGL）.sql b/DataBase/菜单初始化脚本/1-8综合管理（Menu_PZHGL）.sql index 6f39a0ab..8b1c3466 100644 --- a/DataBase/菜单初始化脚本/1-8综合管理（Menu_PZHGL）.sql +++ b/DataBase/菜单初始化脚本/1-8综合管理（Menu_PZHGL）.sql @@ -12,8 +12,37 @@ VALUES('0DAFF358-EA16-44B2-8E4B-E15E40EFAAD0','总承包商施工报告','',20,' GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('4CB03F8B-C967-4082-ADF1-08776FE40E21','项目级施工日志','',30,'0','Menu_PZHGL',0,1,1) +VALUES('4CB03F8B-C967-4082-ADF1-08776FE40E21','施工日志','',30,'0','Menu_PZHGL',0,0,1) GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('0383A4A1-1565-4F11-BAF3-2B84CB621796','个人施工日志','PZHGL/InformationProject/ConstructionLog.aspx',10,'4CB03F8B-C967-4082-ADF1-08776FE40E21','Menu_PZHGL',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('D853D4D4-4D31-45D2-ADF4-F8799EC68B02','0383A4A1-1565-4F11-BAF3-2B84CB621796','增加',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('3A559270-B5F8-4FD3-B6DA-37D5D5C7CAFB','0383A4A1-1565-4F11-BAF3-2B84CB621796','修改',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('86812B35-34D8-42DE-B989-BC1DDA6B7CD3','0383A4A1-1565-4F11-BAF3-2B84CB621796','删除',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('C179D43F-10C7-48F1-A06D-D09A9C0433D2','0383A4A1-1565-4F11-BAF3-2B84CB621796','保存',4) + GO + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('D3F67A7B-2FC4-468A-98BB-5F3DF2F193C4','项目施工日志','PZHGL/InformationProject/ProjectConstructionLog.aspx',20,'4CB03F8B-C967-4082-ADF1-08776FE40E21','Menu_PZHGL',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('D7CE42E6-2641-453B-9AE5-11F0570E00F8','D3F67A7B-2FC4-468A-98BB-5F3DF2F193C4','增加',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('2B47E22C-6A37-4E16-A6A1-70386DDC5F81','D3F67A7B-2FC4-468A-98BB-5F3DF2F193C4','修改',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('817A0F17-C2F9-4EF7-9889-844064933757','D3F67A7B-2FC4-468A-98BB-5F3DF2F193C4','删除',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('7CA03E95-00EA-4118-A8EA-F27CE48ACBA7','D3F67A7B-2FC4-468A-98BB-5F3DF2F193C4','保存',4) + GO + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('1C190A15-CC04-441C-AEF3-C945A53A81A6','日志文件柜','PZHGL/InformationProject/ConstructionLogFileCabinet.aspx',30,'4CB03F8B-C967-4082-ADF1-08776FE40E21','Menu_PZHGL',0,1,1) + GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('CD88CE2A-A8E2-4F07-9A90-9161BD1C345C','工作交接','',40,'0','Menu_PZHGL',0,1,1) diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index b1cfa731..174ad6ee 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -646,6 +646,7 @@ + diff --git a/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs b/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs index 33210ab0..533e0313 100644 --- a/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs +++ b/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs @@ -21,6 +21,22 @@ namespace BLL return Funs.DB.Base_SpecialEquipment.FirstOrDefault(e => e.SpecialEquipmentId == specialEquipmentId); } + /// + /// 根据主键获取机具设备名称 + /// + /// + /// + public static string GetSpecialEquipmentNameById(string specialEquipmentId) + { + string name = string.Empty; + var q= Funs.DB.Base_SpecialEquipment.FirstOrDefault(e => e.SpecialEquipmentId == specialEquipmentId); + if (q != null) + { + name = q.SpecialEquipmentName; + } + return name; + } + /// /// 添加机具设备 /// @@ -87,6 +103,17 @@ namespace BLL select x).ToList(); } + /// + /// 获取机具设备列表 + /// + /// + public static List GetAllSpecialEquipmentList() + { + return (from x in Funs.DB.Base_SpecialEquipment + orderby x.SpecialEquipmentCode + select x).ToList(); + } + /// /// 设备下拉框 /// @@ -105,6 +132,24 @@ namespace BLL } } + /// + /// 设备下拉框 + /// + /// 下拉框名字 + /// 项目id + /// 是否显示请选择 + public static void InitAllSpecialEquipmentDropDownList(DropDownList dropName, bool isShowPlease) + { + dropName.DataValueField = "SpecialEquipmentId"; + dropName.DataTextField = "SpecialEquipmentName"; + dropName.DataSource = GetAllSpecialEquipmentList(); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + /// /// 获取机具设备列表 /// diff --git a/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs b/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs index 95784829..fb667464 100644 --- a/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs +++ b/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs @@ -146,21 +146,23 @@ namespace BLL /// 实体验收审批实体 public static void AddSpotCheckApprove(Model.Check_SpotCheckApprove approve) { - Model.SGGLDB db = Funs.DB; - string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_SpotCheckApprove)); - Model.Check_SpotCheckApprove newApprove = new Model.Check_SpotCheckApprove(); - newApprove.SpotCheckApproveId = newKeyID; - newApprove.SpotCheckCode = approve.SpotCheckCode; - newApprove.ApproveMan = approve.ApproveMan; - newApprove.ApproveDate = approve.ApproveDate; - newApprove.ApproveIdea = approve.ApproveIdea; - newApprove.IsAgree = approve.IsAgree; - newApprove.ApproveType = approve.ApproveType; - newApprove.SpotCheckDetailId = approve.SpotCheckDetailId; - newApprove.Sign = approve.Sign; + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_SpotCheckApprove)); + Model.Check_SpotCheckApprove newApprove = new Model.Check_SpotCheckApprove(); + newApprove.SpotCheckApproveId = newKeyID; + newApprove.SpotCheckCode = approve.SpotCheckCode; + newApprove.ApproveMan = approve.ApproveMan; + newApprove.ApproveDate = approve.ApproveDate; + newApprove.ApproveIdea = approve.ApproveIdea; + newApprove.IsAgree = approve.IsAgree; + newApprove.ApproveType = approve.ApproveType; + newApprove.SpotCheckDetailId = approve.SpotCheckDetailId; + newApprove.Sign = approve.Sign; - db.Check_SpotCheckApprove.InsertOnSubmit(newApprove); - db.SubmitChanges(); + db.Check_SpotCheckApprove.InsertOnSubmit(newApprove); + db.SubmitChanges(); + } } public static string AddSpotCheckApproveForApi(Model.Check_SpotCheckApprove approve) { @@ -193,16 +195,18 @@ namespace BLL /// 实体验收审批实体 public static void UpdateSpotCheckApprove(Model.Check_SpotCheckApprove approve) { - Model.SGGLDB db = Funs.DB; - Model.Check_SpotCheckApprove newApprove = db.Check_SpotCheckApprove.First(e => e.SpotCheckApproveId == approve.SpotCheckApproveId && e.ApproveDate == null); - newApprove.SpotCheckCode = approve.SpotCheckCode; - newApprove.ApproveMan = approve.ApproveMan; - newApprove.ApproveDate = approve.ApproveDate; - newApprove.ApproveIdea = approve.ApproveIdea; - newApprove.IsAgree = approve.IsAgree; - newApprove.ApproveType = approve.ApproveType; + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + Model.Check_SpotCheckApprove newApprove = db.Check_SpotCheckApprove.First(e => e.SpotCheckApproveId == approve.SpotCheckApproveId && e.ApproveDate == null); + newApprove.SpotCheckCode = approve.SpotCheckCode; + newApprove.ApproveMan = approve.ApproveMan; + newApprove.ApproveDate = approve.ApproveDate; + newApprove.ApproveIdea = approve.ApproveIdea; + newApprove.IsAgree = approve.IsAgree; + newApprove.ApproveType = approve.ApproveType; - db.SubmitChanges(); + db.SubmitChanges(); + } } /// diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageInitService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageInitService.cs index 7914b888..b5af2eab 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageInitService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageInitService.cs @@ -79,6 +79,38 @@ namespace BLL return Funs.DB.WBS_WorkPackageInit.FirstOrDefault(x => x.WorkPackageCode == workPackageCode); } + /// + /// 根据分部分项编号获取分部分项信息 + /// + /// + /// + public static string GetWorkPackageCodeByPackageContent(string packageContent) + { + string workPackageCode = string.Empty; + var q= Funs.DB.WBS_WorkPackageInit.FirstOrDefault(x => x.PackageContent == packageContent); + if (q != null) + { + workPackageCode = q.WorkPackageCode; + } + return workPackageCode; + } + + /// + /// 根据分部分项编号获取分部分项信息 + /// + /// + /// + public static string GetPackageContentByWorkPackageCode(string workPackageCode) + { + string packageContent = string.Empty; + var q = Funs.DB.WBS_WorkPackageInit.FirstOrDefault(x => x.WorkPackageCode == workPackageCode); + if (q != null) + { + packageContent = q.PackageContent; + } + return packageContent; + } + /// /// 根据分部分项编号获取子级分部分项信息集合 /// @@ -88,5 +120,23 @@ namespace BLL { return (from x in Funs.DB.WBS_WorkPackageInit where x.SuperWorkPack == workPackageCode select x).ToList(); } + + /// + /// 样板类型下拉框 + /// + /// + /// + /// + public static void InitDownList(FineUIPro.DropDownList dropName, bool isShowPlease) + { + dropName.DataValueField = "PackageContent"; + dropName.DataTextField = "PackageContent"; + dropName.DataSource = from x in Funs.DB.WBS_WorkPackageInit where x.SuperWorkPack == null orderby x.ProjectType, x.WorkPackageCode select x; + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } } } diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs index f5ca9cf6..42cc09eb 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs @@ -788,7 +788,21 @@ namespace BLL IQueryable workPackages = from x in db.WBS_WorkPackage where x.ProjectId == projectId select x; IQueryable unitWorks = from x in db.WBS_UnitWork where x.ProjectId == projectId select x; IQueryable getDetails = from x in db.View_WBS_WorkPackageDetail where x.ProjectId == projectId select x; + //获取符合时间范围的所有项 List getWBSs = (from x in db.View_WBS where x.ProjectId == projectId select x).ToList(); + List list = getWBSs.Where(x => x.PlanEndDate > startTime && x.PlanEndDate <= endTime).ToList(); + List newLists = new List(); + foreach (var item in list) + { + var supItem = getWBSs.FirstOrDefault(x => x.Id == item.SupId); + if (supItem != null) + { + newLists.Add(item); + newLists.Add(supItem); + AddSupItem(supItem, getWBSs, newLists); + } + } + List ids = newLists.Select(x => x.Id).ToList(); List WBSList = new List(); DateTime startDate, endDate, startMonth, endMonth; List months = new List(); @@ -844,11 +858,11 @@ namespace BLL newList.Add(item); if (string.IsNullOrEmpty(IsOut)) { - AddDetail2(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime); + AddDetail2(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, ids); } else { - AddDetail2(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime); + AddDetail2(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, ids); } a++; } @@ -990,29 +1004,40 @@ namespace BLL } } - private static void AddDetail2(List newList, List oldList, string id, string preCode, DateTime startTime, DateTime endTime) + private static void AddSupItem(Model.View_WBS item, List getWBSs, List newLists) { - var items = oldList.Where(x => x.SupId == id && x.PlanEndDate > startTime && x.PlanEndDate <= endTime).OrderBy(x => x.Code); + var supItem = getWBSs.FirstOrDefault(x => x.Id == item.SupId); + if (supItem != null) + { + newLists.Add(item); + newLists.Add(supItem); + AddSupItem(supItem, getWBSs, newLists); + } + } + + private static void AddDetail2(List newList, List oldList, string id, string preCode, DateTime startTime, DateTime endTime,List ids) + { + var items = oldList.Where(x => x.SupId == id && ((x.PlanEndDate > startTime && x.PlanEndDate <= endTime) || ids.Contains(x.Id))).OrderBy(x => x.Code); int b = 1; foreach (var item in items) { item.Code = preCode + "." + b.ToString(); newList.Add(item); - AddDetail2(newList, oldList, item.Id, item.Code, startTime, endTime); + AddDetail2(newList, oldList, item.Id, item.Code, startTime, endTime, ids); b++; } } - private static void AddDetail2(List newList, List oldList, string id, string preCode, string prefix, DateTime startTime, DateTime endTime) + private static void AddDetail2(List newList, List oldList, string id, string preCode, string prefix, DateTime startTime, DateTime endTime, List ids) { - var items = oldList.Where(x => x.SupId == id && x.PlanEndDate > startTime && x.PlanEndDate <= endTime).OrderBy(x => x.Code); + var items = oldList.Where(x => x.SupId == id && ((x.PlanEndDate > startTime && x.PlanEndDate <= endTime) || ids.Contains(x.Id))).OrderBy(x => x.Code); int b = 1; foreach (var item in items) { item.Code = preCode + "." + b.ToString(); item.Name = prefix + "...." + item.Name; newList.Add(item); - AddDetail2(newList, oldList, item.Id, item.Code, prefix + "....", startTime, endTime); + AddDetail2(newList, oldList, item.Id, item.Code, prefix + "....", startTime, endTime, ids); b++; } } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index fe03fd93..ef53e13a 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -367,6 +367,31 @@ namespace BLL /// public static string WorkPost_Checker = "595999E9-75A8-4064-9BD1-9EE02F236297"; + /// + /// 瓦工岗位Id + /// + public static string WorkPost_BricklayerId = "668CB91E-F067-42E6-95ED-FFF1BCCE4576"; + + /// + /// 钢筋工岗位Id + /// + public static string WorkPost_SteelFixerId = "48280AA2-62D6-4105-AAA7-C38471F44DA9"; + + /// + /// 木工岗位Id + /// + public static string WorkPost_CarpentryId = "FA155A27-E5E5-44DF-8CC3-05404F572DB8"; + + /// + /// 混凝土工岗位Id + /// + public static string WorkPost_ConcreteWorkerId = "65F02FD8-6C67-402E-9588-4DAB038A697A"; + + /// + /// 架子工岗位Id + /// + public static string WorkPost_ScaffolderId = "1331D109-6435-4709-9A35-65AEC7B3F06F"; + #endregion #region 系统环境设置常量 @@ -4522,9 +4547,14 @@ namespace BLL public const string ConstructionReportMenuId = "0DAFF358-EA16-44B2-8E4B-E15E40EFAAD0"; /// - /// 项目级施工日志 + /// 个人施工日志 /// - public const string ConstructionLogMenuId = "4CB03F8B-C967-4082-ADF1-08776FE40E21"; + public const string ConstructionLogMenuId = "0383A4A1-1565-4F11-BAF3-2B84CB621796"; + + /// + /// 项目施工日志 + /// + public const string ProjectConstructionLogMenuId = "D3F67A7B-2FC4-468A-98BB-5F3DF2F193C4"; /// /// 项目级施工日志 diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index 74b20799..946a8b6d 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -1418,6 +1418,53 @@ namespace BLL IRestResponse response = client.Execute(request); return response.Content; } + + /// + /// ڼֵ + /// + /// + public static string GetWeekDay(string value) + { + if (!String.IsNullOrEmpty(value)) + { + if (value == "Sunday") + { + return ""; + } + else if (value == "Monday") + { + return "һ"; + } + else if (value == "Tuesday") + { + return ""; + } + else if (value == "Wednesday") + { + return ""; + } + else if (value == "Thursday") + { + return ""; + } + else if (value == "Friday") + { + return ""; + } + else if (value == "Saturday") + { + return ""; + } + else + { + return ""; + } + } + else + { + return ""; + } + } } } diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogMachineService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogMachineService.cs index 2e4a852c..3c0cf59e 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogMachineService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogMachineService.cs @@ -31,12 +31,8 @@ namespace BLL newConstructionLogMachine.ConstructionLogMachineId = constructionLogMachine.ConstructionLogMachineId; newConstructionLogMachine.ConstructionLogId = constructionLogMachine.ConstructionLogId; newConstructionLogMachine.UnitWorkId = constructionLogMachine.UnitWorkId; - newConstructionLogMachine.WJNum = constructionLogMachine.WJNum; - newConstructionLogMachine.DCNum = constructionLogMachine.DCNum; - newConstructionLogMachine.DZJNum = constructionLogMachine.DZJNum; - newConstructionLogMachine.GCNum = constructionLogMachine.GCNum; - newConstructionLogMachine.BCNum = constructionLogMachine.BCNum; - newConstructionLogMachine.BengCNum = constructionLogMachine.BengCNum; + newConstructionLogMachine.MachineId = constructionLogMachine.MachineId; + newConstructionLogMachine.Num = constructionLogMachine.Num; db.ZHGL_ConstructionLogMachine.InsertOnSubmit(newConstructionLogMachine); db.SubmitChanges(); diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogManagementService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogManagementService.cs index c4f97068..47270a4b 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogManagementService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogManagementService.cs @@ -61,7 +61,7 @@ namespace BLL public static List GetConstructionLogManagementsByConstructionLogId(string ConstructionLogId) { Model.SGGLDB db = Funs.DB; - return (from x in db.ZHGL_ConstructionLogManagement where x.ConstructionLogId == ConstructionLogId select x).ToList(); + return (from x in db.ZHGL_ConstructionLogManagement where x.ConstructionLogId == ConstructionLogId orderby x.UnitWorkId select x).ToList(); } } } diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogPersonService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogPersonService.cs index 3fc0990e..bb96c8cf 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogPersonService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogPersonService.cs @@ -31,12 +31,8 @@ namespace BLL newConstructionLogPerson.ConstructionLogPersonId = constructionLogPerson.ConstructionLogPersonId; newConstructionLogPerson.ConstructionLogId = constructionLogPerson.ConstructionLogId; newConstructionLogPerson.UnitWorkId = constructionLogPerson.UnitWorkId; - newConstructionLogPerson.WGNum = constructionLogPerson.WGNum; - newConstructionLogPerson.GJGNum = constructionLogPerson.GJGNum; - newConstructionLogPerson.MGNum = constructionLogPerson.MGNum; - newConstructionLogPerson.HNTGNum = constructionLogPerson.HNTGNum; - newConstructionLogPerson.HGNum = constructionLogPerson.HGNum; - newConstructionLogPerson.JZGNum = constructionLogPerson.JZGNum; + newConstructionLogPerson.WorkPostId = constructionLogPerson.WorkPostId; + newConstructionLogPerson.Num = constructionLogPerson.Num; db.ZHGL_ConstructionLogPerson.InsertOnSubmit(newConstructionLogPerson); db.SubmitChanges(); diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogProblemService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogProblemService.cs index 73c1da33..557f8a90 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogProblemService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogProblemService.cs @@ -1,13 +1,68 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace BLL { public class ConstructionLogProblemService { + public static Model.SGGLDB db = Funs.DB; + /// + /// 获取施工日志需要协调解决的问题明细列表 + /// + /// + /// + /// + public static List getListData(string ConstructionLogId) + { + return (from x in db.ZHGL_ConstructionLogProblem + where x.ConstructionLogId == ConstructionLogId + select x).ToList(); + } + + /// + /// 增加施工日志需要协调解决的问题明细 + /// + /// 施工日志需要协调解决的问题明细实体 + public static void AddConstructionLogProblem(Model.ZHGL_ConstructionLogProblem constructionLogProblem) + { + Model.SGGLDB db = Funs.DB; + Model.ZHGL_ConstructionLogProblem newConstructionLogProblem = new Model.ZHGL_ConstructionLogProblem(); + newConstructionLogProblem.ConstructionLogProblemId = constructionLogProblem.ConstructionLogProblemId; + newConstructionLogProblem.ConstructionLogId = constructionLogProblem.ConstructionLogId; + newConstructionLogProblem.UnitWorkId = constructionLogProblem.UnitWorkId; + newConstructionLogProblem.MainProblem = constructionLogProblem.MainProblem; + newConstructionLogProblem.HandlingMeasures = constructionLogProblem.HandlingMeasures; + newConstructionLogProblem.WorkPackageId = constructionLogProblem.WorkPackageId; + newConstructionLogProblem.ImportanceLevel = constructionLogProblem.ImportanceLevel; + + db.ZHGL_ConstructionLogProblem.InsertOnSubmit(newConstructionLogProblem); + db.SubmitChanges(); + } + + /// + /// 根据月报id删除对应的所有施工日志需要协调解决的问题明细 + /// + /// 施工日志需要协调解决的问题明细编号 + public static void DeleteConstructionLogProblemsByConstructionLogId(string ConstructionLogId) + { + Model.SGGLDB db = Funs.DB; + var q = (from x in db.ZHGL_ConstructionLogProblem where x.ConstructionLogId == ConstructionLogId select x).ToList(); + if (q.Count() > 0) + { + db.ZHGL_ConstructionLogProblem.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + + /// + /// 根据月报id获取对应的所有施工日志需要协调解决的问题明细 + /// + /// 施工日志需要协调解决的问题明细编号 + public static List GetConstructionLogProblemsByConstructionLogId(string ConstructionLogId) + { + Model.SGGLDB db = Funs.DB; + return (from x in db.ZHGL_ConstructionLogProblem where x.ConstructionLogId == ConstructionLogId orderby x.UnitWorkId select x).ToList(); + } } } diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogRecordService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogRecordService.cs new file mode 100644 index 00000000..ced09506 --- /dev/null +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogRecordService.cs @@ -0,0 +1,65 @@ +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + public class ConstructionLogRecordService + { + public static Model.SGGLDB db = Funs.DB; + + /// + /// 获取施工日志施工经理相关记录明细列表 + /// + /// + /// + /// + public static List getListData(string ConstructionLogId) + { + return (from x in db.ZHGL_ConstructionLogRecord + where x.ConstructionLogId == ConstructionLogId + select x).ToList(); + } + + /// + /// 增加施工日志作业人员明细 + /// + /// 施工日志作业人员明细实体 + public static void AddConstructionLogRecord(Model.ZHGL_ConstructionLogRecord constructionLogRecord) + { + Model.SGGLDB db = Funs.DB; + Model.ZHGL_ConstructionLogRecord newConstructionLogRecord = new Model.ZHGL_ConstructionLogRecord(); + newConstructionLogRecord.ConstructionLogRecordId = constructionLogRecord.ConstructionLogRecordId; + newConstructionLogRecord.ConstructionLogId = constructionLogRecord.ConstructionLogId; + newConstructionLogRecord.Record = constructionLogRecord.Record; + newConstructionLogRecord.Remark = constructionLogRecord.Remark; + + db.ZHGL_ConstructionLogRecord.InsertOnSubmit(newConstructionLogRecord); + db.SubmitChanges(); + } + + /// + /// 根据月报id删除对应的所有施工日志作业人员明细 + /// + /// 施工日志作业人员明细编号 + public static void DeleteConstructionLogRecordsByConstructionLogId(string ConstructionLogId) + { + Model.SGGLDB db = Funs.DB; + var q = (from x in db.ZHGL_ConstructionLogRecord where x.ConstructionLogId == ConstructionLogId select x).ToList(); + if (q.Count() > 0) + { + db.ZHGL_ConstructionLogRecord.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + + /// + /// 根据月报id获取对应的所有施工日志作业人员明细 + /// + /// 施工日志作业人员明细编号 + public static List GetConstructionLogRecordsByConstructionLogId(string ConstructionLogId) + { + Model.SGGLDB db = Funs.DB; + return (from x in db.ZHGL_ConstructionLogRecord where x.ConstructionLogId == ConstructionLogId select x).ToList(); + } + } +} diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs index 136fa252..99d17bcd 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs @@ -50,9 +50,9 @@ namespace BLL Professional = ConstructionLog.Professional, CompileMan = ConstructionLog.CompileMan, CompileDate = ConstructionLog.CompileDate, - State= ConstructionLog.State, - Remark= ConstructionLog.Remark, - HSETodaySummary= ConstructionLog.HSETodaySummary, + State = ConstructionLog.State, + Remark = ConstructionLog.Remark, + HSETodaySummary = ConstructionLog.HSETodaySummary, HSETodaySummaryRemark = ConstructionLog.HSETodaySummaryRemark, HSETomorrowPlan = ConstructionLog.HSETomorrowPlan, HSETomorrowPlanRemark = ConstructionLog.HSETomorrowPlanRemark, @@ -60,6 +60,9 @@ namespace BLL CQMSTodaySummaryRemark = ConstructionLog.CQMSTodaySummaryRemark, CQMSTomorrowPlan = ConstructionLog.CQMSTomorrowPlan, CQMSTomorrowPlanRemark = ConstructionLog.CQMSTomorrowPlanRemark, + FileCode = ConstructionLog.FileCode, + WorkPostId = ConstructionLog.WorkPostId, + MachineId = ConstructionLog.MachineId, }; db.ZHGL_ConstructionLog.InsertOnSubmit(newConstructionLog); db.SubmitChanges(); @@ -75,6 +78,7 @@ namespace BLL Model.ZHGL_ConstructionLog newConstructionLog = db.ZHGL_ConstructionLog.FirstOrDefault(e => e.ConstructionLogId == ConstructionLog.ConstructionLogId); if (newConstructionLog != null) { + newConstructionLog.FileCode = ConstructionLog.FileCode; newConstructionLog.Weather = ConstructionLog.Weather; newConstructionLog.Temperature = ConstructionLog.Temperature; newConstructionLog.ContractNo = ConstructionLog.ContractNo; @@ -90,6 +94,8 @@ namespace BLL newConstructionLog.CQMSTodaySummaryRemark = ConstructionLog.CQMSTodaySummaryRemark; newConstructionLog.CQMSTomorrowPlan = ConstructionLog.CQMSTomorrowPlan; newConstructionLog.CQMSTomorrowPlanRemark = ConstructionLog.CQMSTomorrowPlanRemark; + newConstructionLog.WorkPostId = ConstructionLog.WorkPostId; + newConstructionLog.MachineId = ConstructionLog.MachineId; db.SubmitChanges(); } } diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs index 487406ed..c9d874d1 100644 --- a/SGGL/BLL/Person/Person_PersonsService.cs +++ b/SGGL/BLL/Person/Person_PersonsService.cs @@ -841,6 +841,8 @@ namespace BLL newPerson.RelativeTel = person.RelativeTel; newPerson.MultiProject = person.MultiProject; newPerson.HomePageType = person.HomePageType; + newPerson.LogWorkPostId = person.LogWorkPostId; + newPerson.LogMachineId = person.LogMachineId; newPerson.IsCardNoOK = IDCardValid.CheckIDCard(person.IdentityCard); if (string.IsNullOrEmpty(person.QRCodeAttachUrl)) diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs index 5b75b8bd..79fac28f 100644 --- a/SGGL/BLL/ProjectData/UnitWorkService.cs +++ b/SGGL/BLL/ProjectData/UnitWorkService.cs @@ -30,6 +30,8 @@ namespace BLL newUnitWork.NDEUnit = UnitWork.NDEUnit; newUnitWork.Costs = UnitWork.Costs; newUnitWork.MainItemAndDesignProfessionalIds = UnitWork.MainItemAndDesignProfessionalIds; + newUnitWork.ContractId = UnitWork.ContractId; + newUnitWork.MainItemCode = UnitWork.MainItemCode; db.WBS_UnitWork.InsertOnSubmit(newUnitWork); db.SubmitChanges(); GetWeights(UnitWork.ProjectId); @@ -64,6 +66,8 @@ namespace BLL newUnitWork.RealEndDate = UnitWork.RealEndDate; newUnitWork.PlanCost = UnitWork.PlanCost; newUnitWork.JDWeights = UnitWork.JDWeights; + newUnitWork.ContractId = UnitWork.ContractId; + newUnitWork.MainItemCode = UnitWork.MainItemCode; db.SubmitChanges(); } GetWeights(UnitWork.ProjectId); @@ -273,6 +277,21 @@ namespace BLL return item; } /// + /// 获取单位工程名称项 + /// + /// 项目Id + /// + public static ListItem[] GetUnitWorkListByContract(string projectId, List contracts) + { + List q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null && contracts.Contains(x.ContractId) orderby x.UnitWorkCode select x).ToList(); + ListItem[] item = new ListItem[q.Count()]; + for (int i = 0; i < q.Count(); i++) + { + item[i] = new ListItem((q[i].UnitWorkCode + "-" + q[i].UnitWorkName + GetProjectType(q[i].ProjectType)) ?? "", q[i].UnitWorkId.ToString()); + } + return item; + } + /// /// 获取安装工程单位工程名称项 /// /// 项目Id @@ -358,6 +377,22 @@ namespace BLL } } /// + /// 单位工程表下拉框 + /// + /// 下拉框名字 + /// 是否显示请选择 + public static void InitContractUnitWorkDownList(FineUIPro.DropDownList dropName, string projectId, List contracts, bool isShowPlease) + { + dropName.DataValueField = "Value"; + dropName.DataTextField = "Text"; + dropName.DataSource = BLL.UnitWorkService.GetUnitWorkListByContract(projectId, contracts); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + /// /// 安装工程单位工程表下拉框 /// /// 下拉框名字 diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 18eb3fcb..5fc94fd2 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,171 +1,122 @@ 错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 +错误类型:HttpException +错误信息:文件“/PZHGL/InformationProject/ProjectConstructionLog.aspx”不存在。 错误堆栈: - 在 (TreeNode ) - 在 FineUIPro.TreeCommandEventArgs..ctor(TreeNode node, String commandName, String commandArgument) - 在 (TreeNode , String , String ) - 在 FineUIPro.Tree.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) -出错时间:09/07/2023 21:53:15 -出错文件:http://localhost:6422/DigData/WBSAnalysis.aspx + 在 System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:09/20/2023 21:33:59 +出错文件:http://localhost:6422/PZHGL/InformationProject/ProjectConstructionLog.aspx IP地址:::1 -操作人员:JT -出错时间:09/07/2023 21:53:15 +出错时间:09/20/2023 21:33:59 错误信息开始=====> 错误类型:NullReferenceException 错误信息:未将对象引用设置到对象的实例。 错误堆栈: - 在 FineUIPro.Web.CQMS.Check.EditCheckMonth.Page_Load(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\CQMS\Check\EditCheckMonth.aspx.cs:行号 39 + 在 FineUIPro.Web.Personal.PersonalInfo.Tab1LoadData() 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\Personal\PersonalInfo.aspx.cs:行号 83 + 在 FineUIPro.Web.Personal.PersonalInfo.Page_Load(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\Personal\PersonalInfo.aspx.cs:行号 46 在 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) -出错时间:09/11/2023 11:02:10 -出错文件:http://localhost:6422/CQMS/Check/EditCheckMonth.aspx?months=2023-09-01 -IP地址:::1 - -出错时间:09/11/2023 11:02:10 - - -错误信息开始=====> -错误类型:HttpRequestValidationException -错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m³")中检测到有潜在危险的 Request.Form 值。 -错误堆栈: - 在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.get_Form() - 在 System.Web.HttpRequest.get_HasForm() - 在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull) - 在 System.Web.UI.Page.DeterminePostBackMode() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest() - 在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context) - 在 System.Web.UI.Page.ProcessRequest(HttpContext context) - 在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context) - 在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:09/12/2023 09:47:37 -出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx +出错时间:09/21/2023 15:41:29 +出错文件:http://localhost:6422/Personal/PersonalInfo.aspx IP地址:::1 操作人员:JT -出错时间:09/12/2023 09:47:37 +出错时间:09/21/2023 15:41:29 错误信息开始=====> -错误类型:HttpRequestValidationException -错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m³")中检测到有潜在危险的 Request.Form 值。 +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 错误堆栈: - 在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.get_Form() - 在 System.Web.HttpRequest.get_HasForm() - 在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull) - 在 System.Web.UI.Page.DeterminePostBackMode() + 在 FineUIPro.Web.PZHGL.InformationProject.ConstructionLog.Page_Load(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\PZHGL\InformationProject\ConstructionLog.aspx.cs:行号 86 + 在 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) - 在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest() - 在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context) - 在 System.Web.UI.Page.ProcessRequest(HttpContext context) - 在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context) - 在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:09/12/2023 09:47:40 -出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx +出错时间:09/21/2023 16:05:41 +出错文件:http://localhost:6422/PZHGL/InformationProject/ConstructionLog.aspx IP地址:::1 操作人员:JT -出错时间:09/12/2023 09:47:40 +出错时间:09/21/2023 16:05:41 错误信息开始=====> -错误类型:HttpRequestValidationException -错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m³")中检测到有潜在危险的 Request.Form 值。 +错误类型:JsonReaderException +错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0. 错误堆栈: - 在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.get_Form() - 在 System.Web.HttpRequest.get_HasForm() - 在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull) - 在 System.Web.UI.Page.DeterminePostBackMode() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest() - 在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context) - 在 System.Web.UI.Page.ProcessRequest(HttpContext context) - 在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context) - 在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:09/12/2023 09:47:42 -出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/12/2023 09:47:42 + 在 Newtonsoft.Json.JsonTextReader.ParseValue() + 在 Newtonsoft.Json.JsonTextReader.Read() + 在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter) + 在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent) + 在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType) + 在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings) + 在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings) + 在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value) + 在 BLL.WeatherService.GetWeather(String projectId) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\Common\WeatherService.cs:行号 93 +出错时间:09/21/2023 20:05:25 +出错时间:09/21/2023 20:05:25 错误信息开始=====> -错误类型:HttpRequestValidationException -错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m³")中检测到有潜在危险的 Request.Form 值。 +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 错误堆栈: - 在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.get_Form() - 在 System.Web.HttpRequest.get_HasForm() - 在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull) - 在 System.Web.UI.Page.DeterminePostBackMode() + 在 (Object ) + 在 FineUIPro.GridRow.kxpUEMXYxcbykrOznAFBzkoxlAnb() + 在 (GridRow ) + 在 FineUIPro.GridRow.InitTemplateContainers() + 在 (GridRow ) + 在 FineUIPro.Grid.BkpgFeAELTFlAvoTrOBrConfcLJbA(Int32 , Object ) + 在 (Grid , Int32 , Object ) + 在 FineUIPro.Grid.CRTRkdQFrrBRFQuCddjZPswlTORP(IEnumerable , Boolean ) + 在 (Grid , IEnumerable , Boolean ) + 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData) + 在 (Grid , Boolean ) + 在 FineUIPro.Grid.DataBind() + 在 FineUIPro.Web.PZHGL.InformationProject.ConstructionLog.drpUnitWork_SelectedIndexChanged(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\PZHGL\InformationProject\ConstructionLog.aspx.cs:行号 968 + 在 FineUIPro.DropDownList.OnSelectedIndexChanged(EventArgs e) + 在 (DropDownList , EventArgs ) + 在 FineUIPro.DropDownList.RaisePostDataChangedEvent() + 在 System.Web.UI.Page.RaiseChangedEvents() 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest() - 在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context) - 在 System.Web.UI.Page.ProcessRequest(HttpContext context) - 在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context) - 在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:09/12/2023 09:48:38 -出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx +出错时间:09/21/2023 20:05:50 +出错文件:http://localhost:6422/PZHGL/InformationProject/ConstructionLog.aspx IP地址:::1 操作人员:JT -出错时间:09/12/2023 09:48:38 +出错时间:09/21/2023 20:05:50 错误信息开始=====> -错误类型:HttpRequestValidationException -错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m³")中检测到有潜在危险的 Request.Form 值。 +错误类型:JsonReaderException +错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0. 错误堆栈: - 在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.get_Form() - 在 System.Web.HttpRequest.get_HasForm() - 在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull) - 在 System.Web.UI.Page.DeterminePostBackMode() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest() - 在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context) - 在 System.Web.UI.Page.ProcessRequest(HttpContext context) - 在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context) - 在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:09/12/2023 09:48:39 -出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/12/2023 09:48:39 + 在 Newtonsoft.Json.JsonTextReader.ParseValue() + 在 Newtonsoft.Json.JsonTextReader.Read() + 在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter) + 在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent) + 在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType) + 在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings) + 在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings) + 在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value) + 在 BLL.WeatherService.GetWeather(String projectId) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\Common\WeatherService.cs:行号 93 +出错时间:09/21/2023 20:07:01 +出错时间:09/21/2023 20:07:01 diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx index 0390026c..ee673c0c 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx @@ -4,104 +4,405 @@ - + 项目级施工日志
- - + + - - + - - + - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -