Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

DataBase/版本日志/SGGLDB_WH_2024-07-01-bwj.sql

@@ -0,0 +1,8 @@
+ALTER TABLE Comprehensive_NCRManagement ADD Supervisor nvarchar(50)
+go
+ALTER TABLE [dbo].[Comprehensive_NCRManagement]  WITH CHECK ADD  CONSTRAINT [FK_Comprehensive_NCRManagement_Sys_User] FOREIGN KEY([Supervisor])
+REFERENCES [dbo].[Sys_User] ([UserId])
+GO
+
+ALTER TABLE [dbo].[Comprehensive_NCRManagement] CHECK CONSTRAINT [FK_Comprehensive_NCRManagement_Sys_User]
+GO

SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs

@@ -119,6 +119,7 @@ namespace BLL
             newNCRManagement.Problem = nCRManagement.Problem;
             newNCRManagement.Measure = nCRManagement.Measure;
             newNCRManagement.RemarkCode = nCRManagement.RemarkCode;
+            newNCRManagement.Supervisor = nCRManagement.Supervisor;
             db.Comprehensive_NCRManagement.InsertOnSubmit(newNCRManagement);
             db.SubmitChanges();
         }
@@ -150,6 +151,7 @@ namespace BLL
                 newNCRManagement.Problem = nCRManagement.Problem;
                 newNCRManagement.Measure = nCRManagement.Measure;
                 newNCRManagement.RemarkCode = nCRManagement.RemarkCode;
+                newNCRManagement.Supervisor = nCRManagement.Supervisor;
                 db.SubmitChanges();
             }
         }

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx

@@ -53,14 +53,14 @@
                         <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
+                        <f:RenderField ColumnID="NCRCode" DataField="NCRCode" FieldType="String" HeaderText="NCR单号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="130px">
+                        </f:RenderField>
                         <f:TemplateField ColumnID="UnitWorkName" Width="260px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Left">
                             <ItemTemplate>
                                 <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="NCRCode" DataField="NCRCode" FieldType="String" HeaderText="NCR单号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="130px">
-                        </f:RenderField>
                         <f:RenderField ColumnID="Contents" DataField="Contents" FieldType="String" HeaderText="主要内容" TextAlign="Left"
                             HeaderTextAlign="Center" Width="280px">
                         </f:RenderField>
@@ -89,6 +89,9 @@
                         </f:RenderField>
                         <f:RenderField ColumnID="ResponsibleMan" DataField="ResponsibleMan" FieldType="String" HeaderText="责任人" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="SupervisorName" DataField="SupervisorName" FieldType="String" HeaderText="监督人" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
                                <%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs

@@ -29,12 +29,13 @@ namespace FineUIPro.Web.Comprehensive
         }
         public void BindGrid()
         {
-            string strSql = @"select NCRManagementId, ProjectId, SendUnit,  NCRCode, Contents,Problem,Measure,IssuedDate, ReceiveUnit,Status,
+            string strSql = @"select C.NCRManagementId, C.ProjectId, C.SendUnit,  C.NCRCode, C.Contents,C.Problem,C.Measure,C.IssuedDate, C.ReceiveUnit,C.Status,
-                              ClosedDate, CompleteDate, ResponsibleMan, AttachUrl, ImplementationFrontState, 
+                              C.ClosedDate, C.CompleteDate, C.ResponsibleMan, C.AttachUrl, C.ImplementationFrontState,C.Supervisor,
-                              CompileMan, UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName,C.RemarkCode  
+                              C.CompileMan, C.UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName,C.RemarkCode,su.UserName as SupervisorName 
                               from Comprehensive_NCRManagement C 
                               left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId 
 							  left join Base_Unit u on u.UnitId = C.SendUnit
+                              left join Sys_User su on su.UserId = C.Supervisor
                               where C.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -417,11 +418,16 @@ namespace FineUIPro.Web.Comprehensive
 
                     cell = row.CreateCell(3);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.Contents);//主要内容
+                    string unitWorkName = string.Empty;
+                    if (!string.IsNullOrEmpty(item.UnitWorkId))
+                    {
+                        unitWorkName = ConvertUnitWork(item.UnitWorkId);
+                    }
+                    cell.SetCellValue(unitWorkName);//单位工程
 
                     cell = row.CreateCell(4);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期
+                    cell.SetCellValue(item.Contents);//主要内容
 
                     cell = row.CreateCell(5);
                     cell.CellStyle = cellStyle;
@@ -433,12 +439,7 @@ namespace FineUIPro.Web.Comprehensive
 
                     cell = row.CreateCell(7);
                     cell.CellStyle = cellStyle;
