From 45830a083377d1f51d84cecb4675c1bf461d2cad Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 22 Sep 2025 09:14:06 +0800
Subject: [PATCH] 1

---
 .../WeldMatDataBase/TemperatureAndHumidity.aspx    |  1 +
 .../WeldMatDataBase/TemperatureAndHumidity.aspx.cs |  8 ++++++--
 .../TemperatureAndHumidity.aspx.designer.cs        |  9 +++++++++
 .../PublishProfiles/FolderProfile.pubxml.user      | 14 +++++++-------
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx
index 73d33c1..2430916 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx
@@ -22,6 +22,7 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
                             <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:Label ID="Label1" runat="server" Text="-"></f:Label>
                                 <f:DatePicker ID="txtEndDate" runat="server" EmptyText="结束时间" Width="120px"></f:DatePicker>
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.cs
index 00a4c3f..e1e97e2 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.cs
@@ -23,7 +23,7 @@ namespace FineUIPro.Web.WeldMat.WeldMatDataBase
             if (!IsPostBack)
             {
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-
+                BLL.UnitStoreService.InitUnitStoreDropDownList(drpUnitStoreId, null, true);
                 // 绑定表格
                 BindGrid();
             }
@@ -44,7 +44,11 @@ namespace FineUIPro.Web.WeldMat.WeldMatDataBase
                               LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId=TemperatureAndHumidity.UnitStoreId
                               WHERE 1=1 ";
             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()))
             {
                 strSql += " AND TemperatureAndHumidity.RecordMan LIKE @RecordMan";
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.designer.cs
index d829df0..463b77c 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/WeldMatDataBase/TemperatureAndHumidity.aspx.designer.cs
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.WeldMat.WeldMatDataBase {
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
         
+        /// <summary>
+        /// drpUnitStoreId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitStoreId;
+        
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
diff --git a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 80f6370..6cdfcee 100644
--- a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -79,13 +79,13 @@
       <publishTime>09/10/2013 16:29:20</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>09/01/2025 17:47:50</publishTime>
+      <publishTime>09/16/2025 14:44:43</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>07/28/2025 20:15:00</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>09/01/2025 17:47:50</publishTime>
+      <publishTime>09/16/2025 14:44:43</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/17/2020 21:32:28</publishTime>
@@ -115,10 +115,10 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>09/01/2025 17:47:50</publishTime>
+      <publishTime>09/16/2025 14:44:43</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>09/01/2025 17:47:50</publishTime>
+      <publishTime>09/16/2025 14:44:43</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>03/17/2021 20:03:36</publishTime>
@@ -319,10 +319,10 @@
       <publishTime>02/01/2018 12:20:56</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>09/01/2025 17:47:51</publishTime>
+      <publishTime>09/16/2025 14:44:44</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>09/01/2025 17:47:51</publishTime>
+      <publishTime>09/16/2025 14:44:44</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 13:57:34</publishTime>
@@ -448,7 +448,7 @@
       <publishTime>07/03/2024 11:01:07</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>09/01/2025 17:48:01</publishTime>
+      <publishTime>09/16/2025 14:44:50</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file