From 8f8ba462401435a8291e314914eadc20940921bd Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 09 一月 2025 10:39:22 +0800
Subject: [PATCH] 条码自动生成_PLC:生产订单源单查询功能无法进行过滤  问题解决

---
 PayM/bin/x86/Debug/SQLHelper.dll   |    0 
 PayM/bin/x86/Debug/Model.pdb       |    0 
 PayM/bin/x86/Debug/BLL.dll         |    0 
 PayM/bin/x86/Debug/DAL.dll         |    0 
 PayM/bin/x86/Debug/DBUtility.pdb   |    0 
 PayM/bin/x86/Debug/Pub_Control.pdb |    0 
 PayM/bin/x86/Debug/BLL.pdb         |    0 
 PayM/bin/x86/Debug/DAL.pdb         |    0 
 PayM/bin/x86/Debug/Pub_Class.pdb   |    0 
 PayM/obj/x86/Debug/PayM.pdb        |    0 
 PayM/bin/x86/Debug/PayM.dll        |    0 
 PayM/bin/x86/Debug/Pub_Control.dll |    0 
 PayM/bin/x86/Debug/PayM.pdb        |    0 
 PayM/obj/x86/Debug/PayM.dll        |    0 
 PayM/bin/x86/Debug/DBUtility.dll   |    0 
 DAL/公用/frmHlpBillList1.cs          |   10 ++++++----
 PayM/bin/x86/Debug/Model.dll       |    0 
 PayM/bin/x86/Debug/Pub_Class.dll   |    0 
 PayM/bin/x86/Debug/SQLHelper.pdb   |    0 
 19 files changed, 6 insertions(+), 4 deletions(-)

diff --git "a/DAL/\345\205\254\347\224\250/frmHlpBillList1.cs" "b/DAL/\345\205\254\347\224\250/frmHlpBillList1.cs"
index 4324f71..5be6dba 100644
--- "a/DAL/\345\205\254\347\224\250/frmHlpBillList1.cs"
+++ "b/DAL/\345\205\254\347\224\250/frmHlpBillList1.cs"
@@ -48,10 +48,12 @@
             string sWhere = tSQL;  //特殊条件(日期限制,部门限制)
             DBUtility.Xt_BaseBillFun.Sub_SQLWhere(ref sWhere);
 
-            ////过滤条件
-            //if (frmCondition.SqlStr.Trim().Length == 0)
-            //    return;
-            frmCondition.SqlStr = "select * from " + ViewName + " where 1=1 ";
+            //过滤条件
+            if (frmCondition.SqlStr.Trim().Length == 0)
+            {
+                frmCondition.SqlStr = "select top(1000) * from " + ViewName + " where 1=1 ";
+            }
+
             sSql = frmCondition.SqlStr + sWhere ;
  
  
diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll
index a7967c4..3bce363 100644
--- a/PayM/bin/x86/Debug/BLL.dll
+++ b/PayM/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.pdb b/PayM/bin/x86/Debug/BLL.pdb
index a007d3d..443b4a4 100644
--- a/PayM/bin/x86/Debug/BLL.pdb
+++ b/PayM/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.dll b/PayM/bin/x86/Debug/DAL.dll
index 1fc39dc..74b032b 100644
--- a/PayM/bin/x86/Debug/DAL.dll
+++ b/PayM/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.pdb b/PayM/bin/x86/Debug/DAL.pdb
index 193160c..cbb97c6 100644
--- a/PayM/bin/x86/Debug/DAL.pdb
+++ b/PayM/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.dll b/PayM/bin/x86/Debug/DBUtility.dll
index 7ab9931..fd8aeba 100644
--- a/PayM/bin/x86/Debug/DBUtility.dll
+++ b/PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.pdb b/PayM/bin/x86/Debug/DBUtility.pdb
index c6868f6..7a75819 100644
--- a/PayM/bin/x86/Debug/DBUtility.pdb
+++ b/PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.dll b/PayM/bin/x86/Debug/Model.dll
index f63c2d1..ef97573 100644
--- a/PayM/bin/x86/Debug/Model.dll
+++ b/PayM/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.pdb b/PayM/bin/x86/Debug/Model.pdb
index 7b5f6ee..8d52961 100644
--- a/PayM/bin/x86/Debug/Model.pdb
+++ b/PayM/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.dll b/PayM/bin/x86/Debug/PayM.dll
index eafffb5..4fedc2b 100644
--- a/PayM/bin/x86/Debug/PayM.dll
+++ b/PayM/bin/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.pdb b/PayM/bin/x86/Debug/PayM.pdb
index 2906d3b..eccf76a 100644
--- a/PayM/bin/x86/Debug/PayM.pdb
+++ b/PayM/bin/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.dll b/PayM/bin/x86/Debug/Pub_Class.dll
index b39982e..11d0ca3 100644
--- a/PayM/bin/x86/Debug/Pub_Class.dll
+++ b/PayM/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.pdb b/PayM/bin/x86/Debug/Pub_Class.pdb
index d528c30..bb751ac 100644
--- a/PayM/bin/x86/Debug/Pub_Class.pdb
+++ b/PayM/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.dll b/PayM/bin/x86/Debug/Pub_Control.dll
index 2b83b3b..da89026 100644
--- a/PayM/bin/x86/Debug/Pub_Control.dll
+++ b/PayM/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.pdb b/PayM/bin/x86/Debug/Pub_Control.pdb
index 358572f..c63db4a 100644
--- a/PayM/bin/x86/Debug/Pub_Control.pdb
+++ b/PayM/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.dll b/PayM/bin/x86/Debug/SQLHelper.dll
index 6630eb8..ce0cd25 100644
--- a/PayM/bin/x86/Debug/SQLHelper.dll
+++ b/PayM/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.pdb b/PayM/bin/x86/Debug/SQLHelper.pdb
index 894aa66..c2b701a 100644
--- a/PayM/bin/x86/Debug/SQLHelper.pdb
+++ b/PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.dll b/PayM/obj/x86/Debug/PayM.dll
index eafffb5..4fedc2b 100644
--- a/PayM/obj/x86/Debug/PayM.dll
+++ b/PayM/obj/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.pdb b/PayM/obj/x86/Debug/PayM.pdb
index 2906d3b..eccf76a 100644
--- a/PayM/obj/x86/Debug/PayM.pdb
+++ b/PayM/obj/x86/Debug/PayM.pdb
Binary files differ

--
Gitblit v1.9.1