diff --git a/DataBase/版本日志/SUBQHSE_V2025-02-11-gf.sql b/DataBase/版本日志/SUBQHSE_V2025-02-11-gf.sql
new file mode 100644
index 00000000..ca64fa1b
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2025-02-11-gf.sql
@@ -0,0 +1,102 @@
+
+CREATE TABLE [dbo].[JDGL_WBS](
+	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[ParentId] [nvarchar](50) NULL,
+	[ItemName] [nvarchar](50) NULL,
+	[ItemNum] [nvarchar](50) NULL,
+	[PlanStart] [datetime] NULL,
+	[PlanEnd] [datetime] NULL,
+	[RealityEnd] [datetime] NULL,
+	[PathCode] [nvarchar](50) NULL,
+	[PlanQuantities] [decimal](18, 2) NULL,
+	[RealityPrice] [decimal](18, 2) NULL,
+	[Total] [decimal](18, 2) NULL,
+	[Num] [decimal](18, 2) NULL,
+	[Cycle] [nvarchar](50) NULL,
+	[PlanPrice] [decimal](18, 2) NULL,
+	[Leave] [int] NULL,
+ CONSTRAINT [PK_JDGL_WBS] PRIMARY KEY CLUSTERED 
+(
+	[Id] 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].[JDGL_WBS]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_WBS_JDGL_WBS] FOREIGN KEY([Id])
+REFERENCES [dbo].[JDGL_WBS] ([Id])
+GO
+
+ALTER TABLE [dbo].[JDGL_WBS] CHECK CONSTRAINT [FK_JDGL_WBS_JDGL_WBS]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBS', @level2type=N'COLUMN',@level2name=N'Id'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBS', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ϼ�Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBS', @level2type=N'COLUMN',@level2name=N'ParentId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'WBS����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBS', @level2type=N'COLUMN',@level2name=N'ItemName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'WBS����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBS', @level2type=N'COLUMN',@level2name=N'ItemNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ƻ���ʼʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBS', @level2type=N'COLUMN',@level2name=N'PlanStart'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ƻ�����ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBS', @level2type=N'COLUMN',@level2name=N'PlanEnd'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵ�����ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBS', @level2type=N'COLUMN',@level2name=N'RealityEnd'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBS', @level2type=N'COLUMN',@level2name=N'PathCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���ȹ���װ�ù�������רҵ�ֲ��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBS'
+GO
+
+
+
+CREATE TABLE [dbo].[JDGL_WBSDetail](
+	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[WorkPackageId] [nvarchar](50) NULL,
+	[CompletionTime] [datetime] NULL,
+	[Name] [nvarchar](100) NULL,
+	[RealityCompletePercent] [decimal](9, 2) NULL,
+ CONSTRAINT [PK_JDGL_WBSDetail] PRIMARY KEY CLUSTERED 
+(
+	[Id] 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
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBSDetail', @level2type=N'COLUMN',@level2name=N'Id'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBSDetail', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBSDetail', @level2type=N'COLUMN',@level2name=N'WorkPackageId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBSDetail', @level2type=N'COLUMN',@level2name=N'CompletionTime'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBSDetail', @level2type=N'COLUMN',@level2name=N'Name'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵ����ɰٷֱ�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBSDetail', @level2type=N'COLUMN',@level2name=N'RealityCompletePercent'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_WBSDetail'
+GO
+
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index d84e1613..b937cbb9 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19357,7 +19357,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs
index 2d7c855c..fa21d08c 100644
--- a/SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs
@@ -241,410 +241,84 @@ namespace FineUIPro.Web.ProjectData
             {
                 if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectInstallationMenuId, BLL.Const.BtnAdd))
                 {
-                    Model.Project_Installation installation1 = BLL.Project_InstallationService.GetProjectInstallationByProjectId(this.CurrUser.LoginProjectId);
-                    if (installation1 != null)
+                    Model.SGGLDB db = Funs.DB;
+                    Model.JDGL_WBS wbs1 = db.JDGL_WBS.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId);
+                    if (wbs1 != null)
                     {
-                        ShowNotify("项目已存在装置，无法抽取！", MessageBoxIcon.Warning);
+                        ShowNotify("项目已存在数据，无法抽取！", MessageBoxIcon.Warning);
                         return;
                     }
                     Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
                     string contenttype = "application/json;charset=utf-8";
-                    var returndata0 = BLL.APIGetHttpService.ControlHttp(Funs.ControlApiUrl + "/Projects/GetProjectList?Code=" + project.KZProjectCode, "GET", contenttype, null, null);
-                    //string returndata0 = "{'result':{'items':[{'code':'22373','name':'甘肃能化金昌能源化工开发有限公司低阶煤高效利用制氢及50万吨尿基复合肥项目','shortName':'金昌能化50万吨尿基复合肥项目','projTypeId':1,'projType':'工程咨询','projPhaseId':65,'projPhase':'工程咨询','ownerName':'甘肃能化金昌能源化工开发有限公司','address':'境内','nature':'新建','level':'3级','productId':0,'productName':'','productSize':'','initiationDate':'2023-01-19T00:00:00','planStart':'2023-01-19T00:00:00','planFinish':'2023-02-10T00:00:00','realStart':null,'realFinish':null,'contractAmount':0.0000,'contractNumber':'','basicProcess':'','remark':'','isFinished':false,'communityArea':'2亿Nm3/年氢气，30万吨/年合成氨，50万吨/年尿基复合肥','isBreakdown':false,'isSpecial':false,'isKey':false,'status':'COMPLETION','guid':'73c4f36d-1ed2-41ba-9c6e-04619de214de','createdAt':'2023-01-19T09:21:20.213','updatedAt':'2023-01-19T09:21:20.213','id':34961},{'code':'22373','name':'甘肃能化金昌能源化工开发有限公司低阶煤高效利用制氢及50万吨尿基复合肥项目','shortName':'低阶煤高效利用制氢及50 万吨/年高浓度尿基复合肥项目','projTypeId':5,'projType':'工程总承包','projPhaseId':14,'projPhase':'EPC','ownerName':'甘肃能化金昌能源化工开发有限公司','address':'境内','nature':'新建','level':'1级','productId':0,'productName':'合成氨、尿素（中间产品）、尿基复合肥、氢气','productSize':'合成氨40万吨/年； 尿素30万吨/年； 氢气2亿m3/年； 尿基复合肥50万吨/年','initiationDate':'2023-04-23T00:00:00','planStart':'2023-04-23T00:00:00','planFinish':'2025-06-30T00:00:00','realStart':null,'realFinish':null,'contractAmount':0.0000,'contractNumber':'','basicProcess':'氨合成采用南京聚拓专利，尿素装置采用中国五环自有尿素专利技术。','remark':'','isFinished':false,'communityArea':'1.总体院；\n2.40万吨/年合成氨装置：合成气压缩、冷冻、氨合成、氨回收、PSA制氢（2亿m3/年氢气）、尾气压缩、输煤CO2压缩、尿素CO2压缩；\n3.30万吨/年尿素装置：主装置、原料贮运、成品包装贮运；\n4.50万吨/年尿基复合肥装置；\n5.公用工程：循环水、脱盐水、污水、中水回用、零排放、变电所、机柜间、中控室、综合泵站、生产消防水池等；\n6.辅助生产设施：生产分析室、维修车间、综合仓库、危废暂存库、化学品库、火炬等；\n7.储运系统：液氨常压罐、事故甲醇罐、液氨球罐、装车栈台、泡沫站等。','isBreakdown':true,'isSpecial':false,'isKey':false,'status':'EXECUTION','guid':'10142090-f850-47ae-be6c-43597e6dc4d1','createdAt':'2023-04-23T14:39:53.98','updatedAt':'2023-08-16T18:45:05.997','id':35120},{'code':'22373','name':'甘肃能化金昌能源化工开发有限公司低阶煤高效利用制氢及50万吨尿基复合肥项目','shortName':'甘肃能化金昌能化阶煤高效利用制氢及尿基复合肥项目','projTypeId':6,'projType':'投标','projPhaseId':18,'projPhase':'EPC投标','ownerName':'甘肃能化金昌能源化工开发有限公司','address':'境内','nature':'新建','level':'','productId':0,'productName':'合成氨及尿基复合肥','productSize':'合成氨30万吨/年（其中17.4万吨生产尿素）、尿素30万吨/年（中间产品）、尿基复合肥50万吨/年','initiationDate':'2023-02-01T00:00:00','planStart':'2023-02-01T00:00:00','planFinish':'2023-04-15T00:00:00','realStart':null,'realFinish':null,'contractAmount':0.0000,'contractNumber':'','basicProcess':'合成氨采用国有专利，尿素采用五环公司高效合成、低能耗尿素工艺技术。\n','remark':'','isFinished':true,'communityArea':'一、气化采用航天粉煤气化技术，生产氢气2亿Nm3/年、合成氨30万吨/年（其中17.4万吨生产尿素）、尿素30万吨/年、尿基复合肥50万吨/年、硫磺2.24万吨/年。\n二、本次投标范围为：空分装置，净化装置，合成氨装置，罐区，尿素装置，尿基复合肥装置，硫回收装置，锅炉装置（2x220t/h循环流化床锅炉）、水处理系统装置等全厂公辅，全厂总图、外线、地管、道路、控制室、变电所等，总体院。','isBreakdown':false,'isSpecial':false,'isKey':false,'status':'COMPLETION','guid':'9ffcd266-7196-4df1-9432-b818a5c91a6f','createdAt':'2023-02-01T15:30:18.013','updatedAt':'2023-07-27T16:58:14.37','id':34964}]},'targetUrl':null,'success':true,'error':null,'unAuthorizedRequest':false,'__abp':true}";
+                    var returndata0 = BLL.APIGetHttpService.ControlHttp(Funs.ControlApiUrl + "/project/api/hcoud-wuhuan/projectwbsconstruct/constructionTree?wuId=" + project.KZProjectCode, "GET", contenttype, null, null);
+                    var returndata1 = BLL.APIGetHttpService.ControlHttp(Funs.ControlApiUrl + "/project/api/hcoud-wuhuan/projectwbsconstruct/checkPointList?wuId=" + project.KZProjectCode, "GET", contenttype, null, null);
+                    List<Model.JDGL_WBS> wbss = new List<Model.JDGL_WBS>();
+                    List<Model.JDGL_WBSDetail> wbsDetails = new List<Model.JDGL_WBSDetail>();
                     if (!string.IsNullOrEmpty(returndata0))
                     {
                         JObject obj0 = JObject.Parse(returndata0);
-                        JArray arr0 = JArray.Parse(obj0["result"]["items"].ToString());
-                        string proId = string.Empty;
-                        foreach (var item in arr0)
+                        if (obj0["code"].ToString() == "200")
                         {
-                            string projType = item["projType"].ToString();
-                            string projPhase = item["projPhase"].ToString();
-                            if (project.ProjType == projType && project.ProjPhase == projPhase)
+                            JArray arr0 = JArray.Parse(obj0["data"].ToString());
+                            string proId = string.Empty;
+                  
+                            List<string> list = new List<string>();
+                            foreach (var item in arr0)
                             {
-                                proId= item["id"].ToString();
-                            }
-                        }
-                        var returndata = BLL.APIGetHttpService.ControlHttp(Funs.ControlApiUrl + "/Projects/GetConstructionWbsList?ProjId=" + proId, "GET", contenttype, null, null);
-                        if (!string.IsNullOrEmpty(returndata))
-                        {
-                            JObject obj = JObject.Parse(returndata);
-                            JArray arr = JArray.Parse(obj["result"].ToString());
-                            Model.SGGLDB db = Funs.DB;
-                            //专业
-                            var cnProfessionInits = from x in db.WBS_CnProfessionInit select x;
-                            //单位工程及子单位工程
-                            var unitProjectInits = from x in db.Wbs_UnitProjectInit orderby x.SuperUnitProject select x;
-                            //分部/子分部/分项/子分项
-                            var wbsSetInits = (from x in db.WBS_WbsSetInit orderby x.SuperWbsSetCode select x).ToList();
-                            //费用清单对应关系
-                            var wbsSetMatchCostControlInits = from x in db.WBS_WbsSetMatchCostControlInit orderby x.WbsSetCode select x;
-                            //费用清单项
-                            var totalCostControlInits = from x in db.WBS_CostControlInit orderby x.CostControlInitCode select x;
-                            string sgId = string.Empty;
-                            foreach (var item in arr)
-                            {
-                                string id = item["id"].ToString();   //记录Id，主键
-                                string parentId = item["parentId"].ToString();   //上一级记录Id
-                                string code = item["code"].ToString();   //WBS编码
-                                string name = item["name"].ToString();   //WBS名称
-                                string level = item["level"].ToString();   //级别，0-7依次表示：项目、阶段（施工）、装置、工序、主项、专业、分部工程、分项工程
-                                string isLeaf = item["isLeaf"].ToString();   //是否末级
-                                string ppsId = item["ppsId"].ToString();   //阶段ID，3代表施工
-                                string projId = item["projId"].ToString();   //项目ID
-                                string planStart = item["planStart"].ToString();   //计划开始日期
-                                string planFinish = item["planFinish"].ToString();   //计划完成日期
-                                string remark = item["remark"].ToString();   //备注
-                                if (level == "0" || level == "1" || level == "2" || level == "3" || level == "4")
+                                Model.JDGL_WBS wBS = new Model.JDGL_WBS();
+                                wBS.Id = item["id"].ToString();
+                                wBS.ProjectId = this.CurrUser.LoginProjectId;
+                                wBS.ParentId = item["parentId"].ToString();
+                                wBS.Leave = Funs.GetNewInt(item["leave"].ToString());
+                                wBS.PathCode = item["pathCode"].ToString();
+                                wBS.ItemName = item["itemName"].ToString();
+                                wBS.PlanQuantities = Funs.GetNewDecimal(item["planQuantities"].ToString());
+                                wBS.PlanEnd = Funs.GetNewDateTime(item["planEnd"].ToString());
+                                wBS.RealityEnd = Funs.GetNewDateTime(item["realityEnd"].ToString());
+                                wBS.RealityPrice = Funs.GetNewDecimal(item["realityPrice"].ToString());
+                                wBS.Total= Funs.GetNewDecimal(item["total"].ToString());
+                                wBS.Num = Funs.GetNewDecimal(item["num"].ToString());
+                                wBS.Cycle = item["cycle"].ToString();
+                                wBS.PlanPrice= Funs.GetNewDecimal(item["planPrice"].ToString());
+                                if (!list.Contains(wBS.Id))
                                 {
-                                    Model.Project_Installation installation = new Model.Project_Installation();
-                                    installation.InstallationId = id;
-                                    installation.ProjectId = this.CurrUser.LoginProjectId;
-                                    installation.InstallationCode = code;
-                                    installation.InstallationName = name;
-                                    installation.SuperInstallationId = parentId == "-1" ? "0" : parentId;
-                                    installation.StartDate = Funs.GetNewDateTime(planStart);
-                                    installation.EndDate = Funs.GetNewDateTime(planFinish);
-                                    installation.IsEnd = Convert.ToBoolean(isLeaf);
-                                    installation.Def = remark;
-                                    db.Project_Installation.InsertOnSubmit(installation);
-                                    db.SubmitChanges();
-                                    if (name == "施工")
-                                    {
-                                        sgId = id;
-                                    }
-                                }
-                                else if (level == "5")
-                                {
-                                    var cn = cnProfessionInits.FirstOrDefault(x => x.CnProfessionName.Contains(name.Substring(0, 2)));
-                                    //拷贝专业
-                                    if (cn != null)
-                                    {
-                                        if (cn.CnProfessionName != "防腐绝热" && cn.CnProfessionName != "地勘" && cn.CnProfessionName != "全厂地下主管网" && cn.CnProfessionName != "临时设施" && cn.CnProfessionName != "总图")
-                                        {
-                                            Model.WBS_CnProfession cnProfession = new Model.WBS_CnProfession();
-                                            cnProfession.CnProfessionId = id;
-                                            cnProfession.CnProfessionName = cn.CnProfessionName;
-                                            cnProfession.CnProfessionCode = cn.CnProfessionCode;
-                                            cnProfession.InstallationId = parentId;
-                                            cnProfession.ProjectId = this.CurrUser.LoginProjectId;
-                                            cnProfession.StartDate = Funs.GetNewDateTime(planStart);
-                                            cnProfession.EndDate = Funs.GetNewDateTime(planFinish);
-                                            cnProfession.OldId = cn.CnProfessionId;
-                                            db.WBS_CnProfession.InsertOnSubmit(cnProfession);
-                                            db.SubmitChanges();
-                                            //单位工程
-                                            var unitProjects = unitProjectInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
-                                            foreach (var unitProjectInit in unitProjects)
-                                            {
-                                                Model.Wbs_UnitProject unitProject = new Model.Wbs_UnitProject();
-                                                unitProject.UnitProjectId = SQLHelper.GetNewID(typeof(Model.Wbs_UnitProject));
-                                                unitProject.UnitProjectCode = unitProjectInit.UnitProjectCode;
-                                                unitProject.UnitProjectName = unitProjectInit.UnitProjectName;
-                                                unitProject.InstallationId = parentId;
-                                                unitProject.SortIndex = unitProjectInit.SortIndex;
-                                                unitProject.SuperUnitProjectId = null;
-                                                unitProject.ProjectId = this.CurrUser.LoginProjectId;
-                                                unitProject.CnProfessionId = id;
-                                                unitProject.StartDate = Funs.GetNewDateTime(planStart);
-                                                unitProject.EndDate = Funs.GetNewDateTime(planFinish);
-                                                unitProject.Remark = unitProjectInit.Remark;
-                                                unitProject.IsIn = true;
-                                                db.Wbs_UnitProject.InsertOnSubmit(unitProject);
-                                                db.SubmitChanges();
-                                            }
-                                            //分部分项
-                                            var wbsSets = wbsSetInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
-                                            foreach (var wbsSetInit in wbsSets)
-                                            {
-                                                Model.Wbs_WbsSet wbsSet = new Model.Wbs_WbsSet();
-                                                wbsSet.WbsSetId = SQLHelper.GetNewID(typeof(Model.Wbs_WbsSet));
-                                                wbsSet.WbsSetCode = wbsSetInit.WbsSetCode;
-                                                wbsSet.WbsSetName = wbsSetInit.WbsSetName;
-                                                wbsSet.InstallationId = parentId;
-                                                wbsSet.CnProfessionId = id;
-                                                wbsSet.UnitProjectId = (from x in db.Wbs_UnitProject where x.UnitProjectCode == wbsSetInit.UnitProjectCode && x.CnProfessionId == id select x.UnitProjectId).FirstOrDefault();
-                                                if (wbsSetInit.SuperWbsSetCode == null)
-                                                {
-                                                    wbsSet.SuperWbsSetId = null;
-                                                }
-                                                else
-                                                {
-                                                    wbsSet.SuperWbsSetId = (from x in db.Wbs_WbsSet
-                                                                            where x.WbsSetCode == wbsSetInit.SuperWbsSetCode && x.InstallationId == parentId && x.CnProfessionId == id
-                                                                            select x.WbsSetId).FirstOrDefault();
-                                                }
-                                                wbsSet.ProjectId = this.CurrUser.LoginProjectId;
-                                                wbsSet.StartDate = Funs.GetNewDateTime(planStart);
-                                                wbsSet.EndDate = Funs.GetNewDateTime(planFinish);
-                                                wbsSet.Flag = wbsSetInit.Flag;
-                                                wbsSet.Way = wbsSetInit.Way;
-                                                wbsSet.Weights = wbsSetInit.Weights;
-                                                wbsSet.ControlItemDef = wbsSetInit.ControlItemDef;
-                                                wbsSet.ControlPoint = wbsSetInit.ControlPoint;
-                                                wbsSet.Remark = wbsSetInit.Remark;
-                                                wbsSet.IsIn = true;
-                                                db.Wbs_WbsSet.InsertOnSubmit(wbsSet);
-                                                db.SubmitChanges();
-                                                var wbsSetMatchCostControls = wbsSetMatchCostControlInits.Where(x => x.WbsSetCode == wbsSetInit.WbsSetCode);
-                                                foreach (var wbsSetMatchCostControlInit in wbsSetMatchCostControls)
-                                                {
-                                                    Model.WBS_WbsSetMatchCostControl wbsSetMatchCostControl = new Model.WBS_WbsSetMatchCostControl();
-                                                    wbsSetMatchCostControl.WbsSetMatchCostControlId = SQLHelper.GetNewID();
-                                                    wbsSetMatchCostControl.WbsSetId = wbsSet.WbsSetId;
-                                                    wbsSetMatchCostControl.CostControlCode = wbsSetMatchCostControlInit.CostControlInitCode;
-                                                    if (wbsSetMatchCostControl.WbsSetId != null)
-                                                    {
-                                                        db.WBS_WbsSetMatchCostControl.InsertOnSubmit(wbsSetMatchCostControl);
-                                                        db.SubmitChanges();
-                                                        //拷贝费用清单项
-                                                        var costControlInits = from x in totalCostControlInits where x.CostControlInitCode == wbsSetMatchCostControlInit.CostControlInitCode orderby x.CostControlInitCode select x;
-                                                        foreach (var costControlInit in costControlInits)
-                                                        {
-                                                            Model.WBS_CostControl costControl = new Model.WBS_CostControl();
-                                                            costControl.CostControlId = SQLHelper.GetNewID();
-                                                            costControl.ProjectId = this.CurrUser.LoginProjectId;
-                                                            costControl.WbsSetId = wbsSetMatchCostControl.WbsSetId;
-                                                            costControl.CostControlCode = costControlInit.CostControlInitCode;
-                                                            costControl.CostControlName = costControlInit.CostControlInitName;
-                                                            costControl.Unit = costControlInit.Unit;
-                                                            db.WBS_CostControl.InsertOnSubmit(costControl);
-                                                            db.SubmitChanges();
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        else
-                                        {
-                                            var oldInstallation = Funs.DB.Project_Installation.FirstOrDefault(x => x.InstallationName == name);
-                                            if (oldInstallation == null)
-                                            {
-                                                Model.Project_Installation installation = new Model.Project_Installation();
-                                                installation.InstallationId = id;
-                                                installation.ProjectId = this.CurrUser.LoginProjectId;
-                                                installation.InstallationCode = code;
-                                                installation.InstallationName = name;
-                                                installation.SuperInstallationId = sgId;
-                                                installation.StartDate = Funs.GetNewDateTime(planStart);
-                                                installation.EndDate = Funs.GetNewDateTime(planFinish);
-                                                installation.IsEnd = true;
-                                                installation.Def = remark;
-                                                db.Project_Installation.InsertOnSubmit(installation);
-                                                db.SubmitChanges();
-                                                // 拷贝总图等专业下WBS内容
-                                                //拷贝单位工程及子单位工程
-                                                var unitProjects = unitProjectInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
-                                                foreach (var unitProjectInit in unitProjects)
-                                                {
-                                                    Model.Wbs_UnitProject unitProject = new Model.Wbs_UnitProject();
-                                                    unitProject.UnitProjectId = SQLHelper.GetNewID(typeof(Model.Wbs_UnitProject));
-                                                    unitProject.UnitProjectCode = unitProjectInit.UnitProjectCode;
-                                                    unitProject.UnitProjectName = unitProjectInit.UnitProjectName;
-                                                    if (unitProjectInit.SuperUnitProject == null)
-                                                    {
-                                                        unitProject.SuperUnitProjectId = null;
-                                                    }
-                                                    else
-                                                    {
-                                                        unitProject.SuperUnitProjectId = (from x in Funs.DB.Wbs_UnitProject
-                                                                                          where x.UnitProjectCode == unitProjectInit.SuperUnitProject && x.InstallationId == id
-                                                                                          select x.UnitProjectId).FirstOrDefault();
-                                                    }
-                                                    unitProject.InstallationId = id;
-                                                    unitProject.SortIndex = unitProjectInit.SortIndex;
-                                                    unitProject.ProjectId = this.CurrUser.LoginProjectId;
-                                                    unitProject.StartDate = Funs.GetNewDateTime(planStart);
-                                                    unitProject.EndDate = Funs.GetNewDateTime(planFinish);
-                                                    unitProject.Remark = unitProjectInit.Remark;
-                                                    unitProject.IsIn = true;
-                                                    db.Wbs_UnitProject.InsertOnSubmit(unitProject);
-                                                    db.SubmitChanges();
-                                                }
-                                                //拷贝分部/子分部/分项/子分项
-                                                var wbsSets = wbsSetInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
-                                                foreach (var wbsSetInit in wbsSets)
-                                                {
-                                                    Model.Wbs_WbsSet wbsSet = new Model.Wbs_WbsSet();
-                                                    wbsSet.WbsSetId = SQLHelper.GetNewID(typeof(Model.Wbs_WbsSet));
-                                                    wbsSet.WbsSetCode = wbsSetInit.WbsSetCode;
-                                                    wbsSet.WbsSetName = wbsSetInit.WbsSetName;
-                                                    wbsSet.InstallationId = id;
-                                                    wbsSet.UnitProjectId = (from x in Funs.DB.Wbs_UnitProject where x.UnitProjectCode == wbsSetInit.UnitProjectCode && x.InstallationId == id select x.UnitProjectId).FirstOrDefault();
-                                                    if (wbsSetInit.SuperWbsSetCode == null)
-                                                    {
-                                                        wbsSet.SuperWbsSetId = null;
-                                                    }
-                                                    else
-                                                    {
-                                                        wbsSet.SuperWbsSetId = (from x in Funs.DB.Wbs_WbsSet
-                                                                                where x.WbsSetCode == wbsSetInit.SuperWbsSetCode && x.InstallationId == id
-                                                                                select x.WbsSetId).FirstOrDefault();
-                                                    }
-                                                    wbsSet.ProjectId = this.CurrUser.LoginProjectId;
-                                                    wbsSet.StartDate = Funs.GetNewDateTime(planStart);
-                                                    wbsSet.EndDate = Funs.GetNewDateTime(planFinish);
-                                                    wbsSet.Flag = wbsSetInit.Flag;
-                                                    wbsSet.Way = wbsSetInit.Way;
-                                                    wbsSet.Weights = wbsSetInit.Weights;
-                                                    wbsSet.ControlItemDef = wbsSetInit.ControlItemDef;
-                                                    wbsSet.ControlPoint = wbsSetInit.ControlPoint;
-                                                    wbsSet.Remark = wbsSetInit.Remark;
-                                                    wbsSet.IsIn = true;
-                                                    db.Wbs_WbsSet.InsertOnSubmit(wbsSet);
-                                                    db.SubmitChanges();
-                                                    var wbsSetMatchCostControls = wbsSetMatchCostControlInits.Where(x => x.WbsSetCode == wbsSetInit.WbsSetCode);
-                                                    foreach (var wbsSetMatchCostControlInit in wbsSetMatchCostControls)
-                                                    {
-                                                        Model.WBS_WbsSetMatchCostControl wbsSetMatchCostControl = new Model.WBS_WbsSetMatchCostControl();
-                                                        wbsSetMatchCostControl.WbsSetMatchCostControlId = SQLHelper.GetNewID();
-                                                        wbsSetMatchCostControl.WbsSetId = wbsSet.WbsSetId;
-                                                        wbsSetMatchCostControl.CostControlCode = wbsSetMatchCostControlInit.CostControlInitCode;
-                                                        if (wbsSetMatchCostControl.WbsSetId != null)
-                                                        {
-                                                            db.WBS_WbsSetMatchCostControl.InsertOnSubmit(wbsSetMatchCostControl);
-                                                            db.SubmitChanges();
-                                                            //拷贝费用清单项
-                                                            var costControlInits = from x in totalCostControlInits where x.CostControlInitCode == wbsSetMatchCostControlInit.CostControlInitCode orderby x.CostControlInitCode select x;
-                                                            foreach (var costControlInit in costControlInits)
-                                                            {
-                                                                Model.WBS_CostControl costControl = new Model.WBS_CostControl();
-                                                                costControl.CostControlId = SQLHelper.GetNewID();
-                                                                costControl.ProjectId = this.CurrUser.LoginProjectId;
-                                                                costControl.WbsSetId = wbsSetMatchCostControl.WbsSetId;
-                                                                costControl.CostControlCode = costControlInit.CostControlInitCode;
-                                                                costControl.CostControlName = costControlInit.CostControlInitName;
-                                                                costControl.Unit = costControlInit.Unit;
-                                                                db.WBS_CostControl.InsertOnSubmit(costControl);
-                                                                db.SubmitChanges();
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                                else if (level == "6" || level == "7")
-                                {
-                                    if (name.Contains("防腐绝热") || name.Contains("地勘") || name.Contains("全厂地下主管网") || name.Contains("临时设施") || name.Contains("总图"))
-                                    {
-                                        var cn = cnProfessionInits.FirstOrDefault(x => x.CnProfessionName.Contains(name.Substring(0, 2)));
-                                        if (cn != null)
-                                        {
-                                            var oldInstallation = Funs.DB.Project_Installation.FirstOrDefault(x => x.InstallationName == name);
-                                            if (oldInstallation == null)
-                                            {
-                                                Model.Project_Installation installation = new Model.Project_Installation();
-                                                installation.InstallationId = id;
-                                                installation.ProjectId = this.CurrUser.LoginProjectId;
-                                                installation.InstallationCode = code;
-                                                installation.InstallationName = name;
-                                                installation.SuperInstallationId = sgId;
-                                                installation.StartDate = Funs.GetNewDateTime(planStart);
-                                                installation.EndDate = Funs.GetNewDateTime(planFinish);
-                                                installation.IsEnd = true;
-                                                installation.Def = remark;
-                                                db.Project_Installation.InsertOnSubmit(installation);
-                                                db.SubmitChanges();
-                                                // 拷贝总图等专业下WBS内容
-                                                //拷贝单位工程及子单位工程
-                                                var unitProjects = unitProjectInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
-                                                foreach (var unitProjectInit in unitProjects)
-                                                {
-                                                    Model.Wbs_UnitProject unitProject = new Model.Wbs_UnitProject();
-                                                    unitProject.UnitProjectId = SQLHelper.GetNewID(typeof(Model.Wbs_UnitProject));
-                                                    unitProject.UnitProjectCode = unitProjectInit.UnitProjectCode;
-                                                    unitProject.UnitProjectName = unitProjectInit.UnitProjectName;
-                                                    if (unitProjectInit.SuperUnitProject == null)
-                                                    {
-                                                        unitProject.SuperUnitProjectId = null;
-                                                    }
-                                                    else
-                                                    {
-                                                        unitProject.SuperUnitProjectId = (from x in Funs.DB.Wbs_UnitProject
-                                                                                          where x.UnitProjectCode == unitProjectInit.SuperUnitProject && x.InstallationId == id
-                                                                                          select x.UnitProjectId).FirstOrDefault();
-                                                    }
-                                                    unitProject.InstallationId = id;
-                                                    unitProject.SortIndex = unitProjectInit.SortIndex;
-                                                    unitProject.ProjectId = this.CurrUser.LoginProjectId;
-                                                    unitProject.StartDate = Funs.GetNewDateTime(planStart);
-                                                    unitProject.EndDate = Funs.GetNewDateTime(planFinish);
-                                                    unitProject.Remark = unitProjectInit.Remark;
-                                                    unitProject.IsIn = true;
-                                                    db.Wbs_UnitProject.InsertOnSubmit(unitProject);
-                                                    db.SubmitChanges();
-                                                }
-                                                //拷贝分部/子分部/分项/子分项
-                                                var wbsSets = wbsSetInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
-                                                foreach (var wbsSetInit in wbsSets)
-                                                {
-                                                    Model.Wbs_WbsSet wbsSet = new Model.Wbs_WbsSet();
-                                                    wbsSet.WbsSetId = SQLHelper.GetNewID(typeof(Model.Wbs_WbsSet));
-                                                    wbsSet.WbsSetCode = wbsSetInit.WbsSetCode;
-                                                    wbsSet.WbsSetName = wbsSetInit.WbsSetName;
-                                                    wbsSet.InstallationId = id;
-                                                    wbsSet.UnitProjectId = (from x in Funs.DB.Wbs_UnitProject where x.UnitProjectCode == wbsSetInit.UnitProjectCode && x.InstallationId == id select x.UnitProjectId).FirstOrDefault();
-                                                    if (wbsSetInit.SuperWbsSetCode == null)
-                                                    {
-                                                        wbsSet.SuperWbsSetId = null;
-                                                    }
-                                                    else
-                                                    {
-                                                        wbsSet.SuperWbsSetId = (from x in Funs.DB.Wbs_WbsSet
-                                                                                where x.WbsSetCode == wbsSetInit.SuperWbsSetCode && x.InstallationId == id
-                                                                                select x.WbsSetId).FirstOrDefault();
-                                                    }
-                                                    wbsSet.ProjectId = this.CurrUser.LoginProjectId;
-                                                    wbsSet.StartDate = Funs.GetNewDateTime(planStart);
-                                                    wbsSet.EndDate = Funs.GetNewDateTime(planFinish);
-                                                    wbsSet.Flag = wbsSetInit.Flag;
-                                                    wbsSet.Way = wbsSetInit.Way;
-                                                    wbsSet.Weights = wbsSetInit.Weights;
-                                                    wbsSet.ControlItemDef = wbsSetInit.ControlItemDef;
-                                                    wbsSet.ControlPoint = wbsSetInit.ControlPoint;
-                                                    wbsSet.Remark = wbsSetInit.Remark;
-                                                    wbsSet.IsIn = true;
-                                                    db.Wbs_WbsSet.InsertOnSubmit(wbsSet);
-                                                    db.SubmitChanges();
-                                                    var wbsSetMatchCostControls = wbsSetMatchCostControlInits.Where(x => x.WbsSetCode == wbsSetInit.WbsSetCode);
-                                                    foreach (var wbsSetMatchCostControlInit in wbsSetMatchCostControls)
-                                                    {
-                                                        Model.WBS_WbsSetMatchCostControl wbsSetMatchCostControl = new Model.WBS_WbsSetMatchCostControl();
-                                                        wbsSetMatchCostControl.WbsSetMatchCostControlId = SQLHelper.GetNewID();
-                                                        wbsSetMatchCostControl.WbsSetId = wbsSet.WbsSetId;
-                                                        wbsSetMatchCostControl.CostControlCode = wbsSetMatchCostControlInit.CostControlInitCode;
-                                                        if (wbsSetMatchCostControl.WbsSetId != null)
-                                                        {
-                                                            db.WBS_WbsSetMatchCostControl.InsertOnSubmit(wbsSetMatchCostControl);
-                                                            db.SubmitChanges();
-                                                            //拷贝费用清单项
-                                                            var costControlInits = from x in totalCostControlInits where x.CostControlInitCode == wbsSetMatchCostControlInit.CostControlInitCode orderby x.CostControlInitCode select x;
-                                                            foreach (var costControlInit in costControlInits)
-                                                            {
-                                                                Model.WBS_CostControl costControl = new Model.WBS_CostControl();
-                                                                costControl.CostControlId = SQLHelper.GetNewID();
-                                                                costControl.ProjectId = this.CurrUser.LoginProjectId;
-                                                                costControl.WbsSetId = wbsSetMatchCostControl.WbsSetId;
-                                                                costControl.CostControlCode = costControlInit.CostControlInitCode;
-                                                                costControl.CostControlName = costControlInit.CostControlInitName;
-                                                                costControl.Unit = costControlInit.Unit;
-                                                                db.WBS_CostControl.InsertOnSubmit(costControl);
-                                                                db.SubmitChanges();
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
+                                    wbss.Add(wBS);
+                                    list.Add(wBS.Id);
                                 }
                             }
-                            ShowNotify("抽取成功！", MessageBoxIcon.Success);
-                            InitTreeMenu();
+                            //InitTreeMenu();
                         }
                     }
+                    if (!string.IsNullOrEmpty(returndata1))
+                    {
+                        JObject obj0 = JObject.Parse(returndata1);
+                        if (obj0["code"].ToString() == "200")
+                        {
+                            JArray arr0 = JArray.Parse(obj0["data"].ToString());
+                            string proId = string.Empty;
+
+                            List<string> list = new List<string>();
+                            foreach (var item in arr0)
+                            {
+                                Model.JDGL_WBSDetail wBSDetail = new Model.JDGL_WBSDetail();
+                                wBSDetail.Id = item["id"].ToString();
+                                wBSDetail.ProjectId = this.CurrUser.LoginProjectId;
+                                wBSDetail.CompletionTime = Funs.GetNewDateTime(item["completionTime"].ToString());
+                                wBSDetail.WorkPackageId = item["workPackageId"].ToString();
+                                wBSDetail.Name = item["name"].ToString();
+                                wBSDetail.RealityCompletePercent = Funs.GetNewDecimal(item["realityCompletePercent"].ToString());
+                                //if (!list.Contains(wBS.Id))
+                                //{
+                                //    wbss.Add(wBS);
+                                //    list.Add(wBS.Id);
+                                //}
+                            }
+                            //InitTreeMenu();
+                        }
+                    }
+                    db.JDGL_WBS.InsertAllOnSubmit(wbss);
+                    db.SubmitChanges();
+                    ShowNotify("抽取成功！", MessageBoxIcon.Success);
                 }
                 else
                 {
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 6c177656..6b0f037e 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="true" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
@@ -22,7 +22,7 @@
     <!--启用与集团实名制 True启用 False 不启用-->
     <add key="EnableRealName" value="False"/>
     <add key="RealNameApiUrl" value="https://lwsm.cncecoa.com/share-labour1"/>
-    <add key="ControlApiUrl" value="http://webwh02.cwcec.com:9123/api/services/app"/>
+    <add key="ControlApiUrl" value="http://pmptest.cwcec.com"/>
     <add key="Intervaltime" value="20"/>
     <!--<add key="RealNameClientId" value="1338326379741057025"/>
     <add key="RealNameUserName" value="zgwhgcyxgs@CNCEC"/>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 372b6848..f7582523 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -1385,6 +1385,12 @@ namespace Model
     partial void InsertJDGL_UndergroundPipeCompletion(JDGL_UndergroundPipeCompletion instance);
     partial void UpdateJDGL_UndergroundPipeCompletion(JDGL_UndergroundPipeCompletion instance);
     partial void DeleteJDGL_UndergroundPipeCompletion(JDGL_UndergroundPipeCompletion instance);
+    partial void InsertJDGL_WBS(JDGL_WBS instance);
+    partial void UpdateJDGL_WBS(JDGL_WBS instance);
+    partial void DeleteJDGL_WBS(JDGL_WBS instance);
+    partial void InsertJDGL_WBSDetail(JDGL_WBSDetail instance);
+    partial void UpdateJDGL_WBSDetail(JDGL_WBSDetail instance);
+    partial void DeleteJDGL_WBSDetail(JDGL_WBSDetail instance);
     partial void InsertJDGL_WeekPlan(JDGL_WeekPlan instance);
     partial void UpdateJDGL_WeekPlan(JDGL_WeekPlan instance);
     partial void DeleteJDGL_WeekPlan(JDGL_WeekPlan instance);
@@ -6412,6 +6418,22 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<JDGL_WBS> JDGL_WBS
+		{
+			get
+			{
+				return this.GetTable<JDGL_WBS>();
+			}
+		}
+		
+		public System.Data.Linq.Table<JDGL_WBSDetail> JDGL_WBSDetail
+		{
+			get
+			{
+				return this.GetTable<JDGL_WBSDetail>();
+			}
+		}
+		
 		public System.Data.Linq.Table<JDGL_WeekPlan> JDGL_WeekPlan
 		{
 			get
@@ -96809,7 +96831,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateNumber", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateNumber", DbType="NVarChar(500)")]
 		public string CertificateNumber
 		{
 			get
@@ -221886,6 +221908,683 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JDGL_WBS")]
+	public partial class JDGL_WBS : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _ProjectId;
+		
+		private string _ParentId;
+		
+		private string _ItemName;
+		
+		private string _ItemNum;
+		
+		private System.Nullable<System.DateTime> _PlanStart;
+		
+		private System.Nullable<System.DateTime> _PlanEnd;
+		
+		private System.Nullable<System.DateTime> _RealityEnd;
+		
+		private string _PathCode;
+		
+		private System.Nullable<decimal> _PlanQuantities;
+		
+		private System.Nullable<decimal> _RealityPrice;
+		
+		private System.Nullable<decimal> _Total;
+		
+		private System.Nullable<decimal> _Num;
+		
+		private string _Cycle;
+		
+		private System.Nullable<decimal> _PlanPrice;
+		
+		private System.Nullable<int> _Leave;
+		
+		private EntityRef<JDGL_WBS> _JDGL_WBS_JDGL_WBS;
+		
+		private EntityRef<JDGL_WBS> _JDGL_WBS_JDGL_WBS1;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnParentIdChanging(string value);
+    partial void OnParentIdChanged();
+    partial void OnItemNameChanging(string value);
+    partial void OnItemNameChanged();
+    partial void OnItemNumChanging(string value);
+    partial void OnItemNumChanged();
+    partial void OnPlanStartChanging(System.Nullable<System.DateTime> value);
+    partial void OnPlanStartChanged();
+    partial void OnPlanEndChanging(System.Nullable<System.DateTime> value);
+    partial void OnPlanEndChanged();
+    partial void OnRealityEndChanging(System.Nullable<System.DateTime> value);
+    partial void OnRealityEndChanged();
+    partial void OnPathCodeChanging(string value);
+    partial void OnPathCodeChanged();
+    partial void OnPlanQuantitiesChanging(System.Nullable<decimal> value);
+    partial void OnPlanQuantitiesChanged();
+    partial void OnRealityPriceChanging(System.Nullable<decimal> value);
+    partial void OnRealityPriceChanged();
+    partial void OnTotalChanging(System.Nullable<decimal> value);
+    partial void OnTotalChanged();
+    partial void OnNumChanging(System.Nullable<decimal> value);
+    partial void OnNumChanged();
+    partial void OnCycleChanging(string value);
+    partial void OnCycleChanged();
+    partial void OnPlanPriceChanging(System.Nullable<decimal> value);
+    partial void OnPlanPriceChanged();
+    partial void OnLeaveChanging(System.Nullable<int> value);
+    partial void OnLeaveChanged();
+    #endregion
+		
+		public JDGL_WBS()
+		{
+			this._JDGL_WBS_JDGL_WBS = default(EntityRef<JDGL_WBS>);
+			this._JDGL_WBS_JDGL_WBS1 = default(EntityRef<JDGL_WBS>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					if (this._JDGL_WBS_JDGL_WBS.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ParentId", DbType="NVarChar(50)")]
+		public string ParentId
+		{
+			get
+			{
+				return this._ParentId;
+			}
+			set
+			{
+				if ((this._ParentId != value))
+				{
+					this.OnParentIdChanging(value);
+					this.SendPropertyChanging();
+					this._ParentId = value;
+					this.SendPropertyChanged("ParentId");
+					this.OnParentIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemName", DbType="NVarChar(50)")]
+		public string ItemName
+		{
+			get
+			{
+				return this._ItemName;
+			}
+			set
+			{
+				if ((this._ItemName != value))
+				{
+					this.OnItemNameChanging(value);
+					this.SendPropertyChanging();
+					this._ItemName = value;
+					this.SendPropertyChanged("ItemName");
+					this.OnItemNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemNum", DbType="NVarChar(50)")]
+		public string ItemNum
+		{
+			get
+			{
+				return this._ItemNum;
+			}
+			set
+			{
+				if ((this._ItemNum != value))
+				{
+					this.OnItemNumChanging(value);
+					this.SendPropertyChanging();
+					this._ItemNum = value;
+					this.SendPropertyChanged("ItemNum");
+					this.OnItemNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanStart", DbType="DateTime")]
+		public System.Nullable<System.DateTime> PlanStart
+		{
+			get
+			{
+				return this._PlanStart;
+			}
+			set
+			{
+				if ((this._PlanStart != value))
+				{
+					this.OnPlanStartChanging(value);
+					this.SendPropertyChanging();
+					this._PlanStart = value;
+					this.SendPropertyChanged("PlanStart");
+					this.OnPlanStartChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanEnd", DbType="DateTime")]
+		public System.Nullable<System.DateTime> PlanEnd
+		{
+			get
+			{
+				return this._PlanEnd;
+			}
+			set
+			{
+				if ((this._PlanEnd != value))
+				{
+					this.OnPlanEndChanging(value);
+					this.SendPropertyChanging();
+					this._PlanEnd = value;
+					this.SendPropertyChanged("PlanEnd");
+					this.OnPlanEndChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealityEnd", DbType="DateTime")]
+		public System.Nullable<System.DateTime> RealityEnd
+		{
+			get
+			{
+				return this._RealityEnd;
+			}
+			set
+			{
+				if ((this._RealityEnd != value))
+				{
+					this.OnRealityEndChanging(value);
+					this.SendPropertyChanging();
+					this._RealityEnd = value;
+					this.SendPropertyChanged("RealityEnd");
+					this.OnRealityEndChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PathCode", DbType="NVarChar(50)")]
+		public string PathCode
+		{
+			get
+			{
+				return this._PathCode;
+			}
+			set
+			{
+				if ((this._PathCode != value))
+				{
+					this.OnPathCodeChanging(value);
+					this.SendPropertyChanging();
+					this._PathCode = value;
+					this.SendPropertyChanged("PathCode");
+					this.OnPathCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanQuantities", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> PlanQuantities
+		{
+			get
+			{
+				return this._PlanQuantities;
+			}
+			set
+			{
+				if ((this._PlanQuantities != value))
+				{
+					this.OnPlanQuantitiesChanging(value);
+					this.SendPropertyChanging();
+					this._PlanQuantities = value;
+					this.SendPropertyChanged("PlanQuantities");
+					this.OnPlanQuantitiesChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealityPrice", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> RealityPrice
+		{
+			get
+			{
+				return this._RealityPrice;
+			}
+			set
+			{
+				if ((this._RealityPrice != value))
+				{
+					this.OnRealityPriceChanging(value);
+					this.SendPropertyChanging();
+					this._RealityPrice = value;
+					this.SendPropertyChanged("RealityPrice");
+					this.OnRealityPriceChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Total", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> Total
+		{
+			get
+			{
+				return this._Total;
+			}
+			set
+			{
+				if ((this._Total != value))
+				{
+					this.OnTotalChanging(value);
+					this.SendPropertyChanging();
+					this._Total = value;
+					this.SendPropertyChanged("Total");
+					this.OnTotalChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> Num
+		{
+			get
+			{
+				return this._Num;
+			}
+			set
+			{
+				if ((this._Num != value))
+				{
+					this.OnNumChanging(value);
+					this.SendPropertyChanging();
+					this._Num = value;
+					this.SendPropertyChanged("Num");
+					this.OnNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cycle", DbType="NVarChar(50)")]
+		public string Cycle
+		{
+			get
+			{
+				return this._Cycle;
+			}
+			set
+			{
+				if ((this._Cycle != value))
+				{
+					this.OnCycleChanging(value);
+					this.SendPropertyChanging();
+					this._Cycle = value;
+					this.SendPropertyChanged("Cycle");
+					this.OnCycleChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanPrice", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> PlanPrice
+		{
+			get
+			{
+				return this._PlanPrice;
+			}
+			set
+			{
+				if ((this._PlanPrice != value))
+				{
+					this.OnPlanPriceChanging(value);
+					this.SendPropertyChanging();
+					this._PlanPrice = value;
+					this.SendPropertyChanged("PlanPrice");
+					this.OnPlanPriceChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Leave", DbType="Int")]
+		public System.Nullable<int> Leave
+		{
+			get
+			{
+				return this._Leave;
+			}
+			set
+			{
+				if ((this._Leave != value))
+				{
+					this.OnLeaveChanging(value);
+					this.SendPropertyChanging();
+					this._Leave = value;
+					this.SendPropertyChanged("Leave");
+					this.OnLeaveChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_WBS_JDGL_WBS", Storage="_JDGL_WBS_JDGL_WBS", ThisKey="Id", OtherKey="Id", IsForeignKey=true)]
+		public JDGL_WBS JDGL_WBS_JDGL_WBS
+		{
+			get
+			{
+				return this._JDGL_WBS_JDGL_WBS.Entity;
+			}
+			set
+			{
+				JDGL_WBS previousValue = this._JDGL_WBS_JDGL_WBS.Entity;
+				if (((previousValue != value) 
+							|| (this._JDGL_WBS_JDGL_WBS.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._JDGL_WBS_JDGL_WBS.Entity = null;
+						previousValue.JDGL_WBS_JDGL_WBS1 = null;
+					}
+					this._JDGL_WBS_JDGL_WBS.Entity = value;
+					if ((value != null))
+					{
+						value.JDGL_WBS_JDGL_WBS1 = this;
+						this._Id = value.Id;
+					}
+					else
+					{
+						this._Id = default(string);
+					}
+					this.SendPropertyChanged("JDGL_WBS_JDGL_WBS");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_WBS_JDGL_WBS", Storage="_JDGL_WBS_JDGL_WBS1", ThisKey="Id", OtherKey="Id", IsUnique=true, IsForeignKey=false, DeleteRule="NO ACTION")]
+		public JDGL_WBS JDGL_WBS_JDGL_WBS1
+		{
+			get
+			{
+				return this._JDGL_WBS_JDGL_WBS1.Entity;
+			}
+			set
+			{
+				JDGL_WBS previousValue = this._JDGL_WBS_JDGL_WBS1.Entity;
+				if (((previousValue != value) 
+							|| (this._JDGL_WBS_JDGL_WBS1.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._JDGL_WBS_JDGL_WBS1.Entity = null;
+						previousValue.JDGL_WBS_JDGL_WBS = null;
+					}
+					this._JDGL_WBS_JDGL_WBS1.Entity = value;
+					if ((value != null))
+					{
+						value.JDGL_WBS_JDGL_WBS = this;
+					}
+					this.SendPropertyChanged("JDGL_WBS_JDGL_WBS1");
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JDGL_WBSDetail")]
+	public partial class JDGL_WBSDetail : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _ProjectId;
+		
+		private string _WorkPackageId;
+		
+		private System.Nullable<System.DateTime> _CompletionTime;
+		
+		private string _Name;
+		
+		private System.Nullable<decimal> _RealityCompletePercent;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnWorkPackageIdChanging(string value);
+    partial void OnWorkPackageIdChanged();
+    partial void OnCompletionTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompletionTimeChanged();
+    partial void OnNameChanging(string value);
+    partial void OnNameChanged();
+    partial void OnRealityCompletePercentChanging(System.Nullable<decimal> value);
+    partial void OnRealityCompletePercentChanged();
+    #endregion
+		
+		public JDGL_WBSDetail()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(50)")]
+		public string WorkPackageId
+		{
+			get
+			{
+				return this._WorkPackageId;
+			}
+			set
+			{
+				if ((this._WorkPackageId != value))
+				{
+					this.OnWorkPackageIdChanging(value);
+					this.SendPropertyChanging();
+					this._WorkPackageId = value;
+					this.SendPropertyChanged("WorkPackageId");
+					this.OnWorkPackageIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompletionTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompletionTime
+		{
+			get
+			{
+				return this._CompletionTime;
+			}
+			set
+			{
+				if ((this._CompletionTime != value))
+				{
+					this.OnCompletionTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CompletionTime = value;
+					this.SendPropertyChanged("CompletionTime");
+					this.OnCompletionTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(100)")]
+		public string Name
+		{
+			get
+			{
+				return this._Name;
+			}
+			set
+			{
+				if ((this._Name != value))
+				{
+					this.OnNameChanging(value);
+					this.SendPropertyChanging();
+					this._Name = value;
+					this.SendPropertyChanged("Name");
+					this.OnNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealityCompletePercent", DbType="Decimal(9,2)")]
+		public System.Nullable<decimal> RealityCompletePercent
+		{
+			get
+			{
+				return this._RealityCompletePercent;
+			}
+			set
+			{
+				if ((this._RealityCompletePercent != value))
+				{
+					this.OnRealityCompletePercentChanging(value);
+					this.SendPropertyChanging();
+					this._RealityCompletePercent = value;
+					this.SendPropertyChanged("RealityCompletePercent");
+					this.OnRealityCompletePercentChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JDGL_WeekPlan")]
 	public partial class JDGL_WeekPlan : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -263092,10 +263791,10 @@ namespace Model
 		
 		private string _MeetingHostManOther;
 		
-		private string _UnitId;
-		
 		private string _ProjectId;
 		
+		private string _UnitId;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -263130,10 +263829,10 @@ namespace Model
     partial void OnAttentPersonIdsChanged();
     partial void OnMeetingHostManOtherChanging(string value);
     partial void OnMeetingHostManOtherChanged();
-    partial void OnUnitIdChanging(string value);
-    partial void OnUnitIdChanged();
     partial void OnProjectIdChanging(string value);
     partial void OnProjectIdChanged();
+    partial void OnUnitIdChanging(string value);
+    partial void OnUnitIdChanged();
     #endregion
 		
 		public Meeting_CompanySafetyMeeting()
@@ -263441,26 +264140,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
-		public string UnitId
-		{
-			get
-			{
-				return this._UnitId;
-			}
-			set
-			{
-				if ((this._UnitId != value))
-				{
-					this.OnUnitIdChanging(value);
-					this.SendPropertyChanging();
-					this._UnitId = value;
-					this.SendPropertyChanged("UnitId");
-					this.OnUnitIdChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
 		public string ProjectId
 		{
@@ -263481,6 +264160,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					this.OnUnitIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitId = value;
+					this.SendPropertyChanged("UnitId");
+					this.OnUnitIdChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -283095,7 +283794,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="VarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="VarChar(50)")]
 		public string ProjectName
 		{
 			get
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 59ad2199..d989db4f 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />