diff --git a/DataBase/版本日志/SGGLDB_WH_2024-6-6-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-6-6-bwj.sql new file mode 100644 index 00000000..4c35ee3e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-6-6-bwj.sql @@ -0,0 +1 @@ +update ProcessControl_InspectionManagement set IsOnceQualified=1 \ No newline at end of file diff --git a/SGGL/BLL/Common/UploadAttachmentService.cs b/SGGL/BLL/Common/UploadAttachmentService.cs index 2068250f..a38780e1 100644 --- a/SGGL/BLL/Common/UploadAttachmentService.cs +++ b/SGGL/BLL/Common/UploadAttachmentService.cs @@ -1,5 +1,6 @@ using NPOI.SS.UserModel; using System; +using System.Configuration; using System.IO; using System.Linq; using System.Web.UI.WebControls; @@ -74,13 +75,12 @@ namespace BLL string[] subUrl = url.Split('/'); string fileName = subUrl[subUrl.Count() - 1]; string newFileName = fileName.Substring(fileName.IndexOf("_") + 1); + htmlStr += "" + newFileName + ""; } } - htmlStr += ""; } - return htmlStr; } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs index 009d120f..23638a38 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs @@ -47,7 +47,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl BP.Class, P.AcceptanceSite, P.AcceptanceCheckMan, - (CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified, + (CASE WHEN IsOnceQualified='False' THEN '否' ELSE '是' END)AS IsOnceQualified, P.InspectionCode, P.InspectionDate" + @" FROM ProcessControl_InspectionManagement AS P " diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx index 8d3aeefb..a71031f5 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx @@ -29,7 +29,10 @@ - + <%----%> + + @@ -38,7 +41,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs index 1f6c5cd9..1887daf8 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs @@ -19,6 +19,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl GetButtonPower(); BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//专业 + UserService.InitUserProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, string.Empty, false); this.hdInspectionNoticeId.Text = Request.Params["inspectionId"]; if (!string.IsNullOrEmpty(this.hdInspectionNoticeId.Text)) @@ -35,7 +36,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl this.drpCNProfessionalId.SelectedValue = inspectionManagement.CNProfessionalId; } this.txtAcceptanceSite.Text = inspectionManagement.AcceptanceSite; - this.txtAcceptanceCheckMan.Text = inspectionManagement.AcceptanceCheckMan; + //this.txtAcceptanceCheckMan.Text = ConvertCheckMan(inspectionManagement.AcceptanceCheckMan); + if (!string.IsNullOrEmpty(inspectionManagement.AcceptanceCheckMan)) + { + this.drpAcceptanceCheckMan.SelectedValueArray = inspectionManagement.AcceptanceCheckMan.Split(','); + } this.txtNoticeCode.Text = inspectionManagement.NoticeCode; this.hdParentDivisionProjectId.Text = inspectionManagement.ParentDivisionProjectId; if (inspectionManagement.IsOnceQualified.HasValue) @@ -100,18 +105,29 @@ namespace FineUIPro.Web.CQMS.ProcessControl } inspectionManagement.AcceptanceSite = this.txtAcceptanceSite.Text.Trim(); - inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim(); + //检查人 + string CheckManIds = string.Empty; + foreach (var item in this.drpAcceptanceCheckMan.SelectedValueArray) + { + CheckManIds += item + ","; + } + if (!string.IsNullOrEmpty(CheckManIds)) + { + CheckManIds = CheckManIds.Substring(0, CheckManIds.LastIndexOf(",")); + } + inspectionManagement.AcceptanceCheckMan = CheckManIds; + //inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim(); if (!string.IsNullOrEmpty(this.rblIsOnceQualified.SelectedValue)) { - if (this.rblIsOnceQualified.SelectedValue == "True") - { - inspectionManagement.IsOnceQualified = true; - } - else + if (this.rblIsOnceQualified.SelectedValue == "False") { inspectionManagement.IsOnceQualified = false; inspectionManagement.UnqualifiedReason = this.txtUnqualifiedReason.Text.Trim(); } + else + { + inspectionManagement.IsOnceQualified = true; + } } inspectionManagement.InspectionCode = this.txtInspectionCode.Text.Trim(); inspectionManagement.InspectionDate = Funs.GetNewDateTime(this.txtInspectionDate.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.designer.cs index 537aa94a..a58621c0 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.designer.cs @@ -85,13 +85,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl { protected global::FineUIPro.TextBox txtAcceptanceSite; /// - /// txtAcceptanceCheckMan 控件。 + /// drpAcceptanceCheckMan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtAcceptanceCheckMan; + protected global::FineUIPro.DropDownList drpAcceptanceCheckMan; /// /// rblIsOnceQualified 控件。 diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx index a8a44843..07777800 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx @@ -8,473 +8,380 @@ 质量管理组织机构
- -
+ +
- + + - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + - - - + + - - - + + - - - + + - - + - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + - - + - - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + - - + - - + - - + - - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
-   
+
+ -    + -        + + - - +
-    +
-     + -        + -           +
+
-   + -     + -       + -       +
-
+
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - -
- - - - - - - -     +
- - - - - - -
- - - - - - - - - - - - - - -
- - - - -       - - -        - - -
- - - - - - - - - - - - - - -
- - - - - - -      - - -        - - -
- - - - - - - - - - - - - - -
- - -   - -      - -          - -           - -
- - - - - - - - - - - - - - -
+ + + + + +
+ + + + + +   + + + + + + + +
diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs index 2897df0c..ee14d5df 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs @@ -24,6 +24,14 @@ namespace FineUIPro.Web.CQMS.QualityPlanning string projectId = this.CurrUser.LoginProjectId; string unitId = this.CurrUser.UnitId; + if (this.CurrUser.UserId == BLL.Const.hfnbdId) + { + unitId = BLL.Const.UnitId_CWCEC; + } + + this.divSubOrganizational.Visible = false; + this.divOrganizational.Visible = true; + this.ContentPanel1.Title = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId); var unit = (from x in Funs.DB.Project_ProjectUnit @@ -305,7 +313,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning name4 = name4.Substring(0, name4.LastIndexOf(',')); } } - this.Label8.Text = "施工经理：" + name4; + this.Label18.Text = "施工经理：" + name4; string name5 = string.Empty; var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理"); @@ -320,7 +328,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning name5 = name5.Substring(0, name5.LastIndexOf(',')); } } - this.Label9.Text = "质量经理：" + name5; + this.Label19.Text = "质量经理：" + name5; string name6 = string.Empty; var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理"); @@ -465,6 +473,11 @@ namespace FineUIPro.Web.CQMS.QualityPlanning var pModel = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == projectId); + if(this.CurrUser.UserId==BLL.Const.hfnbdId) + { + unitId = BLL.Const.UnitId_CWCEC; + } + var unit = (from x in Funs.DB.Project_ProjectUnit join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId where x.ProjectId == projectId diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs index f1b9ba02..14c9a168 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs @@ -246,24 +246,6 @@ namespace FineUIPro.Web.CQMS.QualityPlanning { /// protected global::System.Web.UI.WebControls.Label Label20; - /// - /// Label21 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label21; - - /// - /// Label22 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label22; - /// /// Label23 控件。 /// @@ -308,5 +290,23 @@ namespace FineUIPro.Web.CQMS.QualityPlanning { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label27; + + /// + /// Label21 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label21; + + /// + /// Label22 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label22; } } diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index cb873201..63722353 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 1b0a24a2..9fc55c34 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -1,4 +1,4 @@ - + -
+
- + - + - - - - - + + + + + - - - - + + + + - + - + - - - + + + - + - + - + - - + + - + - + - - - + + + - - + + - - - - + + + + - + - - + + - - + + - - - + + + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + - - - - + + + + - + - + - - + + - - + + @@ -179,20 +179,20 @@ - - + + - - + + - - + + - - + + diff --git a/SGGL/FineUIPro.Web/res/images/Organizational.png b/SGGL/FineUIPro.Web/res/images/Organizational.png index ff29a645..5e1184d7 100644 Binary files a/SGGL/FineUIPro.Web/res/images/Organizational.png and b/SGGL/FineUIPro.Web/res/images/Organizational.png differ diff --git a/SGGL/FineUIPro.Web/res/images/SubOrganizational.png b/SGGL/FineUIPro.Web/res/images/SubOrganizational.png index b547a7bd..fa5ef7ee 100644 Binary files a/SGGL/FineUIPro.Web/res/images/SubOrganizational.png and b/SGGL/FineUIPro.Web/res/images/SubOrganizational.png differ diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true