From 086d903ace6d38a67e2dc69d35429cc9b1480563 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 03 十月 2024 14:30:29 +0800
Subject: [PATCH] 工序编辑新增计价类型字段;pda出站汇报单添加回车查询操作员方法

---
 WebAPI/Controllers/PublicPageMethodController.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index 80faac1..45881d2 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -3473,7 +3473,7 @@
             SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
             string sql = string.Format(@"select '鏉冮檺绠$悊-鐢ㄦ埛' id,'' HNumber,'鏉冮檺绠$悊--鐢ㄦ埛' title,'' ParentID
                                          union all
-                                         select gnbm id,gnsy HNumber,gnmc as title, case when sjgnbm='' then '鏉冮檺绠$悊--鐢ㄦ埛' else sjgnbm end  ParentID  from Xt_Xtgnb where sjgnbm=''
+                                         select gnbm id,gnsy HNumber,gnmc as title, case when sjgnbm='' then '鏉冮檺绠$悊--鐢ㄦ埛' else sjgnbm end  ParentID  from Xt_Xtgnb where sjgnbm=''  and useflag=1
                                          union all
                                          Select gnbm id,gnsy HNumber,gnmc as title,sjgnbm as ParentID
                                          from Xt_Xtgnb  where mjbz=0 and useflag=1 and rightflag=1 and sjgnbm in(
@@ -3672,13 +3672,13 @@
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_ClassTimePrjGroup where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrjGroup");
+                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_ClassTimePrj where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrj");
                 }
                 else
                 {
-                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_ClassTimePrjGroup where HStopflag=0  ";
+                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_ClassTimePrj where HStopflag=0  ";
                     string sql = sql1 + sWhere;
-                    ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
+                    ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrj");
                 }
 
                 //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);

--
Gitblit v1.9.1