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

1

This commit is contained in:
高飞 2025-09-22 09:14:06 +08:00
parent ba63672e6c
commit 45830a0833
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx
View File

@ -22,6 +22,7 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items> <Items>
<f:DropDownList ID="drpUnitStoreId" runat="server" Label="单位仓库" LabelAlign="Right"></f:DropDownList>
<f:DatePicker ID="txtStartDate" runat="server" Label="记录日期" EmptyText="开始时间" Width="220px" LabelAlign="Right"></f:DatePicker> <f:DatePicker ID="txtStartDate" runat="server" Label="记录日期" EmptyText="开始时间" Width="220px" LabelAlign="Right"></f:DatePicker>
<f:Label ID="Label1" runat="server" Text="-"></f:Label> <f:Label ID="Label1" runat="server" Text="-"></f:Label>
<f:DatePicker ID="txtEndDate" runat="server" EmptyText="结束时间" Width="120px"></f:DatePicker> <f:DatePicker ID="txtEndDate" runat="server" EmptyText="结束时间" Width="120px"></f:DatePicker>

8
HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.cs
View File

@ -23,7 +23,7 @@ namespace FineUIPro.Web.WeldMat.WeldMatDataBase
if (!IsPostBack) if (!IsPostBack)
{ {
ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.UnitStoreService.InitUnitStoreDropDownList(drpUnitStoreId, null, true);
// 绑定表格 // 绑定表格
BindGrid(); BindGrid();
} }
@ -44,7 +44,11 @@ namespace FineUIPro.Web.WeldMat.WeldMatDataBase
LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId=TemperatureAndHumidity.UnitStoreId LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId=TemperatureAndHumidity.UnitStoreId
WHERE 1=1 "; WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpUnitStoreId.SelectedValue != BLL.Const._Null)
{
strSql += " AND TemperatureAndHumidity.UnitStoreId = @unitStoreId";
listStr.Add(new SqlParameter("@unitStoreId", drpUnitStoreId.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtRecordMan.Text.Trim())) if (!string.IsNullOrEmpty(this.txtRecordMan.Text.Trim()))
{ {
strSql += " AND TemperatureAndHumidity.RecordMan LIKE @RecordMan"; strSql += " AND TemperatureAndHumidity.RecordMan LIKE @RecordMan";

9
HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.designer.cs generated
View File

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

14
HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -79,13 +79,13 @@
<publishTime>09/10/2013 16:29:20</publishTime> <publishTime>09/10/2013 16:29:20</publishTime>
</File> </File>
<File Include="bin/BLL.dll"> <File Include="bin/BLL.dll">
<publishTime>09/01/2025 17:47:50</publishTime> <publishTime>09/16/2025 14:44:43</publishTime>
</File> </File>
<File Include="bin/BLL.dll.config"> <File Include="bin/BLL.dll.config">
<publishTime>07/28/2025 20:15:00</publishTime> <publishTime>07/28/2025 20:15:00</publishTime>
</File> </File>
<File Include="bin/BLL.pdb"> <File Include="bin/BLL.pdb">
<publishTime>09/01/2025 17:47:50</publishTime> <publishTime>09/16/2025 14:44:43</publishTime>
</File> </File>
<File Include="bin/BouncyCastle.Crypto.dll"> <File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/17/2020 21:32:28</publishTime> <publishTime>12/17/2020 21:32:28</publishTime>
@ -115,10 +115,10 @@
<publishTime>07/25/2012 11:48:56</publishTime> <publishTime>07/25/2012 11:48:56</publishTime>
</File> </File>
<File Include="bin/Model.dll"> <File Include="bin/Model.dll">
<publishTime>09/01/2025 17:47:50</publishTime> <publishTime>09/16/2025 14:44:43</publishTime>
</File> </File>
<File Include="bin/Model.pdb"> <File Include="bin/Model.pdb">
<publishTime>09/01/2025 17:47:50</publishTime> <publishTime>09/16/2025 14:44:43</publishTime>
</File> </File>
<File Include="bin/Newtonsoft.Json.dll"> <File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/17/2021 20:03:36</publishTime> <publishTime>03/17/2021 20:03:36</publishTime>
@ -319,10 +319,10 @@
<publishTime>02/01/2018 12:20:56</publishTime> <publishTime>02/01/2018 12:20:56</publishTime>
</File> </File>
<File Include="bin/WebAPI.dll"> <File Include="bin/WebAPI.dll">
<publishTime>09/01/2025 17:47:51</publishTime> <publishTime>09/16/2025 14:44:44</publishTime>
</File> </File>
<File Include="bin/WebAPI.pdb"> <File Include="bin/WebAPI.pdb">
<publishTime>09/01/2025 17:47:51</publishTime> <publishTime>09/16/2025 14:44:44</publishTime>
</File> </File>
<File Include="bin/WebGrease.dll"> <File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 13:57:34</publishTime> <publishTime>01/23/2014 13:57:34</publishTime>
@ -448,7 +448,7 @@
<publishTime>07/03/2024 11:01:07</publishTime> <publishTime>07/03/2024 11:01:07</publishTime>
</File> </File>
<File Include="Web.config"> <File Include="Web.config">
<publishTime>09/01/2025 17:48:01</publishTime> <publishTime>09/16/2025 14:44:50</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>