-                    string unitWorkName = string.Empty;
+                    cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期
-                    if (!string.IsNullOrEmpty(item.UnitWorkId))
-                    {
-                        unitWorkName = ConvertUnitWork(item.UnitWorkId);
-                    }
-                    cell.SetCellValue(unitWorkName);//单位工程
                     
                     cell = row.CreateCell(8);
                     cell.CellStyle = cellStyle;
@@ -460,18 +461,27 @@ namespace FineUIPro.Web.Comprehensive
 
                     cell = row.CreateCell(10);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.ResponsibleMan);//责任人
+                    cell.SetCellValue(item.ClosedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ClosedDate) : "");//要求封闭日期
 
                     cell = row.CreateCell(11);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.ClosedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ClosedDate) : "");//要求封闭日期
+                    cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//完成日期
                     
                     cell = row.CreateCell(12);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//完成日期
+                    cell.SetCellValue(item.ResponsibleMan);//责任人
 
                     cell = row.CreateCell(13);
                     cell.CellStyle = cellStyle;
+                    string supervisorName = string.Empty;
+                    if (!string.IsNullOrEmpty(item.Supervisor))
+                    {
+                        supervisorName = BLL.UserService.GetUserNameByUserId(item.Supervisor);
+                    }
+                    cell.SetCellValue(supervisorName);//监督人
+
+                    cell = row.CreateCell(14);
+                    cell.CellStyle = cellStyle;
                     cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号
 
                     i++;

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs

@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 14);
+                AddDatasetToSQL(ds.Tables[0], 15);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -178,6 +178,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                                 && x.SuperUnitWork == null
                                 select x;
 
+                var users = from x in Funs.DB.Project_ProjectUser
+                            join y in Funs.DB.Sys_User on x.UserId equals y.UserId
+                            where x.ProjectId == this.CurrUser.LoginProjectId
+                            && x.UnitId == BLL.Const.UnitId_CWCEC
+                            select y;
+
                 for (int i = 1; i < ir; i++)
                 {
                     string row0 = pds.Rows[i][0].ToString();
@@ -214,16 +220,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         result += (i + 2).ToString() + "," + "NCR单号" + "," + "此项为必填项！" + "|";
                     }
 
-                    string row4 = pds.Rows[i][4].ToString();
+                    string row3 = pds.Rows[i][3].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    if (!string.IsNullOrEmpty(row3))
                     {
-                        try
+                        string[] reunit = row3.Split(',');
+                        foreach (string unitWork in reunit)
                         {
-                            DateTime date = Convert.ToDateTime(row4.Trim());
+                            var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
+                            if (u == null)
+                            {
+                                result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|";
                             }
-                        catch (Exception)
-                        {
-                            result += (i + 2).ToString() + "," + "下发日期" + "," + "[" + row4 + "]错误！" + "|";
                         }
                     }
 
@@ -239,17 +246,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     string row7 = pds.Rows[i][7].ToString();
                     if (!string.IsNullOrEmpty(row7))
                     {
-                        string[] reunit = row7.Split(',');
+                        try
-                        foreach (string unitWork in reunit)
                         {
-                            var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
+                            DateTime date = Convert.ToDateTime(row7.Trim());
-                            if (u == null)
+                        }
+                        catch (Exception)
                         {
-                                result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|";
+                            result += (i + 2).ToString() + "," + "下发日期" + "," + "[" + row7 + "]错误！" + "|";
-                            }
                         }
                     }
 
+
                     string row8 = pds.Rows[i][8].ToString();
                     if (!string.IsNullOrEmpty(row8))
                     {
@@ -273,6 +280,19 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         }
                     }
 
+                    string row10 = pds.Rows[i][10].ToString();
+                    if (!string.IsNullOrEmpty(row10))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row10.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row10 + "]错误！" + "|";
+                        }
+                    }
+
                     string row11 = pds.Rows[i][11].ToString();
                     if (!string.IsNullOrEmpty(row11))
                     {
@@ -282,25 +302,22 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         }
                         catch (Exception)
                         {
-                            result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row11 + "]错误！" + "|";
+                            result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row11 + "]错误！" + "|";
-                        }
-                    }
-
-                    string row12 = pds.Rows[i][12].ToString();
-                    if (!string.IsNullOrEmpty(row12))
-                    {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row12.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row12 + "]错误！" + "|";
                         }
                     }
 
                     string row13 = pds.Rows[i][13].ToString();
-                    if (string.IsNullOrEmpty(row13))
+                    if (!string.IsNullOrEmpty(row13))
+                    {
+                        var u = users.Where(x => x.UserName == row13).FirstOrDefault();
+                        if (u == null)
+                        {
+                            result += (i + 2).ToString() + "," + "监督人" + "," + "[" + row13 + "]不存在！" + "|";
+                        }
+                    }
+
+                    string row14 = pds.Rows[i][14].ToString();
+                    if (string.IsNullOrEmpty(row14))
                     {
                         result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|";
                     }
@@ -308,11 +325,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         try
                         {
-                            int t = Convert.ToInt32(row13);
+                            int t = Convert.ToInt32(row14);
                         }
                         catch (Exception)
                         {
-                            result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row13 + "]错误！" + "|";
+                            result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row14 + "]错误！" + "|";
                         }
                     }
                 }
@@ -420,7 +437,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 14);
+                AddDatasetToSQL2(ds.Tables[0], 15);
             }
             catch (Exception ex)
             {
@@ -464,13 +481,19 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                                 && x.SuperUnitWork == null
                                 select x;
 
+                var users = from x in Funs.DB.Project_ProjectUser
+                            join y in Funs.DB.Sys_User on x.UserId equals y.UserId
+                            where x.ProjectId == this.CurrUser.LoginProjectId
+                            && x.UnitId == BLL.Const.UnitId_CWCEC
+                            select y;
+
                 for (int i = 1; i < ir; i++)
                 {
                     Model.Comprehensive_NCRManagement oldViewInfo = new Model.Comprehensive_NCRManagement();
                     string row0 = pds.Rows[i][0].ToString().Trim();
                     string row1 = pds.Rows[i][1].ToString().Trim();
                     var cn = cns.Where(y => y.ProfessionalName == row1).FirstOrDefault();
-                    oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt( pds.Rows[i][13].ToString().Trim())
+                    oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt( pds.Rows[i][14].ToString().Trim())
                                                          ).FirstOrDefault();
                     if (oldViewInfo == null)
                     {
@@ -480,33 +503,36 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         des.SendUnit = units.Where(x => x.UnitName == row0.Trim()).FirstOrDefault().UnitId;
                         des.CNProfessionalId = cn.CNProfessionalId;
                         des.NCRCode = pds.Rows[i][2].ToString().Trim();
-                        des.Contents = pds.Rows[i][3].ToString().Trim();
+                        if (!string.IsNullOrEmpty(pds.Rows[i][3].ToString().Trim()))
-                        if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim()))
                         {
-                            des.IssuedDate = Convert.ToDateTime(pds.Rows[i][4].ToString().Trim());
+                            des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][3].ToString().Trim());
                         }
+                        des.Contents = pds.Rows[i][4].ToString().Trim();
                         des.Problem = pds.Rows[i][5].ToString().Trim();
                         des.Measure = pds.Rows[i][6].ToString().Trim();
                         if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim()))
                         {
-                            des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][7].ToString().Trim());
+                            des.IssuedDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());
                         }                        
                         if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim()))
                         {
                             des.ReceiveUnit = BLL.UnitService.GetUnitIds(pds.Rows[i][8].ToString().Trim());
                         }
-
                         des.ImplementationFrontState = pds.Rows[i][9].ToString().Trim();
-                        des.ResponsibleMan = pds.Rows[i][10].ToString().Trim();
+                        if (!string.IsNullOrEmpty(pds.Rows[i][10].ToString().Trim()))
+                        {
+                            des.ClosedDate = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim());
+                        }
                         if (!string.IsNullOrEmpty(pds.Rows[i][11].ToString().Trim()))
                         {
-                            des.ClosedDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim());
+                            des.CompleteDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim());
                         }
-                        if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim()))
+                        des.ResponsibleMan = pds.Rows[i][12].ToString().Trim();
+                        if (!string.IsNullOrEmpty(pds.Rows[i][13].ToString().Trim()))
                         {
-                            des.CompleteDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim());
+                            des.Supervisor = users.FirstOrDefault(x => x.UserName == pds.Rows[i][13].ToString().Trim()).UserId;
                         }
-                        des.RemarkCode = Funs.GetNewInt(pds.Rows[i][13].ToString().Trim());
+                        des.RemarkCode = Funs.GetNewInt(pds.Rows[i][14].ToString().Trim());
                         des.Status = BLL.Const.Comprehensive_Compile;
                         des.CompileMan = this.CurrUser.UserId;
                         BLL.NCRManagementService.AddNCRManagement(des);

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx

@@ -59,6 +59,7 @@
                 <f:FormRow>
                     <Items>
                         <f:DropDownList ID="drpUnitIds" runat="server" Label="接收单位" EnableCheckBoxSelect="true" EnableMultiSelect="true" LabelWidth="130px" AutoSelectFirstItem="false" LabelAlign="Right"></f:DropDownList>
+                        <f:DropDownList ID="drpSupervisor" runat="server" Label="监督人" LabelAlign="Right" LabelWidth="130px"></f:DropDownList>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs

@@ -39,6 +39,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
                 BLL.UnitService.InitAllUnitDownList(this.drpSendUnit, this.CurrUser.LoginProjectId, true);
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
+                BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpSupervisor, this.CurrUser.LoginProjectId, BLL.Const.UnitId_CWCEC, true);//监督人
                 //LoadAuditSelect();
                 //this.agree.Hidden = true;
                 //this.options.Hidden = true;
@@ -90,6 +91,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     //this.txtImplementationFrontState.Text = nCRManagement.ImplementationFrontState;                  
                     this.ddlImplementationFrontState.SelectedValue = nCRManagement.ImplementationFrontState;
 
+                    if (!string.IsNullOrEmpty(nCRManagement.Supervisor))
+                    {
+                        this.drpSupervisor.SelectedValue = nCRManagement.Supervisor;
+                    }
+                  
                     //var currApprove = NCRManagementApproveService.GetCurrentApprove(nCRManagement.NCRManagementId);
                     //if (currApprove != null)
                     //{
@@ -154,8 +160,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             this.ddlProblem.Readonly = true;
             //this.btnAttach.Enabled = false; 
             this.txtRemarkCode.Readonly = true;
-           
+            this.drpSupervisor.Readonly = true;
-
         }
 
         ///// <summary>
@@ -273,6 +278,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             }
             nCRManagement.ReceiveUnit = unitIds;
             nCRManagement.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
+            if (this.drpSupervisor.SelectedValue!=BLL.Const._Null)
+            {
+                nCRManagement.Supervisor = this.drpSupervisor.SelectedValue;
+            }
             if (string.IsNullOrEmpty(this.NCRManagementId))
             {
                 if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs

@@ -129,6 +129,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitIds;
         
+        /// <summary>
+        /// drpSupervisor 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpSupervisor;
+        
         /// <summary>
         /// ddlImplementationFrontState 控件。
         /// </summary>

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -18974,7 +18974,7 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

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/;"/>

SGGL/Model/Model.cs

@@ -98563,6 +98563,8 @@ namespace Model
 		
 		private System.Nullable<int> _RemarkCode;
 		
+		private string _Supervisor;
+		
 		private EntityRef<Sys_User> _Sys_User;
 		
 		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
@@ -98571,6 +98573,8 @@ namespace Model
 		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
+		private EntityRef<Sys_User> _SupervisorSys_User;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -98615,6 +98619,8 @@ namespace Model
     partial void OnMeasureChanged();
     partial void OnRemarkCodeChanging(System.Nullable<int> value);
     partial void OnRemarkCodeChanged();
+    partial void OnSupervisorChanging(string value);
+    partial void OnSupervisorChanged();
     #endregion
 		
 		public Comprehensive_NCRManagement()
@@ -98623,6 +98629,7 @@ namespace Model
 			this._Base_CNProfessional = default(EntityRef<Base_CNProfessional>);
 			this._Base_Project = default(EntityRef<Base_Project>);
 			this._Base_Unit = default(EntityRef<Base_Unit>);
+			this._SupervisorSys_User = default(EntityRef<Sys_User>);
 			OnCreated();
 		}
 		
