From d2a9080bfd17f7cb4da51a7b7c5a29696cdf6e33 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Tue, 1 Apr 2025 09:29:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E5=B0=BE=E9=A1=B9=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx      |  1 +
 SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs   | 13 ++++++++-----
 .../Transfer/PunchlistFrom.aspx.designer.cs         |  9 +++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index d98c2928..17f1ea17 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -21,6 +21,7 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
+                                <f:TextBox runat="server" ID="txtNo" Label="No" LabelWidth="80px" LabelAlign="Right" Width="180px"></f:TextBox>
                                 <f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
                                 <%--<f:TextBox runat="server" ID="txtSub_Sys_No" Label="Turnover System Code" LabelWidth="180px" LabelAlign="Right"></f:TextBox>--%>
                                 <f:DropDownList ID="drpTurnoverSystemCode" runat="server" Label="Turnover System Code" AutoPostBack="true" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true"  LabelWidth="180px">
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index c48a28c2..f7a8015a 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -46,11 +46,9 @@ namespace FineUIPro.Web.Transfer
 
         public DataTable DataSql()
         {
-            string strSql = @"select * 
-                            ,(CASE isnull(IsEng,0) WHEN 1 THEN 'Y' ELSE 'N' END) IsEngStr
-                            ,IsMatI IsMatIStr
-                            from  Transfer_PunchlistFrom
-                              where ProjectId = @ProjectId";
+            string strSql = @"select * ,(CASE isnull(IsEng,0) WHEN 1 THEN 'Y' ELSE 'N' END) IsEngStr ,IsMatI IsMatIStr
+                            from Transfer_PunchlistFrom
+                            where ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
 
@@ -59,6 +57,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Raised_By = @Raised_By";
                 listStr.Add(new SqlParameter("@Raised_By", this.txtRaised_By.Text.Trim()));
             }
+            if (!string.IsNullOrEmpty(this.txtNo.Text.Trim()))
+            {
+                strSql += " AND Num_NO = @No";
+                listStr.Add(new SqlParameter("@No", this.txtNo.Text.Trim()));
+            }
             if (!string.IsNullOrEmpty(this.txtSystem_No.Text.Trim()))
             {
                 strSql += " AND System_No like @System_No";
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index c20c7832..692c5056 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -59,6 +59,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
 
+        /// <summary>
+        /// txtNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtNo;
+
         /// <summary>
         /// txtSystem_No 控件。
         /// </summary>