From 5e30bb0f560ee9d358a3ab157b688a1f3453b136 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Mon, 30 Oct 2023 11:13:57 +0800 Subject: [PATCH] =?UTF-8?q?20231030=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-10-30.sql | 45 ++++++ SGGL/BLL/ProjectData/ProjectService.cs | 26 +++- SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs | 6 +- SGGL/FineUIPro.Web/DataShow/Check.aspx.cs | 10 +- .../DataShow/ConstructionEquipment.aspx.cs | 8 +- SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs | 4 +- SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs | 6 +- .../FineUIPro.Web/DataShow/HJGLDefect.aspx.cs | 4 +- .../FineUIPro.Web/DataShow/HJGLWelder.aspx.cs | 4 +- .../DataShow/HJGLWelding.aspx.cs | 4 +- .../DataShow/HiddenRectification.aspx.cs | 4 +- .../DataShow/LargeEngineering.aspx.cs | 4 +- SGGL/FineUIPro.Web/DataShow/License.aspx.cs | 6 +- SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs | 10 +- SGGL/FineUIPro.Web/DataShow/Project.aspx.cs | 2 +- .../DataShow/ProjectDivision.aspx.cs | 4 +- .../DataShow/ProjectPerson.aspx.cs | 4 +- .../DataShow/QualityAcceptance.aspx.cs | 4 +- .../DataShow/QualityControlPoint.aspx.cs | 4 +- .../DataShow/QualityInstruments.aspx.cs | 4 +- .../DataShow/QualityPerson.aspx.cs | 4 +- .../DataShow/QualityProblem.aspx.cs | 4 +- .../DataShow/QualityTraining.aspx.cs | 4 +- .../DataShow/SecurityCost.aspx.cs | 4 +- .../DataShow/SecurityRisk.aspx.cs | 4 +- .../DataShow/WorkingHours.aspx.cs | 4 +- .../FineUIPro.Web/ProjectData/ProjectSet.aspx | 19 ++- .../ProjectData/ProjectSet.aspx.cs | 13 +- .../ProjectData/ProjectSet.aspx.designer.cs | 55 ++++--- .../ProjectData/ProjectSetSave.aspx | 20 +-- .../ProjectData/ProjectSetSave.aspx.cs | 9 ++ .../ProjectSetSave.aspx.designer.cs | 86 +++++------ .../ProjectData/ProjectSetView.aspx | 8 +- .../ProjectData/ProjectSetView.aspx.cs | 8 + .../ProjectSetView.aspx.designer.cs | 82 ++++++----- SGGL/Model/Model.cs | 138 ++++++++++++------ 36 files changed, 392 insertions(+), 233 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-10-30.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-10-30.sql b/DataBase/版本日志/SGGLDB_V2023-10-30.sql new file mode 100644 index 00000000..3bd6ab95 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-10-30.sql @@ -0,0 +1,45 @@ +ALTER TABLE [dbo].[Base_Project] ADD IsCNCECShow BIT NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿչʾ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'IsCNCECShow' +GO +UPDATE Base_Project SET IsCNCECShow= 1 WHERE ProjectState=1 +GO +UPDATE Base_Project SET IsCNCECShow= 0 WHERE IsCNCECShow IS NULL +GO + +ALTER VIEW [dbo].[View_License_LicenseManager] +AS +/*ֳȫ֤*/ +SELECT LicenseManager.LicenseManagerId, + LicenseManager.ProjectId, + LicenseManager.LicenseTypeId, + LicenseManager.LicenseManagerCode, + LicenseManager.LicenseManageName, + LicenseManager.UnitId, + LicenseManager.LicenseManageContents, + LicenseManager.CompileMan, + LicenseManager.CompileDate, + LicenseManager.States, + Project.ProjectCode, + Project.ProjectName, + Project.IsCNCECShow, + LicenseType.LicenseTypeName, + Unit.UnitName, + Users.PersonName, + LicenseManager.WorkAreaId, + --WorkArea.WorkAreaName, + LicenseManager.StartDate, + LicenseManager.EndDate, + LicenseManager.ApplicantMan, + WorkAreaName = STUFF(( SELECT ',' + UnitWorkName FROM WBS_UnitWork + where PATINDEX('%,' + RTRIM(WBS_UnitWork.UnitWorkId) + ',%',',' + LicenseManager.WorkAreaId + ',')>0 + ORDER BY PATINDEX('%,' + RTRIM(LicenseManager.WorkAreaId) + ',%',',' + LicenseManager.WorkAreaId + ',') + FOR XML PATH('')), 1, 1,'') +FROM dbo.License_LicenseManager AS LicenseManager +LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = LicenseManager.ProjectId +LEFT JOIN dbo.Base_LicenseType AS LicenseType ON LicenseType.LicenseTypeId = LicenseManager.LicenseTypeId +LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = LicenseManager.UnitId +LEFT JOIN dbo.Person_Persons AS Users ON Users.PersonId = LicenseManager.CompileMan +LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = LicenseManager.WorkAreaId + +GO \ No newline at end of file diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index 4e45f8e3..160519a8 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -125,7 +125,7 @@ City = project.City, EnglishRemark = project.EnglishRemark, ProjectRealCode=project.ProjectRealCode, - + IsCNCECShow=project.IsCNCECShow, }; db.Base_Project.InsertOnSubmit(newProject); db.SubmitChanges(); @@ -171,6 +171,7 @@ newProject.City = project.City; newProject.EnglishRemark = project.EnglishRemark; newProject.ProjectRealCode = project.ProjectRealCode; + newProject.IsCNCECShow = project.IsCNCECShow; db.SubmitChanges(); HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject); CQMSDataCollectService.ProjectCQMSDataCollectSubmission(newProject); @@ -374,6 +375,29 @@ } } + #region + /// + /// 项目表下拉框 + /// + /// 下拉框名字 + /// 是否显示请选择 + public static void InitCNCECShowProjectDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease) + { + dropName.Items.Clear(); + dropName.DataValueField = "ProjectId"; + dropName.DataTextField = "ProjectName"; + dropName.DataSource = (from x in Funs.DB.Base_Project + where x.IsCNCECShow == true + orderby x.ProjectCode descending + select x).ToList(); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + #endregion + #region 项目表下拉框 --施工项目 /// /// 项目表下拉框 diff --git a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs index d7867994..70c89147 100644 --- a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs @@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -45,7 +45,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId LEFT JOIN SitePerson_Person AS Person ON Person.PersonId = Record.PersonId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId - WHERE 1=1 "; + WHERE IsCNCECShow=1 "; if (rbType.SelectedValue == "0") { @@ -67,7 +67,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Sys_Const AS AccidentType ON AccidentType.ConstValue = Record.AccidentTypeId AND GroupId='AccidentReportRegistration' LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Record.UnitId - WHERE 1 = 1 "; + WHERE IsCNCECShow=1 "; if (rbType.SelectedValue == "2") { strSql += " AND Record.AccidentDegree ='1'"; diff --git a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs index cc2edb01..5ceea304 100644 --- a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow + @" FROM dbo.Supervise_SuperviseCheckReport AS S" + @" LEFT JOIN dbo.Base_Project AS P ON P.ProjectId=S.ProjectId" + @" LEFT JOIN dbo.Base_Unit AS U ON U.UnitId=S.UnitId" - + @" WHERE 1=1 "; + + @" WHERE IsCNCECShow=1 "; List listStr = new List(); strSql += " AND S.CheckType= @CheckType"; listStr.Add(new SqlParameter("@CheckType", this.rbCom.SelectedValue)); @@ -74,7 +74,7 @@ namespace FineUIPro.Web.DataShow ,CheckTeam= STUFF((SELECT ',' + PersonName FROM dbo.Person_Persons where PATINDEX('%,' + RTRIM(PersonId) + ',%',',' +C.LeaderIds + ',')>0 FOR XML PATH('')), 1, 1,'') from Check_ProjectLeaderCheck AS C LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId - where 1=1 "; + where IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { @@ -108,7 +108,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId LEFT JOIN Person_Persons AS U ON C.CheckManId=U.PersonId LEFT JOIN Base_Unit AS Ut ON C.ResponsibleUnit=Ut.UnitId - where 1=1 "; + where IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { @@ -141,7 +141,7 @@ namespace FineUIPro.Web.DataShow ,UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +(C.PartInUnits) + ',')>0 FOR XML PATH('')), 1, 1,'') from Check_CheckSpecial AS C LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId - where 1=1 "; + where IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs index 875af09f..ed91421c 100644 --- a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -38,20 +38,20 @@ namespace FineUIPro.Web.DataShow strSql = @"SELECT ID,ProjectId,ProjectCode,ProjectName,UnitId,UnitName,SpecialEquipmentId,SpecialEquipmentName,SizeModel,OwnerCheck,CertificateNum,CompileDate,EQType FROM (SELECT Item.EquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId - ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'特种设备' AS EQType + ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'特种设备' AS EQType,IsCNCECShow FROM InApproveManager_EquipmentInItem AS Item LEFT JOIN InApproveManager_EquipmentIn AS EQ ON EQ.EquipmentInId = Item.EquipmentInId LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId UNION ALL SELECT Item.GeneralEquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId - ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'一般设备' AS EQType + ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'一般设备' AS EQType,IsCNCECShow FROM InApproveManager_GeneralEquipmentInItem AS Item LEFT JOIN InApproveManager_GeneralEquipmentIn AS EQ ON EQ.GeneralEquipmentInId = Item.GeneralEquipmentInId LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId ) V - WHERE 1=1 "; + WHERE IsCNCECShow=1 "; //strSql += " AND V.IsUsed = @IsUsed"; //listStr.Add(new SqlParameter("@IsUsed", "1")); diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs index 065d83b0..372634cb 100644 --- a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs @@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow from EduTrain_TrainRecord AS TrainRecord LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId - WHERE 1=1 "; + WHERE IsCNCECShow=1 "; strSql += " AND TrainType.TrainType =@TrainType"; listStr.Add(new SqlParameter("@TrainType", this.rbType.SelectedValue)); diff --git a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs index 11879047..810102d3 100644 --- a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs @@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow if (!IsPostBack) { Funs.DropDownPageSize(this.ddlPageSize); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); ddlPageSize2.SelectedValue = Grid2.PageSize.ToString(); @@ -97,7 +97,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Unit AS Unit ON Em.UnitId=Unit.UnitId LEFT JOIN Base_Project AS Project ON Em.ProjectId=Project.ProjectId LEFT JOIN Base_EmergencyType AS EmergencyType ON Em.EmergencyTypeId=EmergencyType.EmergencyTypeId - WHERE 1=1 "; + WHERE IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { @@ -257,7 +257,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Project AS Project ON List.Projectid = Project.ProjectId LEFT JOIN Sys_Const AS DrillRecordType ON DrillRecordType.ConstValue = List.DrillRecordType and DrillRecordType.GroupId='DrillRecordType' - WHERE 1=1 "; + WHERE IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs index dd1976be..aa77eadd 100644 --- a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs @@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow FROM HJGL_Batch_NDEItem AS Item LEFT JOIN HJGL_Batch_NDE AS Checks ON Item.NDEID =Checks.NDEID LEFT JOIN Base_Project AS Project ON Checks.ProjectId =Project.ProjectId - WHERE 1=1 "; + WHERE IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs index fd1614c7..1c4cae2c 100644 --- a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs @@ -21,7 +21,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -38,7 +38,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Project AS Project ON Welder.ProjectId = Project.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Welder.UnitId LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId = Welder.TeamGroupId - WHERE Welder.WorkPostId=@WorkPostId AND Welder.ProjectId IS NOT NULL"; + WHERE IsCNCECShow=1 AND Welder.WorkPostId=@WorkPostId AND Welder.ProjectId IS NOT NULL"; List listStr = new List(); listStr.Add(new SqlParameter("@WorkPostId", Const.WorkPost_Welder)); if (this.drpProject.SelectedValue !=Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs index 713f4bb5..746beaff 100644 --- a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1"; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs index 0f73c8f6..a40f7d68 100644 --- a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs @@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1"; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs index 843e85e5..f4c7ad48 100644 --- a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs @@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); LargerHazard = (from x in Funs.DB.Solution_LargerHazard join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId where y.ProjectState == Const.ProjectState_1 @@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1"; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs index e900fb16..8cdf0197 100644 --- a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs @@ -22,8 +22,8 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); - // 绑定表格t + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); + // 绑定表格 BindGrid(); } } @@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow ,V.WorkAreaName,V.CompileDate,V.StartDate,V.EndDate,V.LicenseTypeId,V.UnitId,V.LicenseManageContents ,V.CompileMan,V.CompileDate,V.States FROM View_License_LicenseManager AS V - WHERE 1=1"; + WHERE IsCNCECShow=1 "; if (this.rbType.SelectedValue=="2") { strSql += " AND V.States = @WorkStates"; diff --git a/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs index 04c1f52b..2e31f26c 100644 --- a/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -96,7 +96,7 @@ namespace FineUIPro.Web.DataShow ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson FROM Meeting_SafetyLeaderGroupMeeting AS Meeting LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId - where 1=1 "; + where IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { @@ -127,15 +127,15 @@ namespace FineUIPro.Web.DataShow { string strSql = @"SELECT ProjectId,ProjectName, ID, MeetingName, MeetingDate,MeetingHours,HostMan,AttentPersonNum,AttentPerson FROM (SELECT Project.ProjectId,Project.ProjectName,Meeting.MonthMeetingId AS ID,Meeting.MonthMeetingName AS MeetingName,Meeting.MonthMeetingDate AS MeetingDate,Meeting.MeetingHours - ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson + ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson,IsCNCECShow FROM Meeting_MonthMeeting AS Meeting LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId union all SELECT Project.ProjectId,Project.ProjectName,Meeting.WeekMeetingId AS ID,Meeting.WeekMeetingName AS MeetingName,Meeting.WeekMeetingDate AS MeetingDate,Meeting.MeetingHours - ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson + ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson,IsCNCECShow FROM Meeting_WeekMeeting AS Meeting LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId ) V - where 1=1 "; + where IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs index 649fbb5d..ffbd7402 100644 --- a/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs @@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow , ProjectMoney, DATEDIFF(DAY, Project.StartDate, GETDATE()) AS DayCount, ProjectType.ProjectTypeName AS ProjectTypeName FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId = Project.UnitId LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType = ProjectType.ProjectTypeId - WHERE 1 = 1"; + WHERE IsCNCECShow=1 "; List listStr = new List(); if (this.ckState.SelectedValue != "0") diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs index f8c2335c..a4ec9eba 100644 --- a/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow ,(SELECT COUNT(*) FROM WBS_ControlItemProject AS D WHERE D.ProjectId =P.ProjectId ) AS count4 ,(SELECT COUNT(*) FROM WBS_ControlItemAndCycle AS E WHERE E.ProjectId =P.ProjectId ) AS count5 FROM Base_Project AS P - WHERE P.ProjectState = 1 "; + WHERE P.IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs index 7761e5d6..1c455e85 100644 --- a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs @@ -21,7 +21,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Project AS Project ON Person.ProjectId =Project.ProjectId LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId - WHERE States=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) "; + WHERE IsCNCECShow=1 AND States=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) "; List listStr = new List(); if (this.drpProject.SelectedValue !=Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs index a4c47383..d8252e85 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs @@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); @@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 "; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 "; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs index 20f51822..394449af 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 "; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs index 1c7be0de..346f7fb5 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 "; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs index d1f3e2a8..43b4d6e2 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -61,7 +61,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Person_Persons AS Persons ON Persons.PersonId=Person.PersonId LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId - LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 "; + LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 AND IsCNCECShow=1 "; if (this.drpProject.SelectedValue != Const._Null) { strSql += " AND Person.ProjectId = @ProjectId"; diff --git a/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs index 57565355..0e896ab0 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs @@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 "; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs index c5fc76c8..f824ce96 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 "; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs index bff485ac..a9e9ff8c 100644 --- a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs @@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow FROM CostGoods_CostSmallDetail as cost left join Base_Project as p on cost.ProjectId =p.ProjectId left join Base_Unit as Unit on cost.UnitId =Unit.UnitId - WHERE 1=1"; + WHERE IsCNCECShow=1 "; if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs index 0ceb7d2c..0e5593b3 100644 --- a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1"; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs index edebf72f..aff7b6da 100644 --- a/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 "; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx index f49960ce..652ec252 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx @@ -20,7 +20,7 @@ ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch" > - + + AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="50px"> + @@ -54,14 +56,14 @@ - - + FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"> <%-- @@ -100,7 +102,10 @@ --%> - + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs index 884c81b8..80eb2975 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs @@ -36,7 +36,7 @@ namespace FineUIPro.Web.ProjectData private void BindGrid() { string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,Project.ProjectRealCode,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ProjectType.ProjectTypeName AS ProjectTypeName,ShortName, " - + @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState" + + @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState,IsCNCECShow" + @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId" + @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId" + @" WHERE 1=1 "; @@ -51,6 +51,10 @@ namespace FineUIPro.Web.ProjectData // strSql += " AND ProjectId = @ProjectId"; // listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); //} + if (this.rbIsCNCECShow.Checked) + { + strSql += " AND IsCNCECShow=1 "; + } if (!string.IsNullOrEmpty(this.txtProjectName.Text.Trim())) { @@ -344,6 +348,11 @@ namespace FineUIPro.Web.ProjectData { this.BindGrid(); } + + protected void rbIsCNCECShow_CheckedChanged(object sender, CheckedEventArgs e) + { + this.BindGrid(); + } #endregion #region 项目管理人员 @@ -415,6 +424,6 @@ namespace FineUIPro.Web.ProjectData ShowNotify("请选择项目进入！", MessageBoxIcon.Warning); } - } + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs index 2eceec4c..0d3d95b1 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.ProjectData { - - - public partial class ProjectSet { - +namespace FineUIPro.Web.ProjectData +{ + + + public partial class ProjectSet + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// ckState 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList ckState; - + /// /// txtProjectName 控件。 /// @@ -74,7 +76,16 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectName; - + + /// + /// rbIsCNCECShow 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox rbIsCNCECShow; + /// /// btnNew 控件。 /// @@ -83,7 +94,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnOut 控件。 /// @@ -92,7 +103,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// lblNumber 控件。 /// @@ -101,7 +112,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblNumber; - + /// /// ToolbarSeparator1 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Menu1 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuEdit 控件。 /// @@ -155,7 +166,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuEdit; - + /// /// btnEnter 控件。 /// @@ -164,7 +175,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnEnter; - + /// /// btnMenuDelete 控件。 /// diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx index 07de310d..143d6511 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx @@ -10,7 +10,7 @@
+ BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="150px"> @@ -24,7 +24,7 @@ ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"> - @@ -60,7 +60,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -104,7 +104,7 @@ > - + @@ -122,7 +122,7 @@ 拾取坐标 - + @@ -132,8 +132,10 @@ ShowRedStar="true"> - + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs index a2fcda54..b11ca8ac 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs @@ -101,6 +101,14 @@ namespace FineUIPro.Web.ProjectData this.txtCity.Text = project.City; this.txtEnglishRemark.Text = project.EnglishRemark; this.txtProjectRealCode.Text = project.ProjectRealCode; + if (project.IsCNCECShow == true) + { + this.rbIsCNCECShow.SelectedValue = "True"; + } + else + { + this.rbIsCNCECShow.SelectedValue = "False"; + } } } else @@ -143,6 +151,7 @@ namespace FineUIPro.Web.ProjectData City = this.txtCity.Text.Trim(), EnglishRemark = this.txtEnglishRemark.Text.Trim(), ProjectRealCode=this.txtProjectRealCode.Text.Trim(), + IsCNCECShow=Convert.ToBoolean( this.rbIsCNCECShow.SelectedValue), }; if (!string.IsNullOrEmpty(txtStartDate.Text.Trim())) diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs index f7aa1fbf..f1eef492 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.ProjectData { - - - public partial class ProjectSetSave { - +namespace FineUIPro.Web.ProjectData +{ + + + public partial class ProjectSetSave + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtProjectName 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectName; - + /// /// txtProjectCode 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectCode; - + /// /// txtShortName 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtShortName; - + /// /// drpProjectType 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProjectType; - + /// /// drpProjectState 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProjectState; - + /// /// txtStartDate 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtStartDate; - + /// /// txtEndDate 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtEndDate; - + /// /// txtContractNo 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtContractNo; - + /// /// txtDuration 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtDuration; - + /// /// drpUnit 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// ckbIsForeign 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckbIsForeign; - + /// /// drpProjectManager 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProjectManager; - + /// /// drpConstructionManager 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpConstructionManager; - + /// /// drpHSSEManager 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpHSSEManager; - + /// /// txtProjectAddress 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectAddress; - + /// /// txtWorkRange 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtWorkRange; - + /// /// txtRemark 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemark; - + /// /// txtProjectMoney 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtProjectMoney; - + /// /// txtConstructionMoney 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtConstructionMoney; - + /// /// txtTelephone 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTelephone; - + /// /// txtCountry 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCountry; - + /// /// drpProvince 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProvince; - + /// /// txtCity 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCity; - + /// /// txtMapCoordinates 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtMapCoordinates; - + /// /// bottomPanel 控件。 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ContentPanel bottomPanel; - + /// /// txtEnglishRemark 控件。 /// @@ -272,7 +274,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtEnglishRemark; - + /// /// txtProjectRealCode 控件。 /// @@ -281,16 +283,16 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectRealCode; - + /// - /// TextBox2 控件。 + /// rbIsCNCECShow 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox2; - + protected global::FineUIPro.RadioButtonList rbIsCNCECShow; + /// /// Toolbar1 控件。 /// @@ -299,7 +301,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ckIsUpTotalMonth 控件。 /// @@ -308,7 +310,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckIsUpTotalMonth; - + /// /// btnSave 控件。 /// @@ -317,7 +319,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnClose 控件。 /// @@ -326,7 +328,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// hdCompileMan 控件。 /// diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx index efa3f13f..caa29a7e 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx @@ -104,10 +104,10 @@ - - - + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs index 4be265fb..73981ca5 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs @@ -90,6 +90,14 @@ namespace FineUIPro.Web.ProjectData this.txtCity.Text = project.City; this.txtEnglishRemark.Text = project.EnglishRemark; this.txtProjectRealCode.Text = project.ProjectRealCode; + if (project.IsCNCECShow == true) + { + this.rbIsCNCECShow.SelectedValue = "True"; + } + else + { + this.rbIsCNCECShow.SelectedValue = "False"; + } } } } diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs index 0ad6ae26..155d56bd 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.ProjectData { - - - public partial class ProjectSetView { - +namespace FineUIPro.Web.ProjectData +{ + + + public partial class ProjectSetView + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtProjectName 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectName; - + /// /// txtProjectCode 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectCode; - + /// /// txtShortName 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtShortName; - + /// /// txtProjectType 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectType; - + /// /// txtProjectState 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectState; - + /// /// txtStartDate 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtStartDate; - + /// /// txtEndDate 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtEndDate; - + /// /// txtDuration 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtDuration; - + /// /// txtProjectManager 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectManager; - + /// /// txtConstructionManager 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtConstructionManager; - + /// /// txtHSSEManager 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtHSSEManager; - + /// /// txtProjectAddress 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectAddress; - + /// /// txtUnitName 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUnitName; - + /// /// txtWorkRange 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtWorkRange; - + /// /// txtRemark 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemark; - + /// /// txtProjectMoney 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectMoney; - + /// /// txtConstructionMoney 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtConstructionMoney; - + /// /// txtTelephone 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTelephone; - + /// /// txtCountry 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCountry; - + /// /// txtProvince 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProvince; - + /// /// txtCity 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCity; - + /// /// ckbIsForeign 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckbIsForeign; - + /// /// txtMapCoordinates 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtMapCoordinates; - + /// /// txtEnglishRemark 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtEnglishRemark; - + /// /// lb1 控件。 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lb1; - + /// /// txtProjectRealCode 控件。 /// @@ -272,16 +274,16 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectRealCode; - + /// - /// TextBox2 控件。 + /// rbIsCNCECShow 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox2; - + protected global::FineUIPro.RadioButtonList rbIsCNCECShow; + /// /// Toolbar1 控件。 /// @@ -290,7 +292,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// btnAttachUrl 控件。 /// @@ -299,7 +301,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttachUrl; - + /// /// btnClose 控件。 /// @@ -308,7 +310,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 6fc48bee..b1dc3361 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -23810,6 +23810,8 @@ namespace Model private string _ProjectRealCode; + private System.Nullable _IsCNCECShow; + private EntitySet _Accident_AccidentHandle; private EntitySet _Accident_AccidentPersonRecord; @@ -24228,6 +24230,8 @@ namespace Model partial void OnEnglishRemarkChanged(); partial void OnProjectRealCodeChanging(string value); partial void OnProjectRealCodeChanged(); + partial void OnIsCNCECShowChanging(System.Nullable value); + partial void OnIsCNCECShowChanged(); #endregion public Base_Project() @@ -25001,6 +25005,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCNCECShow", DbType="Bit")] + public System.Nullable IsCNCECShow + { + get + { + return this._IsCNCECShow; + } + set + { + if ((this._IsCNCECShow != value)) + { + this.OnIsCNCECShowChanging(value); + this.SendPropertyChanging(); + this._IsCNCECShow = value; + this.SendPropertyChanged("IsCNCECShow"); + this.OnIsCNCECShowChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet Accident_AccidentHandle { @@ -39495,10 +39519,10 @@ namespace Model private string _SaveHandleMan; - private string _WorkPackageId; - private string _WorkPackageName; + private string _WorkPackageId; + private EntityRef _Base_Project; private EntityRef _Person_Persons; @@ -39555,10 +39579,10 @@ namespace Model partial void OnProposeUnitIdChanged(); partial void OnSaveHandleManChanging(string value); partial void OnSaveHandleManChanged(); - partial void OnWorkPackageIdChanging(string value); - partial void OnWorkPackageIdChanged(); partial void OnWorkPackageNameChanging(string value); partial void OnWorkPackageNameChanged(); + partial void OnWorkPackageIdChanging(string value); + partial void OnWorkPackageIdChanged(); #endregion public Check_CheckControl() @@ -40037,26 +40061,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] - 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="_WorkPackageName", DbType="NVarChar(2000)")] public string WorkPackageName { @@ -40077,6 +40081,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] + 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.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -100703,10 +100727,10 @@ namespace Model private string _HazardValue; - private string _WorkPackageId; - private string _WorkPackageName; + private string _WorkPackageId; + private EntityRef _Base_Unit; private EntityRef _HSSE_Hazard_HazardRegisterTypes; @@ -100807,10 +100831,10 @@ namespace Model partial void OnRegisterTypes4IdChanged(); partial void OnHazardValueChanging(string value); partial void OnHazardValueChanged(); - partial void OnWorkPackageIdChanging(string value); - partial void OnWorkPackageIdChanged(); partial void OnWorkPackageNameChanging(string value); partial void OnWorkPackageNameChanged(); + partial void OnWorkPackageIdChanging(string value); + partial void OnWorkPackageIdChanged(); #endregion public HSSE_Hazard_HazardRegister() @@ -101748,26 +101772,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] - 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="_WorkPackageName", DbType="NVarChar(2000)")] public string WorkPackageName { @@ -101788,6 +101792,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] + 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.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit { @@ -283052,6 +283076,8 @@ namespace Model private string _ProjectName; + private System.Nullable _IsCNCECShow; + private string _LicenseTypeName; private string _UnitName; @@ -283264,6 +283290,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCNCECShow", DbType="Bit")] + public System.Nullable IsCNCECShow + { + get + { + return this._IsCNCECShow; + } + set + { + if ((this._IsCNCECShow != value)) + { + this._IsCNCECShow = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LicenseTypeName", DbType="NVarChar(50)")] public string LicenseTypeName {