11

HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessCheckOrderPrint.aspx

@@ -16,7 +16,7 @@
                     Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox">
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server"
-                            BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" DataIDField="ProjectId"
+                            BoxFlex="1" DataKeyNames="ID"  DataIDField="ProjectId"
                             AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort"
                             AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
                             EnableRowSelectEvent="true" EnableRowClickEvent="true"
@@ -73,7 +73,7 @@
                     <Items>
                         <f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
                             DataKeyNames="HardTestReportId" AllowSorting="true" SortField="HardTestReportId"
-                            SortDirection="ASC" EnableCheckBoxSelect="true">
+                            SortDirection="ASC" OnSort="Grid2_Sort" EnableCheckBoxSelect="true">
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
                                     <Items>

HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessCheckOrderPrint.aspx.cs

@@ -57,7 +57,14 @@ namespace FineUIPro.Web.ContinuousPrint
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", ProjectId));
             SqlParameter[] parameter = listStr.ToArray();
-            Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter);
+            DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
+            DataView view = dt.DefaultView;
+            if (!string.IsNullOrEmpty(Grid2.SortField) && view.Count > 0)
+            {
+                view.Sort = String.Format("{0} {1}", Grid2.SortField, Grid2.SortDirection);
+            }
+            DataTable table = view.ToTable();
+            Grid2.DataSource = table;
             Grid2.DataBind();
             Grid2.SelectAllRows();
         }
@@ -93,10 +100,12 @@ namespace FineUIPro.Web.ContinuousPrint
         /// <param name="e"></param>
         protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
         {
-            Grid1.SortDirection = e.SortDirection;
-            Grid1.SortField = e.SortField;
             BindGrid();
         }
+        protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGrid1(this.Grid1.SelectedRowID);
+        }
         #endregion
 
         #region 选择加载

HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx

@@ -71,7 +71,7 @@
                     <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="硬度数据录入" EnableCollapse="true"
                         AutoScroll="true" runat="server" BoxFlex="1" DataKeyNames="HardTestReportItemId,HardTestReportItemId2,HardTestReportItemId3,JOT_ID" AllowCellEditing="true"
                         EnableColumnLines="true" ClicksToEdit="1" DataIDField="HardTestReportItemId" AllowSorting="true" ForceFit="true" EnterVerticalNavigate="false" EnterNavigate="true"
-                        SortField="HardTrustDate,ISO_IsoNo,Sort1,Sort2,Sort3,Sort4,Sort5,SortIndex,TestPart" SortDirection="DESC" OnSort="Grid1_Sort" EnableTextSelection="True" EnableCheckBoxSelect="true"
+                        SortField="ISO_IsoNo,Sort1,Sort2,Sort3,Sort4,Sort5,SortIndex,TestPart,HardTrustDate" SortDirection="DESC" OnSort="Grid1_Sort" EnableTextSelection="True" EnableCheckBoxSelect="true"
                         AllowPaging="true" IsDatabasePaging="true" PageSize="1000" OnPageIndexChange="Grid1_PageIndexChange" TabVerticalNavigate="true" EnterEditableCell="true">
                         <Toolbars>
                             <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">

HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx

@@ -67,6 +67,9 @@
                             <f:ToolbarFill ID="ToolbarFill1" runat="server"> </f:ToolbarFill>
                             <%--<f:Button ID="btnNew" Text="增加" ToolTip="增加硬度委托" Icon="Add" runat="server" OnClick="btnNew_Click">
                             </f:Button>--%>
+                            <f:Button ID="btnSave" Text="提交" ToolTip="提交试验方法" Icon="SystemSave" ValidateForms="SimpleForm1" runat="server"
+                                OnClick="btnSave_Click">
+                            </f:Button>
                             <f:Button ID="btnEdit" Text="编辑" ToolTip="修改硬度委托信息" Icon="TableEdit" runat="server" OnClick="btnEdit_Click" Hidden="true">
                             </f:Button>
                              <f:Button ID="btnDelete" Text="删除" ToolTip="删除硬度委托" ConfirmText="确认删除此硬度委托?" ConfirmTarget="Top" Hidden="true"
@@ -95,8 +98,8 @@
                             </f:FormRow>
                             <f:FormRow>
                                 <Items>
-                                    <f:Label ID="txtSTE_Code" Label="材质" runat="server" LabelWidth="80px" LabelAlign="Right">
+                                    <f:TextBox ID="txtTestMethod" Label="试验方法" runat="server" LabelWidth="80px"  Width="220px" LabelAlign="Right">
-                                    </f:Label>
+                                    </f:TextBox>
                                     <f:Label ID="txtTestDate" Label="热处理委托时间" runat="server" LabelWidth="110px" LabelAlign="Right">
                                     </f:Label>
                                 </Items>

HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs

@@ -344,13 +344,13 @@ namespace FineUIPro.Web.HJGL.HotHardManage
             this.btnDelete.Hidden = true;
             this.btnPrint.Hidden = true;
             this.btnPrint2.Hidden = true;
