From d12743d37985c6d1b2afd7f92e3ce12b1eb9ec26 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Thu, 22 Aug 2024 16:03:24 +0800
Subject: [PATCH] =?UTF-8?q?20240822=20=E8=B4=A8=E9=87=8F=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=85=B1=E6=A3=80=E5=90=88=E6=A0=BC=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CQMS/WBS/EditBreakdownProject.aspx.cs     | 14 +++++++++++++
 SGGL/FineUIPro.Web/ErrLog.txt                 | 20 -------------------
 SGGL/FineUIPro.Web/Web.config                 |  2 +-
 .../common/mainMenu_CQMS.aspx.cs              |  4 ++--
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs
index bb089b55..17dcd7eb 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs
@@ -25,6 +25,18 @@ namespace FineUIPro.Web.CQMS.WBS
                 ViewState["BreakdownProjectId"] = value;
             }
         }
+
+        public string UnitWorkId
+        {
+            get
+            {
+                return (string)ViewState["UnitWorkId"];
+            }
+            set
+            {
+                ViewState["UnitWorkId"] = value;
+            }
+        }
         #endregion
 
         protected void Page_Load(object sender, EventArgs e)
@@ -38,6 +50,7 @@ namespace FineUIPro.Web.CQMS.WBS
                 var division = BLL.DivisionProjectService.GetDivisionProjectById(divisionProjectId);
                 if (division != null)
                 {
+                    this.UnitWorkId = division.UnitWorkId;
                     if (division.CNProfessionalId != null && Const.CNProfessionalConstructId == division.CNProfessionalId)
                     {
                         this.tr1.Hidden = false;
@@ -125,6 +138,7 @@ namespace FineUIPro.Web.CQMS.WBS
                 }
             }
             newBreakdown.Remark = this.txtRemark.Text.Trim();
+            newBreakdown.UnitWorkId = this.UnitWorkId;
             if (Request.Params["type"] == "add")
             {
                 if (this.rblIsAcceptance.SelectedValue == "True")
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index ccadda90..e69de29b 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -1,20 +0,0 @@
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 BLL.APIGetHttpService.ControlHttp(String url, String method, String contenttype, Hashtable header, String data) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\API\APIGetHttpService.cs:行号 202
-   在 FineUIPro.Web.ProjectData.Installation.btnMenuDown_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\ProjectData\Installation.aspx.cs:行号 252
-   在 FineUIPro.MenuButton.OnClick(EventArgs e)
-   在 (MenuButton , EventArgs )
-   在 FineUIPro.MenuButton.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:08/22/2024 10:39:28
-出错文件:http://localhost:8579/ProjectData/Installation.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:08/22/2024 10:39:28
-
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index f50b26d3..9fc55c34 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -12,7 +12,7 @@
   <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=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
index abcc9980..b51ff853 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
@@ -392,9 +392,9 @@ namespace FineUIPro.Web
                 var unitWorks = BLL.UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
                 var TotalCheckDetailOKLists = from x in db.ProcessControl_InspectionManagementDetail
                                               join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
-                                              join z in db.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
+                                              //join z in db.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
                                               where y.ProjectId == this.CurrUser.LoginProjectId
-                                              select new { z.UnitWorkId, y.IsOnceQualified };
+                                              select new { x.UnitWorkId, y.IsOnceQualified };
                 Model.SingleSerie s = new Model.SingleSerie();
                 Model.SingleSerie s2 = new Model.SingleSerie();
                 List<double> listdata = new List<double>();