20241021 修改共检通知单

2024-10-21 16:29:59 +08:00
parent 66d458026e
commit abb15b53fc
11 changed files with 1724 additions and 995 deletions
@@ -25,7 +25,14 @@ namespace FineUIPro.Web.CQMS.ProcessControl
            if (!IsPostBack)
            {
                GetButtonPower();
-                BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业
+                //BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业
+                //专业
+                this.drpCNProfessional.DataTextField = "DetectionItems";
+                this.drpCNProfessional.DataValueField = "ControlId";
+                this.drpCNProfessional.DataSource = BLL.CNProfessionalService.GetCnProList();
+                this.drpCNProfessional.DataBind();
+                Funs.FineUIPleaseSelect(this.drpCNProfessional);
+
                BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商
                BindGrid();
            }
@@ -42,7 +49,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                                    P.CNProfessionalId,
                                    P.UnitWorkId,
                                    U.UnitName,
-                                    C.ProfessionalName,
+                                    C.DetectionItems as ProfessionalName,
                                    P.NoticeCode,
                                    UnitWork.UnitWorkName,
                                    DP.DivisionName AS Branch,
@@ -52,7 +59,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                                    P.AcceptanceCheckMan"
                            + @" FROM ProcessControl_InspectionManagement AS P"
                            + @" LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId"
-                            + @" LEFT JOIN Base_CNProfessional C ON C.CNProfessionalId = P.CNProfessionalId"
+                            + @" LEFT JOIN Control_PointCropping C ON C.ControlId = P.CNProfessionalId"
                            + @" LEFT JOIN WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId = P.UnitWorkId"
                            + @" LEFT JOIN WBS_DivisionProject AS DP ON DP.DivisionProjectId = P.Branch"
                            + @" LEFT JOIN WBS_BreakdownProject AS BP ON BP.BreakdownProjectId = P.ControlPointType"