diff --git a/DataBase/进度数据初始化脚本/分部分项初始化脚本.sql b/DataBase/进度数据初始化脚本/分部分项初始化脚本.sql index 1a35579e..32783999 100644 --- a/DataBase/进度数据初始化脚本/分部分项初始化脚本.sql +++ b/DataBase/进度数据初始化脚本/分部分项初始化脚本.sql @@ -3552,154 +3552,150 @@ GO --电信分部分项 insert into dbo.Wbs_UnitProjectInit(UnitProjectCode,UnitProjectName,SuperUnitProject,CnProfessionId,IsIn,SortIndex) -values('TC01','火灾报警系统',null,16,1,1) +values('TC','电信系统',null,16,1,1) GO -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0101','探测器安装(含设备安装、校接线、编码、调试)',16,null,'TC01',1,10) +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn) +values('TC01','火灾报警系统',16,null,'TC',1) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0102','声光报警和手报安装(含设备安装、校接线、编码、调试)',16,null,'TC01',1,10) +values('TC0101','探测器安装(含设备安装、校接线、编码、调试)',16,'TC01','TC',1,10) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0103','控制箱、模块箱安装',16,null,'TC01',1,10) +values('TC0102','声光报警和手报安装(含设备安装、校接线、编码、调试)',16,'TC01','TC',1,10) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0104','电缆保护管/线槽安装',16,null,'TC01',1,10) +values('TC0103','控制箱、模块箱安装',16,'TC01','TC',1,10) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0105','电缆敷设、接线、挂牌',16,null,'TC01',1,20) +values('TC0104','电缆保护管/线槽安装',16,'TC01','TC',1,10) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0106','消防控制柜安装',16,null,'TC01',1,10) +values('TC0105','电缆敷设、接线、挂牌',16,'TC01','TC',1,20) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0107','消防系统回路调试',16,null,'TC01',1,20) +values('TC0106','消防控制柜安装',16,'TC01','TC',1,10) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0108','备用电源及电池柜安装调试',16,null,'TC01',1,10) +values('TC0107','消防系统回路调试',16,'TC01','TC',1,20) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0108','备用电源及电池柜安装调试',16,'TC01','TC',1,10) GO -insert into dbo.Wbs_UnitProjectInit(UnitProjectCode,UnitProjectName,SuperUnitProject,CnProfessionId,IsIn,SortIndex) -values('TC02','通讯系统',null,16,1,2) +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn) +values('TC02','通讯系统',16,null,'TC',1) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0201','设备安装',16,'TC02','TC',1,null) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0202','调试',16,'TC02','TC',1,null) GO -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0201','设备安装',16,null,'TC02',1,null) +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn) +values('TC03','监控摄像系统',16,null,'TC',1) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0202','调试',16,null,'TC02',1,null) +values('TC0301','摄像头安装(含支架、控制箱等)',16,'TC03','TC',1,20) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0302','监控机柜安装(含柜内元器件、底座)',16,'TC03','TC',1,20) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0303','电缆保护管/线槽安装',16,'TC03','TC',1,20) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0304','线缆敷设、接线、挂牌',16,'TC03','TC',1,10) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0305','光纤敷设、熔接、挂牌、测试',16,'TC03','TC',1,5) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0306','监控摄像系统调试',16,'TC03','TC',1,25) GO -insert into dbo.Wbs_UnitProjectInit(UnitProjectCode,UnitProjectName,SuperUnitProject,CnProfessionId,IsIn,SortIndex) -values('TC03','监控摄像系统',null,16,1,3) +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn) +values('TC04','扩音对讲系统',16,null,'TC',1) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0401','喇叭、话站安装',16,'TC04','TC',1,20) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0402','接线箱安装',16,'TC04','TC',1,10) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0403','电缆保护管/线槽安装',16,'TC04','TC',1,20) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0404','线缆敷设、接线、挂牌',16,'TC04','TC',1,10) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0405','扩音对讲系统机柜安装',16,'TC04','TC',1,20) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0406','扩音对讲系统调试',16,'TC04','TC',1,20) GO -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0301','摄像头安装(含支架、控制箱等)',16,null,'TC03',1,20) +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn) +values('TC05','计算机网络系统',16,null,'TC',1) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0302','监控机柜安装(含柜内元器件、底座)',16,null,'TC03',1,20) +values('TC0501','设备安装',16,'TC05','TC',1,null) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0303','电缆保护管/线槽安装',16,null,'TC03',1,20) -GO -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0304','线缆敷设、接线、挂牌',16,null,'TC03',1,10) -GO -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0305','光纤敷设、熔接、挂牌、测试',16,null,'TC03',1,5) -GO -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0306','监控摄像系统调试',16,null,'TC03',1,25) +values('TC0502','系统调试',16,'TC05','TC',1,null) GO -insert into dbo.Wbs_UnitProjectInit(UnitProjectCode,UnitProjectName,SuperUnitProject,CnProfessionId,IsIn,SortIndex) -values('TC04','扩音对讲系统',null,16,1,4) +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn) +values('TC06','楼宇设备监控/安全防范系统',16,null,'TC',1) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0601','设备安装',16,'TC06','TC',1,null) +GO +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) +values('TC0602','系统调试',16,'TC06','TC',1,null) GO -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0401','喇叭、话站安装',16,null,'TC04',1,20) +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn) +values('TC07','有线电视系统',16,null,'TC',1) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0402','接线箱安装',16,null,'TC04',1,10) +values('TC0701','设备安装',16,'TC07','TC',1,null) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0403','电缆保护管/线槽安装',16,null,'TC04',1,20) -GO -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0404','线缆敷设、接线、挂牌',16,null,'TC04',1,10) -GO -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0405','扩音对讲系统机柜安装',16,null,'TC04',1,20) -GO -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0406','扩音对讲系统调试',16,null,'TC04',1,20) +values('TC0702','系统调试',16,'TC07','TC',1,null) GO -insert into dbo.Wbs_UnitProjectInit(UnitProjectCode,UnitProjectName,SuperUnitProject,CnProfessionId,IsIn,SortIndex) -values('TC05','计算机网络系统',null,16,1,5) -GO - -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0501','设备安装',16,null,'TC05',1,null) +Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn) +values('TC08','综合布线系统',16,null,'TC',1) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0502','系统调试',16,null,'TC05',1,null) -GO - -insert into dbo.Wbs_UnitProjectInit(UnitProjectCode,UnitProjectName,SuperUnitProject,CnProfessionId,IsIn,SortIndex) -values('TC06','楼宇设备监控/安全防范系统',null,16,1,6) -GO - -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0601','设备安装',16,null,'TC06',1,null) +values('TC0801','电视、电话、网络插座安装',16,'TC08','TC',1,5) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0602','系统调试',16,null,'TC06',1,null) -GO - -insert into dbo.Wbs_UnitProjectInit(UnitProjectCode,UnitProjectName,SuperUnitProject,CnProfessionId,IsIn,SortIndex) -values('TC07','有线电视系统',null,16,1,7) -GO - -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0701','设备安装',16,null,'TC07',1,null) +values('TC0802','分线接线箱安装',16,'TC08','TC',1,5) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0702','系统调试',16,null,'TC07',1,null) -GO - -insert into dbo.Wbs_UnitProjectInit(UnitProjectCode,UnitProjectName,SuperUnitProject,CnProfessionId,IsIn,SortIndex) -values('TC08','综合布线系统',null,16,1,8) -GO - -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0801','电视、电话、网络插座安装',16,null,'TC08',1,5) +values('TC0803','电缆保护管/线槽安装',16,'TC08','TC',1,20) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0802','分线接线箱安装',16,null,'TC08',1,5) +values('TC0804','线缆敷设、接线、挂牌',16,'TC08','TC',1,20) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0803','电缆保护管/线槽安装',16,null,'TC08',1,20) +values('TC0805','光纤敷设、熔接、挂牌、测试',16,'TC08','TC',1,10) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0804','线缆敷设、接线、挂牌',16,null,'TC08',1,20) +values('TC0806','桥架',16,'TC08','TC',1,null) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0805','光纤敷设、熔接、挂牌、测试',16,null,'TC08',1,10) +values('TC0807','金属构件',16,'TC08','TC',1,null) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0806','桥架',16,null,'TC08',1,null) +values('TC0808','机柜、机架安装(含设备)',16,'TC08','TC',1,20) GO Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0807','金属构件',16,null,'TC08',1,null) -GO -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0808','机柜、机架安装(含设备)',16,null,'TC08',1,20) -GO -Insert into dbo.WBS_WbsSetInit(WbsSetCode,WbsSetName,CnProfessionId,SuperWbsSetCode,UnitProjectCode,IsIn,Weights) -values('TC0809','综合布线系统调试',16,null,'TC08',1,20) +values('TC0809','综合布线系统调试',16,'TC08','TC',1,20) GO --采暖通风分部分项 diff --git a/SGGL/BLL/JDGL/WBS/CostControlDetailService.cs b/SGGL/BLL/JDGL/WBS/CostControlDetailService.cs index 10282d3b..995d592c 100644 --- a/SGGL/BLL/JDGL/WBS/CostControlDetailService.cs +++ b/SGGL/BLL/JDGL/WBS/CostControlDetailService.cs @@ -166,9 +166,22 @@ namespace BLL newWBS_CostControlDetail.Months = costControlDetail.Months; newWBS_CostControlDetail.StartDate = costControlDetail.StartDate; newWBS_CostControlDetail.EndDate = costControlDetail.EndDate; - newWBS_CostControlDetail.PlanNum = costControlDetail.PlanNum; - newWBS_CostControlDetail.ThisNum = costControlDetail.ThisNum; - + if (costControlDetail.PlanNum == 0) + { + newWBS_CostControlDetail.PlanNum = null; + } + else + { + newWBS_CostControlDetail.PlanNum = costControlDetail.PlanNum; + } + if (costControlDetail.ThisNum == 0) + { + newWBS_CostControlDetail.ThisNum = null; + } + else + { + newWBS_CostControlDetail.ThisNum = costControlDetail.ThisNum; + } db.WBS_CostControlDetail.InsertOnSubmit(newWBS_CostControlDetail); db.SubmitChanges(); } @@ -183,8 +196,22 @@ namespace BLL Model.WBS_CostControlDetail newWBS_CostControlDetail = db.WBS_CostControlDetail.First(e => e.CostControlDetailId == costControlDetail.CostControlDetailId); newWBS_CostControlDetail.StartDate = costControlDetail.StartDate; newWBS_CostControlDetail.EndDate = costControlDetail.EndDate; - newWBS_CostControlDetail.PlanNum = costControlDetail.PlanNum; - newWBS_CostControlDetail.ThisNum = costControlDetail.ThisNum; + if (costControlDetail.PlanNum == 0) + { + newWBS_CostControlDetail.PlanNum = null; + } + else + { + newWBS_CostControlDetail.PlanNum = costControlDetail.PlanNum; + } + if (costControlDetail.ThisNum == 0) + { + newWBS_CostControlDetail.ThisNum = null; + } + else + { + newWBS_CostControlDetail.ThisNum = costControlDetail.ThisNum; + } db.SubmitChanges(); } diff --git a/SGGL/FineUIPro.Web/File/Excel/JDGL/工作量录入.xls b/SGGL/FineUIPro.Web/File/Excel/JDGL/工作量录入.xls new file mode 100644 index 00000000..4d14eeaa Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/JDGL/工作量录入.xls differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index c4b9cb1f..66d01d4e 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -73,10 +73,16 @@ ..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll + + ..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll + False ..\FineUIPro\FineUIPro.dll + + ..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll + False False @@ -92,6 +98,18 @@ ..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll + + ..\packages\NPOI.2.5.5\lib\net45\NPOI.dll + + + ..\packages\NPOI.2.5.5\lib\net45\NPOI.OOXML.dll + + + ..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXml4Net.dll + + + ..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll + @@ -1185,6 +1203,7 @@ + @@ -12230,6 +12249,13 @@ WorkloadInputEdit.aspx + + WorkloadInputIn.aspx + ASPXCodeBehind + + + WorkloadInputIn.aspx + WorkloadStatistics.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInput.aspx b/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInput.aspx index c811fb44..fa28c13b 100644 --- a/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInput.aspx +++ b/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInput.aspx @@ -137,6 +137,9 @@ + +