@@ -99042,6 +99049,30 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Supervisor", DbType="NVarChar(50)")]
+		public string Supervisor
+		{
+			get
+			{
+				return this._Supervisor;
+			}
+			set
+			{
+				if ((this._Supervisor != value))
+				{
+					if (this._SupervisorSys_User.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnSupervisorChanging(value);
+					this.SendPropertyChanging();
+					this._Supervisor = value;
+					this.SendPropertyChanged("Supervisor");
+					this.OnSupervisorChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)]
 		public Sys_User Sys_User
 		{
@@ -99178,6 +99209,40 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_NCRManagement_Sys_User", Storage="_SupervisorSys_User", ThisKey="Supervisor", OtherKey="UserId", IsForeignKey=true)]
+		public Sys_User SupervisorSys_User
+		{
+			get
+			{
+				return this._SupervisorSys_User.Entity;
+			}
+			set
+			{
+				Sys_User previousValue = this._SupervisorSys_User.Entity;
+				if (((previousValue != value) 
+							|| (this._SupervisorSys_User.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._SupervisorSys_User.Entity = null;
+						previousValue.Comprehensive_NCRManagement_Sys_User.Remove(this);
+					}
+					this._SupervisorSys_User.Entity = value;
+					if ((value != null))
+					{
+						value.Comprehensive_NCRManagement_Sys_User.Add(this);
+						this._Supervisor = value.UserId;
+					}
+					else
+					{
+						this._Supervisor = default(string);
+					}
+					this.SendPropertyChanged("SupervisorSys_User");
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -354499,6 +354564,8 @@ namespace Model
 		
 		private EntitySet<Comprehensive_InspectionPerson> _Comprehensive_InspectionPerson;
 		
+		private EntitySet<Comprehensive_NCRManagement> _Comprehensive_NCRManagement_Sys_User;
+		
 		private EntitySet<Comprehensive_QualityAccident> _Comprehensive_QualityAccident;
 		
 		private EntitySet<CostGoods_CostManage> _CostGoods_CostManage;
@@ -355240,6 +355307,7 @@ namespace Model
 			this._Comprehensive_DesignChangeOrder = new EntitySet<Comprehensive_DesignChangeOrder>(new Action<Comprehensive_DesignChangeOrder>(this.attach_Comprehensive_DesignChangeOrder), new Action<Comprehensive_DesignChangeOrder>(this.detach_Comprehensive_DesignChangeOrder));
 			this._Comprehensive_DesignDetails = new EntitySet<Comprehensive_DesignDetails>(new Action<Comprehensive_DesignDetails>(this.attach_Comprehensive_DesignDetails), new Action<Comprehensive_DesignDetails>(this.detach_Comprehensive_DesignDetails));
 			this._Comprehensive_InspectionPerson = new EntitySet<Comprehensive_InspectionPerson>(new Action<Comprehensive_InspectionPerson>(this.attach_Comprehensive_InspectionPerson), new Action<Comprehensive_InspectionPerson>(this.detach_Comprehensive_InspectionPerson));
+			this._Comprehensive_NCRManagement_Sys_User = new EntitySet<Comprehensive_NCRManagement>(new Action<Comprehensive_NCRManagement>(this.attach_Comprehensive_NCRManagement_Sys_User), new Action<Comprehensive_NCRManagement>(this.detach_Comprehensive_NCRManagement_Sys_User));
 			this._Comprehensive_QualityAccident = new EntitySet<Comprehensive_QualityAccident>(new Action<Comprehensive_QualityAccident>(this.attach_Comprehensive_QualityAccident), new Action<Comprehensive_QualityAccident>(this.detach_Comprehensive_QualityAccident));
 			this._CostGoods_CostManage = new EntitySet<CostGoods_CostManage>(new Action<CostGoods_CostManage>(this.attach_CostGoods_CostManage), new Action<CostGoods_CostManage>(this.detach_CostGoods_CostManage));
 			this._CostGoods_GoodsManage = new EntitySet<CostGoods_GoodsManage>(new Action<CostGoods_GoodsManage>(this.attach_CostGoods_GoodsManage), new Action<CostGoods_GoodsManage>(this.detach_CostGoods_GoodsManage));
@@ -357507,6 +357575,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_NCRManagement_Sys_User", Storage="_Comprehensive_NCRManagement_Sys_User", ThisKey="UserId", OtherKey="Supervisor", DeleteRule="NO ACTION")]
+		public EntitySet<Comprehensive_NCRManagement> Comprehensive_NCRManagement_Sys_User
+		{
+			get
+			{
+				return this._Comprehensive_NCRManagement_Sys_User;
+			}
+			set
+			{
+				this._Comprehensive_NCRManagement_Sys_User.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_QualityAccident_Sys_User", Storage="_Comprehensive_QualityAccident", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
 		public EntitySet<Comprehensive_QualityAccident> Comprehensive_QualityAccident
 		{
@@ -362114,6 +362195,18 @@ namespace Model
 			entity.Sys_User = null;
 		}
 		
+		private void attach_Comprehensive_NCRManagement_Sys_User(Comprehensive_NCRManagement entity)
+		{
+			this.SendPropertyChanging();
+			entity.SupervisorSys_User = this;
+		}
+		
+		private void detach_Comprehensive_NCRManagement_Sys_User(Comprehensive_NCRManagement entity)
+		{
+			this.SendPropertyChanging();
+			entity.SupervisorSys_User = null;
+		}
+		
 		private void attach_Comprehensive_QualityAccident(Comprehensive_QualityAccident entity)
 		{
 			this.SendPropertyChanging();