2022-09-08 合同基本修改，焊接数据分析修改

2022-09-08 20:14:51 +08:00
parent e0f256688a
commit 6881455e9d
22 changed files with 2744 additions and 259 deletions
@@ -15,13 +15,110 @@ namespace FineUIPro.Web.HJGL.WeldingReport
            if (!IsPostBack)
            {
                this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
+                this.drpJointAttribute.DataTextField = "Text";
+                this.drpJointAttribute.DataValueField = "Value";
+                this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute();
+                this.drpJointAttribute.DataBind();
+                Funs.FineUIPleaseSelect(drpJointAttribute);
+
+                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
+                BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
+
            }
        }

        private void BindGrid()
        {
            List<SqlParameter> listStr = new List<SqlParameter>();
+
            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
+            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            {
+                listStr.Add(new SqlParameter("@unitcode", this.drpUnitId.SelectedValue));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@unitcode", null));
+            }
+            if (drpUnitWorkId.SelectedValue != Const._Null)
+            {
+                listStr.Add(new SqlParameter("@UnitWork", drpUnitWorkId.SelectedValue));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@UnitWork", null));
+
+            }
+
+            if (!string.IsNullOrEmpty(this.txtMaterialCode.Text))
+            {
+                listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text + "%"));
+
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@MaterialCode", null));
+
+            }
+            if (!string.IsNullOrEmpty(this.txtSingleName.Text))
+            {
+                listStr.Add(new SqlParameter("@SingleName ", "%" + this.txtSingleName.Text + "%"));
+
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@SingleName ", null));
+
+            }
+            if (!string.IsNullOrEmpty(this.txtThickness.Text))
+            {
+                listStr.Add(new SqlParameter("@Thickness", "%" + this.txtThickness.Text + "%"));
+
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@Thickness", null));
+
+            }
+            if (!string.IsNullOrEmpty(this.txtSpecification.Text))
+            {
+                listStr.Add(new SqlParameter("@Specification", "%" + this.txtSpecification.Text + "%"));
+
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@Specification", null));
+
+            }
+            if (!string.IsNullOrEmpty(this.txtWeldTypeCode.Text))
+            {
+                listStr.Add(new SqlParameter("@WeldTypeCode", "%" + this.txtWeldTypeCode.Text + "%"));
+
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@WeldTypeCode", null));
+
+            }
+            if (drpJointAttribute.SelectedValue != Const._Null)
+            {
+                listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@JointAttribute", null));
+
+            }
+            if (!string.IsNullOrEmpty(this.txtPersonName.Text))
+            {
+                listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text + "%"));
+
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@PersonName", null));
+
+            }

            SqlParameter[] parameter = listStr.ToArray();
            DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_CheckDefects", parameter);