From e55b6f99283b9cf7fa2e7983b52caea03e664f81 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 26 Dec 2024 11:19:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CheckManage/CheckQuantityStatistics.aspx | 8 ++++---- .../CheckQuantityStatistics.aspx.cs | 2 +- .../CheckQuantityStatistics.aspx.designer.cs | 4 ++-- .../HJGL/WeldingManage/PointManage.aspx.cs | 2 ++ .../RepairItemRecordTrustExtend.aspx.cs | 1 + .../WeldingReport/FeedbackResultSelect.aspx | 11 +++++++++++ .../FeedbackResultSelect.aspx.cs | 14 ++++++++++++++ .../FeedbackResultSelect.aspx.designer.cs | 9 +++++++++ .../FeedbackResultShowColumn.aspx.cs | 5 +++-- HJGL_ZH/FineUIPro.Web/Web.config | 2 +- HJGL_ZH/FineUIPro.Web/WebService1.asmx.cs | 2 ++ .../common/ProjectSet/SelectWelder.aspx | 5 +++-- .../common/ProjectSet/SelectWelder.aspx.cs | 5 +++++ .../ProjectSet/SelectWelder.aspx.designer.cs | 13 +++++++++++-- HJGL_ZH/Model/bin/Release/Model.dll | Bin 1216512 -> 1216512 bytes HJGL_ZH/Model/bin/Release/Model.pdb | Bin 3376640 -> 3376640 bytes 16 files changed, 69 insertions(+), 14 deletions(-) diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx index cfc53ca..7345599 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx +++ b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx @@ -74,16 +74,16 @@ - listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.ParentNode.NodeID)); diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.designer.cs b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.designer.cs index 2e465e8..07f1454 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.designer.cs +++ b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.designer.cs @@ -2,8 +2,8 @@ // <自动生成> // 此代码由工具生成。 // -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 // //------------------------------------------------------------------------------ diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs index 5753b8b..d3b79c8 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs @@ -1371,6 +1371,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage t.CH_NDTMethod = n; t.Flag = flag; t.CH_TrustType = "1"; + t.CH_TrustUnit = iso.BSU_ID; t.CH_TrustDate = DateTime.Now; t.ProjectId = batch.ProjectId; t.InstallationId = batch.InstallationId; @@ -1493,6 +1494,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage t.CH_TrustID = SQLHelper.GetNewID(typeof(Model.HJGL_CH_Trust)); t.CH_TrustCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetTrustCodeByProjectId", "dbo.HJGL_CH_Trust", "CH_TrustCode", batch.ProjectId, ndtInfo.NDT_Code + "-"); t.CH_NDTMethod = ndtItem.Value; + t.CH_TrustUnit = iso.BSU_ID; t.Flag = flag; t.CH_TrustType = "1"; t.CH_TrustDate = DateTime.Now; diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs index 3a12a0e..4ad1d9e 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs @@ -366,6 +366,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage t.CH_TrustCode = trustCode; t.CH_NDTMethod = NDT_ID; t.CH_TrustType = "2"; + t.CH_TrustUnit = iso.BSU_ID; t.CH_TrustDate = DateTime.Now.Date; t.ProjectId = batch.ProjectId; t.InstallationId = batch.InstallationId; diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx index 9894d48..f71d02a 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx +++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx @@ -41,6 +41,9 @@ + + @@ -234,6 +237,14 @@ SortField="CheckAddress" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px"> + + + + diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.cs index 6f62c62..2df1aad 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.cs @@ -42,6 +42,12 @@ namespace FineUIPro.Web.HJGL.WeldingReport this.drpNdtType.DataBind(); Funs.FineUIPleaseSelect(this.drpNdtType); + this.drpUnit.DataTextField = "UnitName"; + this.drpUnit.DataValueField = "UnitId"; + this.drpUnit.DataSource = BLL.Base_UnitService.GetAllUnitList(); + this.drpUnit.DataBind(); + Funs.FineUIPleaseSelect(this.drpUnit); + this.txtEndDate.Text = DateTime.Now.ToShortDateString(); //BindGrid(); Funs.FineUIPleaseSelect(this.drpState); @@ -171,6 +177,14 @@ namespace FineUIPro.Web.HJGL.WeldingReport { listStr.Add(new SqlParameter("@ndtType", null)); } + if (this.drpUnit.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@unitId", this.drpUnit.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@unitId", null)); + } if (!this.ckbFeedbackDate.Checked && !this.ckbTrustDate.Checked) { listStr.Add(new SqlParameter("@trustStartDate", null)); diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.designer.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.designer.cs index cd0869e..974e186 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.designer.cs +++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.designer.cs @@ -102,6 +102,15 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// protected global::FineUIPro.DropDownList drpState; + /// + /// drpUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnit; + /// /// ckbTrustDate 控件。 /// diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultShowColumn.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultShowColumn.aspx.cs index d62d73e..52cf2e8 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultShowColumn.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultShowColumn.aspx.cs @@ -19,7 +19,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { if (!IsPostBack) { - ListItem[] list = new ListItem[42]; + ListItem[] list = new ListItem[44]; list[0] = new ListItem("施工号", "1"); list[1] = new ListItem("试压包编号", "2"); list[2] = new ListItem("管线号", "3"); @@ -62,7 +62,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport list[39] = new ListItem("硬度反馈时间", "40"); list[40] = new ListItem("硬度不合格", "41"); list[41] = new ListItem("检测地点", "42"); - + list[42] = new ListItem("委托单位", "43"); + list[43] = new ListItem("反馈人", "44"); this.cblColumn.DataSource = list; this.cblColumn.DataBind(); diff --git a/HJGL_ZH/FineUIPro.Web/Web.config b/HJGL_ZH/FineUIPro.Web/Web.config index 2bd1c9c..ac085bf 100644 --- a/HJGL_ZH/FineUIPro.Web/Web.config +++ b/HJGL_ZH/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + diff --git a/HJGL_ZH/FineUIPro.Web/WebService1.asmx.cs b/HJGL_ZH/FineUIPro.Web/WebService1.asmx.cs index 9ff4386..cdae9dd 100644 --- a/HJGL_ZH/FineUIPro.Web/WebService1.asmx.cs +++ b/HJGL_ZH/FineUIPro.Web/WebService1.asmx.cs @@ -464,6 +464,7 @@ namespace FineUIPro.Web t.CH_NDTMethod = n; t.Flag = flag; t.CH_TrustType = "1"; + t.CH_TrustUnit = iso.BSU_ID; t.CH_TrustDate = DateTime.Now; t.ProjectId = batch.ProjectId; t.InstallationId = batch.InstallationId; @@ -565,6 +566,7 @@ namespace FineUIPro.Web t.CH_TrustCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetTrustCodeByProjectId", "dbo.HJGL_CH_Trust", "CH_TrustCode", batch.ProjectId, ndtInfo.NDT_Code + "-"); t.CH_NDTMethod = n; t.Flag = flag; + t.CH_TrustUnit = iso.BSU_ID; t.CH_TrustType = "1"; t.CH_TrustDate = DateTime.Now; t.ProjectId = batch.ProjectId; diff --git a/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx b/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx index 41b4ab2..073a271 100644 --- a/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx +++ b/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx @@ -32,11 +32,12 @@ + > + > + diff --git a/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs b/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs index 07b4f2d..33ff180 100644 --- a/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs @@ -165,6 +165,11 @@ namespace FineUIPro.Web.common.ProjectSet this.BindGrid(); } + protected void btnSearch_Click(object sender, EventArgs e) + { + this.BindGrid(); + } + //#region TreeView点击事件 ///// ///// TreeView点击事件 diff --git a/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.designer.cs b/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.designer.cs index 6b668c7..21b4edd 100644 --- a/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.designer.cs +++ b/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.designer.cs @@ -2,8 +2,8 @@ // <自动生成> // 此代码由工具生成。 // -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 // //------------------------------------------------------------------------------ @@ -93,6 +93,15 @@ namespace FineUIPro.Web.common.ProjectSet { /// protected global::FineUIPro.ToolbarFill ToolbarFill1; + /// + /// btnSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSearch; + /// /// btnEdit 控件。 /// diff --git a/HJGL_ZH/Model/bin/Release/Model.dll b/HJGL_ZH/Model/bin/Release/Model.dll index a980e0685c3385713ffcfe86b68dcc82e5f7bcf1..c9194a83228ed6e9710da83985acd608ad3c1a7c 100644 GIT binary patch delta 127 zcmZoz;MK6eYeEO}dG5@{?$&O`)^4WOZsyi*mey|8)^4`eZuZu0j@E9@)^4uWZtm7@ zp4M*O)^5J7-Ta*C0=)-jzy7o5r}O@0jkTZl^z3e5lFkpr0zfRdeM!2|3pwU<+?mt+ e+k~X}w+D?86WXJu(>rIygva4t>`IygHx$l+SJ3KBOYK?wH%HR>P; z-UGNxxjF@o`U=wb1sXmt@aYeiqK~OdjxPO1M@W*?o43DTpFXQ!KhH0}@2$s~CU4)o zneHOyYp%tpGD>{Zm4R-Vx+UO%6E3*n!2!JRL53dz1aXKEj&O_P6{ZZgnK;L>ZH7D{M%q_`|`&8 E1F`dSFaQ7m delta 305 zcmZ|Lzit6>0KoD4`S0paTh1wm(m(!{V(EHz5oQn2bTBiCq>>w0L~^r9G?Au>;nJyZ z(4jF%tj2l;@qGcq=LJ5)$*&mV%OOWUUsA6^lBC|WyNLvr&3XT0xg8W1Yfb(id%lmI zA9sEyX7yQo+EU(i)6h);8|-kv2^ZY(zzZ1{@WGD&g1E#Lt`R~Q3L;Pu#SLPJLqh^d zq;QKgGPuJ%9`J}Pa>%2ABAzVWEd43Y(OW~f40TmP8PBMoYN@N*p?$W&(vG#gaRLej Ba@+s_