-            this.SimpleForm1.Reset(); ///重置所有字段
+            //this.SimpleForm1.Reset(); ///重置所有字段
             var trust = Funs.DB.HJGL_View_CH_HardTestReport.FirstOrDefault(x => x.HardTestReportId == this.HardTestReportId);
             if (trust != null)
             {
                 this.txtHotHardCode.Text = trust.HotHardCode;
                 this.txtCH_TrustUnit.Text = trust.UnitName;
-                this.txtSTE_Code.Text = trust.STE_Code;
+                this.txtTestMethod.Text = trust.TestMethod;
                 if (trust.TestDate != null)
                 {
                     this.txtTestDate.Text = string.Format("{0:yyyy-MM-dd}", trust.TestDate);
@@ -383,7 +383,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
         {
             this.txtHotHardCode.Text = string.Empty;
             this.txtCH_TrustUnit.Text = string.Empty;
-            this.txtSTE_Code.Text = string.Empty;
+            this.txtTestMethod.Text = string.Empty;
             this.txtTestDate.Text = string.Empty;
             this.txtInstrumentType.Text = string.Empty;
             this.txtEquipmentName.Text = string.Empty;
@@ -451,6 +451,26 @@ namespace FineUIPro.Web.HJGL.HotHardManage
             }
         }
 
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_HotHardManageEditMenuId, Const.BtnModify))
+            {
+                Model.SGGLDB db = Funs.DB;
+                Model.HJGL_CH_HardTestReport newTestReport = db.HJGL_CH_HardTestReport.FirstOrDefault(x => x.HardTestReportId == this.HardTestReportId);
+                if (newTestReport != null)
+                {
+                    newTestReport.TestMethod = txtTestMethod.Text.Trim();
+                    db.SubmitChanges();
+                    txtTestMethod.Text = newTestReport.TestMethod;
+                    Alert.ShowInTop("试验方法更新成功！", MessageBoxIcon.Success);
+                }
+            }
+            else
+            {
+                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+            }
+        }
+
         #region 编辑硬度委托
         /// <summary>
         /// 编辑硬度委托

HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.HotHardManage {
+namespace FineUIPro.Web.HJGL.HotHardManage
+{
 
 
-    public partial class HotHardManageEdit {
+    public partial class HotHardManageEdit
+    {
 
         /// <summary>
         /// Head1 控件。
@@ -174,6 +176,15 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
 
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
         /// <summary>
         /// btnEdit 控件。
         /// </summary>
@@ -247,13 +258,13 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         protected global::FineUIPro.Label txtCH_TrustUnit;
 
         /// <summary>
-        /// txtSTE_Code 控件。
+        /// txtTestMethod 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Label txtSTE_Code;
+        protected global::FineUIPro.TextBox txtTestMethod;
 
         /// <summary>
         /// txtTestDate 控件。

HJGL_ZH/FineUIPro.Web/Web.config

@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\SQL2019;Database=HJGLDB_ZHJA;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2016;Database=HJGLDB_ZH;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/WeldMat/Stock/StockIn.aspx

@@ -27,13 +27,14 @@
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
                         <Items>
-                            <f:Label runat="server"  Text="如焊材已有领用，则修改时不更新入库数量"  Width="400px" CssClass="customlabel"></f:Label>
+                            <f:Label runat="server"  Text="如焊材已有领用，则修改时不更新入库数量"  Width="260px" CssClass="customlabel"></f:Label>
-                            <f:TextBox runat="server" Label="焊材牌号" ID="txtWeldName" EmptyText="输入查询条件" AutoPostBack="true"
+                            <f:TextBox runat="server" Label="焊材牌号" ID="txtWeldName" EmptyText="输入查询条件"  Width="250px" LabelAlign="right">
-                                OnTextChanged="TextBox_TextChanged" Width="300px" LabelAlign="right">
                             </f:TextBox>
                             <f:DropDownList ID="drpWeldType" runat="server" Label="焊材类型" LabelAlign="Right" AutoPostBack="true" EnableEdit="true"
-                                OnSelectedIndexChanged="drpWeldType_SelectedIndexChanged" LabelWidth="75px">
+                                OnSelectedIndexChanged="drpWeldType_SelectedIndexChanged" Width="200px" LabelWidth="75px">
                             </f:DropDownList>
+                            <f:TextBox ID="txtWarrantybook" runat="server" Label="质保书自编号" EmptyText="输入查询条件"  Width="260px" LabelAlign="right"></f:TextBox>
+                            <f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="查询" OnClick="btnSearch_Click"></f:Button>
                             <f:ToolbarFill ID="ToolbarFill1" runat="server">
                             </f:ToolbarFill>
                             <f:Button ID="btnNew" Text="增加" Icon="Add" runat="server" OnClick="btnNew_Click">

HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.cs

@@ -61,6 +61,11 @@ namespace FineUIPro.Web.WeldMat.Stock
                 strSql += " AND Weld.WeldTypeId = @WeldTypeId";
                 listStr.Add(new SqlParameter("@WeldTypeId", drpWeldType.SelectedValue));
             }
+            if (!string.IsNullOrEmpty(this.txtWarrantybook.Text.Trim()))
+            {
+                strSql += " AND StockIn.Warrantybook LIKE @Warrantybook";
+                listStr.Add(new SqlParameter("@Warrantybook", "%" + this.txtWarrantybook.Text.Trim() + "%"));
+            }
             if (CurrUser.Account != Const.Gly)
             {
                 strSql += " AND store.UnitId = @UnitId";
@@ -142,12 +147,17 @@ namespace FineUIPro.Web.WeldMat.Stock
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void TextBox_TextChanged(object sender, EventArgs e)
+        //protected void TextBox_TextChanged(object sender, EventArgs e)
+        //{
+        //    BindGrid();
+        //}
+
+        protected void drpWeldType_SelectedIndexChanged(object sender, EventArgs e)
         {
             BindGrid();
         }
 
-        protected void drpWeldType_SelectedIndexChanged(object sender, EventArgs e)
+        protected void btnSearch_Click(object sender, EventArgs e)
         {
             BindGrid();
         }

HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.designer.cs

@@ -77,6 +77,24 @@ namespace FineUIPro.Web.WeldMat.Stock
         /// </remarks>
         protected global::FineUIPro.DropDownList drpWeldType;
 
+        /// <summary>
+        /// txtWarrantybook 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWarrantybook;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>