From e3f807e115e30686760288714973a1c4d2cfd3e1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 13 四月 2022 20:53:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/其他基础资料/Gy_ProcPriceList.cs | 6 +++---
1 files changed, 3 insertions(+), 3 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_ProcPriceList.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_ProcPriceList.cs"
index 87dbb29..3f5fa25 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_ProcPriceList.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_ProcPriceList.cs"
@@ -280,11 +280,11 @@
{
if (wl.Checked == false)
{
- sSql = "Select top 10000 * from " + ViewName + " where 宸ュ簭浠ｇ爜 like '" + HParentID.ToString() + "%' order by " + ModName + "浠ｇ爜";
+ sSql = "Select top 10000 * from " + ViewName + " where 宸ュ簭浠ｇ爜 like '%" + HParentID.ToString() + "%' order by " + ModName + "浠ｇ爜";
}
else
{
- sSql = "Select top 10000 * from " + ViewName + " where 鐗╂枡浠ｇ爜 like '" + HParentID.ToString() + "%' order by " + ModName + "浠ｇ爜";
+ sSql = "Select top 10000 * from " + ViewName + " where 鐗╂枡浠ｇ爜 like '%" + HParentID.ToString() + "%' order by " + ModName + "浠ｇ爜";
}
}
@@ -345,7 +345,7 @@
try
{
sNode.Nodes.Clear();
- DataSet Ds = oCn.RunProcReturn("select hitemid,hnumber,hname from " + sBill + " where HStopflag=0 and HParentID=" + sNode.Name.Trim().Substring(1, sNode.Name.Trim().Length-1) + " order by HNumber ", sBill);
+ DataSet Ds = oCn.RunProcReturn("select hitemid,hnumber,hname from " + sBill + " where isnull(HStopflag,'')='' and HParentID=" + sNode.Name.Trim().Substring(1, sNode.Name.Trim().Length-1) + " order by HNumber ", sBill);
for (int i = 0; i < Ds.Tables[0].Rows.Count; i++)
{
TreeNode oNode = sNode.Nodes.Add("T" + Ds.Tables[0].Rows[i]["HItemID"].ToString(), Ds.Tables[0].Rows[i]["HNumber"].ToString() + spChar + Ds.Tables[0].Rows[i]["HName"].ToString(), 0, 1);
--
Gitblit v1.9.1