From 22eec752e72650a42c7208397fefdcb0e61a749d Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 19 四月 2022 10:34:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.cs |   37 +++++++++++++++----------------------
 1 files changed, 15 insertions(+), 22 deletions(-)

diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs"
index 5c8a9e7..3fbc841 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs"
@@ -266,28 +266,21 @@
                 HParentID = sr[0].ToString();
             }
             //杩囨护鏉′欢
-            if (frmCondition.SqlStr.Trim().Length == 0)
+            if (HParentID == "" || HParentID == "鐗╂枡璧勬枡" || HParentID == "宸ュ簭璧勬枡")
             {
-                if (HParentID == "" || HParentID == "鐗╂枡璧勬枡" || HParentID == "宸ュ簭璧勬枡")
-                {
-                    sSql = "Select top 10000 * from " + ViewName + " order by  HItemID Desc";
-                }
-                else
-                {
-                    if (wl.Checked == false)
-                    {
-                        sSql = "Select top 10000 * from " + ViewName + " where 宸ュ簭浠ｇ爜 like '%" + HParentID.ToString() + "%' order by HItemID Desc" ;
-                    }
-                    else
-                    {
-                        sSql = "Select top 10000 * from " + ViewName + " where 鐗╂枡浠ｇ爜 like '%" + HParentID.ToString() + "%' order by HItemID Desc ";
-                    }
-
-                }
+                sSql = "Select top 10000 * from " + ViewName + " order by  HItemID Desc";
             }
             else
             {
-                sSql = frmCondition.SqlStr + sWhere + " order by  HItemID Desc";
+                if (wl.Checked == false)
+                {
+                    sSql = "Select top 10000 * from " + ViewName + " where 宸ュ簭浠ｇ爜 like '%" + HParentID.ToString() + "%' order by HItemID Desc";
+                }
+                else
+                {
+                    sSql = "Select top 10000 * from " + ViewName + " where 鐗╂枡浠ｇ爜 like '%" + HParentID.ToString() + "%' order by HItemID Desc ";
+                }
+
             }
             //鎵цSQL
             DSet = SubCn.RunProcReturn(sSql, ViewName);
@@ -310,12 +303,12 @@
             oSumGrid.BuildTotalCols(sT);
             //  
             //鍐荤粨
-            int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
-            string s = frmCondition.cmbHComplete.Text;
-            DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
+            //int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+            //string s = frmCondition.cmbHComplete.Text;
+            //DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
             //鐢荤嚎
             //
-            Total();
+            //Total();
         }
 
         //鍚堣 new

--
Gitblit v1.9.1