提交代码

HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx

@@ -74,16 +74,16 @@
                 </Items>
                 <Items>
                     <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道无损检测数量统计表" EnableCollapse="true"
-                        runat="server" BoxFlex="1" DataKeyNames="PipeCode" AllowCellEditing="true"
+                        runat="server" BoxFlex="1" DataKeyNames="IsoNo" AllowCellEditing="true"
-                        AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipeCode"
+                        AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="IsoNo"
-                        AllowSorting="true" SortField="PipeCode,IsoNo,NDTR_Name" SortDirection="ASC" OnSort="Grid1_Sort"
+                        AllowSorting="true" SortField="IsoNo" SortDirection="ASC" OnSort="Grid1_Sort"
                         AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                         EnableTextSelection="True" AutoScroll="true" Width="100%">
                         <Columns>
                             <f:RenderField HeaderText="管道编号" ColumnID="PipeCode" DataField="PipeCode" SortField="PipeCode"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
                             </f:RenderField>
-                            <f:RenderField HeaderText="包含的单线号" ColumnID="IsoNo" DataField="IsoNo" SortField="IsoNo"
+                            <f:RenderField HeaderText="管线号" ColumnID="IsoNo" DataField="IsoNo" SortField="IsoNo"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
                             </f:RenderField>
                             <f:RenderField HeaderText="检测比例" ColumnID="NDTR_Name" DataField="NDTR_Name" FieldType="String"

HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.cs

@@ -135,7 +135,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
         {
             if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
             {
-                string strSql = @"SELECT * FROM HJGL_View_TrustNumSummary WHERE ProjectId = @ProjectId ";//AND InstallationId = @InstallationId";
+                string strSql = @"SELECT * FROM HJGL_View_TrustNumSummary WHERE ProjectId = @ProjectId order by IsoNo";//AND InstallationId = @InstallationId";
                 List<SqlParameter> listStr = new List<SqlParameter>();
 
                 listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.ParentNode.NodeID));

HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.designer.cs

@@ -2,8 +2,8 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 

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;

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;

HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx

@@ -41,6 +41,9 @@
                                     <f:DropDownList ID="drpState" runat="server" Label="检测状态" EmptyText="选择查询条件" 
                                          Width="180px" LabelWidth="80px"  LabelAlign="Right">
                                     </f:DropDownList>
+                                    <f:DropDownList ID="drpUnit" runat="server" Label="委托单位" EmptyText="选择查询条件" EnableEdit="true"
+                                         Width="280px" LabelWidth="80px"  LabelAlign="Right">
+                                    </f:DropDownList>
                                 </Items>
                             </f:FormRow>
                         </Rows>
@@ -234,6 +237,14 @@
                                 SortField="CheckAddress" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
                                 Width="120px">
                             </f:RenderField>
+                            <f:RenderField HeaderText="委托单位" ColumnID="UnitName" DataField="UnitName"
+                                SortField="UnitName" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
+                                Width="120px">
+                            </f:RenderField>
+                            <f:RenderField HeaderText="反馈人" ColumnID="FeedbackMan" DataField="FeedbackMan"
+                                SortField="FeedbackMan" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
+                                Width="120px">
+                            </f:RenderField>
                         </Columns>
                         <PageItems>
                             <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">

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));

HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.designer.cs

@@ -102,6 +102,15 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpState;
         
+        /// <summary>
+        /// drpUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnit;
+        
         /// <summary>
         /// ckbTrustDate 控件。
         /// </summary>

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();

HJGL_ZH/FineUIPro.Web/Web.config

@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\sql2019;Database=HJGLDB_NEW;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_NEW;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

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;

HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx

@@ -32,11 +32,12 @@
                             <f:Toolbar ID="Toolbar3" Position="Top" ToolbarAlign="Right" runat="server">
                                 <Items>
                                     <f:TextBox ID="txtWeldCode" runat="server" Label="焊工号" EmptyText="请输入焊工号"
-                                        AutoPostBack="true" OnTextChanged="TextBox_TextChanged"></f:TextBox>
+                                        ></f:TextBox>
                                     <f:TextBox ID="txtWeldName" runat="server" Label="姓名" EmptyText="请输入焊工姓名"
-                                         AutoPostBack="true" OnTextChanged="TextBox_TextChanged"></f:TextBox>
+                                         ></f:TextBox>
                                     <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                      </f:ToolbarFill>
+                                    <f:Button runat="server" ID="btnSearch" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button>
                                     <f:Button ID="btnEdit" Text="确定" Icon="Add" runat="server" OnClick="btnEdit_Click">
                                     </f:Button>
                                 </Items>

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点击事件
         ///// <summary>
         ///// TreeView点击事件

HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.designer.cs

@@ -2,8 +2,8 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
@@ -93,6 +93,15 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
         
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+        
         /// <summary>
         /// btnEdit 控件。
         /// </summary>