2023-08-25

2023-08-25 23:55:32 +08:00
parent 117010f7d2
commit b64cf04f68
37 changed files with 3617 additions and 2858 deletions
@@ -18,6 +18,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
            {
                this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                Funs.FineUIPleaseSelect(DropTwoJointType, "请选择");
+                BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
                this.InitTreeMenu();//加载树

            }
@@ -471,7 +472,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                {
                    foreach (var jot in jotList)
                    {
-                        List<Model.View_HJGL_WPQ> wpqList = BLL.WPQListServiceService.GetMatchWPQ(jot, this.CurrUser.LoginProjectId);
+                        List<Model.View_HJGL_WPQ> wpqList = BLL.WPQListServiceService.GetMatchWPQ(jot, this.CurrUser.LoginProjectId, drpUnit.SelectedValue);
                        if (wpqList != null)
                        {
                            Model.HJGL_WeldJoint newJot = WeldJointService.GetWeldJointByWeldJointId(jot.WeldJointId);