gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20260924 焊条烘烤记录

Browse Source
This commit is contained in:
毕文静
2026-09-24 20:23:22 +08:00
parent 9189e998ae
commit a5660eda30
6 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx
+5 -3
View File
@@ -19,17 +19,19 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" EnableCheckBoxSelect="true"
KeepCurrentSelection="true" runat="server" BoxFlex="1" DataKeyNames="BakeRecordsId"
DataIDField="BakeRecordsId" AllowSorting="true" SortField="BakeDate" SortDirection="DESC"
OnSort="Grid1_Sort" EnableTextSelection="True">
OnSort="Grid1_Sort" EnableTextSelection="True" AllowPaging="true" IsDatabasePaging="true" PageSize="50"
OnPageIndexChange="Grid1_PageIndexChange" >
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="265px"
<f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="200px"
EnableEdit="true">
</f:DropDownList>
<f:DatePicker ID="txtStartDate" runat="server" Label="烘烤日期" EmptyText="开始时间" Width="220px" LabelAlign="Right"></f:DatePicker>
<f:Label ID="Label1" runat="server" Text="-"></f:Label>
<f:DatePicker ID="txtEndDate" runat="server" EmptyText="结束时间" Width="120px"></f:DatePicker>
<f:TextBox runat="server" Label="焊材牌号" ID="txtBrand" EmptyText="输入查询条件" Width="300px" LabelAlign="right"></f:TextBox>
<f:DropDownList ID="drpUnitStore" runat="server" Label="焊材库" LabelAlign="Right" Width="320px" LabelWidth="80px"></f:DropDownList>
<f:TextBox runat="server" Label="焊材牌号" ID="txtBrand" EmptyText="输入查询条件" Width="220px" LabelAlign="right"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.cs
+23 -2
View File
@@ -34,6 +34,9 @@ namespace FineUIPro.Web.JGZL
this.drpProjectId.DataBind();
Funs.FineUIPleaseSelect(this.drpProjectId);
this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
BLL.UnitStoreService.InitUnitStoreDropDownList(drpUnitStore, null, true);
BindGrid();
}
}
@@ -86,13 +89,18 @@ namespace FineUIPro.Web.JGZL
strSql += " AND BakeRecords.BakeDate <= @endDate";
listStr.Add(new SqlParameter("@endDate", this.txtEndDate.Text.Trim()));
}
if (this.drpUnitStore.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpUnitStore.SelectedValue))
{
strSql += " AND BakeRecords.UnitStoreId =@unitStoreId ";
listStr.Add(new SqlParameter("@unitStoreId", this.drpUnitStore.SelectedValue));
}
strSql += " order by BakeRecords.BakeDate desc";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
//var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = tb;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
#endregion
@@ -111,6 +119,19 @@ namespace FineUIPro.Web.JGZL
}
#endregion
#region 页索引改变事件
/// <summary>
/// 页索引改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
Grid1.PageIndex = e.NewPageIndex;
BindGrid();
}
#endregion
#region 提交
/// <summary>
/// 确定按钮
HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.designer.cs
Generated
+9
View File
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.JGZL
/// </remarks>
protected global::FineUIPro.DatePicker txtEndDate;
/// <summary>
/// drpUnitStore 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitStore;
/// <summary>
/// txtBrand 控件。
/// </summary>
HJGL_DS/FineUIPro.Web/Web.config
+1 -1
View File
@@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;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_DS/WebAPI/WebAPI.csproj.user
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />