From 07c3408a0a2295917c0d0a34b319ea8e83801047 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 01 十二月 2022 15:47:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/PublicPageMethodController.cs |  273 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 216 insertions(+), 57 deletions(-)

diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index dc37059..80c23d0 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -29,12 +29,12 @@
         {
             try
             {
-                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from h_v_IF_Customer "+ sWhere + " Order by HItemID ", "h_v_IF_Customer");
+                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from h_v_IF_Customer " + sWhere + " Order by HItemID ", "h_v_IF_Customer");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                    objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -103,12 +103,12 @@
             SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
             //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
 
-            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from h_v_IF_Customer " + sWhere+"", "h_v_IF_Customer");
+            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from h_v_IF_Customer " + sWhere + "", "h_v_IF_Customer");
             if (ds == null || ds.Tables[0].Rows.Count == 0)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -134,13 +134,13 @@
         {
             try
             {
-               
-                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from h_v_IF_Emp "+sWhere+" Order by HItemID ", "h_v_IF_Emp");
+
+                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from h_v_IF_Emp " + sWhere + " Order by HItemID ", "h_v_IF_Emp");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                    objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -209,12 +209,12 @@
             SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
             //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
 
-            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from h_v_IF_Emp " + sWhere+"", "h_v_IF_Emp");
+            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from h_v_IF_Emp " + sWhere + "", "h_v_IF_Emp");
             if (ds == null || ds.Tables[0].Rows.Count == 0)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -240,12 +240,12 @@
         {
             try
             {
-                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from h_v_IF_Warehouse "+sWhere+" Order by HItemID ", "h_v_IF_Warehouse");
+                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from h_v_IF_Warehouse " + sWhere + " Order by HItemID ", "h_v_IF_Warehouse");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                    objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -314,12 +314,12 @@
             SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
             //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
 
-            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from h_v_IF_Warehouse "+sWhere+"", "h_v_IF_Warehouse");
+            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from h_v_IF_Warehouse " + sWhere + "", "h_v_IF_Warehouse");
             if (ds == null || ds.Tables[0].Rows.Count == 0)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -345,12 +345,12 @@
         {
             try
             {
-                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_StockPlace "+sWhere+" Order by HItemID ", "Gy_StockPlace");
+                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_StockPlace " + sWhere + " Order by HItemID ", "Gy_StockPlace");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                    objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -419,12 +419,12 @@
             SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
             //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
 
-            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_StockPlace "+sWhere+"", "Gy_StockPlace");
+            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_StockPlace " + sWhere + "", "Gy_StockPlace");
             if (ds == null || ds.Tables[0].Rows.Count == 0)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -450,12 +450,12 @@
         {
             try
             {
-                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from h_v_IF_Department "+sWhere+" Order by HItemID ", "h_v_IF_Department");
+                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from h_v_IF_Department " + sWhere + " Order by HItemID ", "h_v_IF_Department");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                    objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -524,12 +524,12 @@
             SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
             //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
 
-            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from h_v_IF_Department "+sWhere+"", "h_v_IF_Department");
+            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from h_v_IF_Department " + sWhere + "", "h_v_IF_Department");
             if (ds == null || ds.Tables[0].Rows.Count == 0)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -770,7 +770,7 @@
             {
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName,HModel from h_v_Gy_Mould Order by HNumber", "h_v_Gy_Mould");
+                    ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName,HModel,HDesignLife,HUseLife,HLeaveLife from h_v_Gy_Mould Order by HNumber", "h_v_Gy_Mould");
                 }
                 else
                 {
@@ -1110,7 +1110,7 @@
         {
             try
             {
-                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_Supplier "+sWhere+" Order by HItemID", "Gy_Supplier");
+                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_Supplier " + sWhere + " Order by HItemID", "Gy_Supplier");
                 //if (ds == null || ds.Tables[0].Rows.Count == 0)
                 //{
                 //    objJsonResult.code = "0";
@@ -1121,11 +1121,11 @@
                 //}
                 //else
                 //{
-                    objJsonResult.code = "1";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "Sucess锛�";
-                    objJsonResult.data = ds.Tables[0];
-                    return objJsonResult;
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                return objJsonResult;
                 //}
             }
             catch (Exception e)
@@ -1184,7 +1184,7 @@
             SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
             //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
 
-            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_Supplier "+sWhere+"", "Gy_Supplier");
+            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_Supplier " + sWhere + "", "Gy_Supplier");
             if (ds == null || ds.Tables[0].Rows.Count == 0)
             {
                 objJsonResult.code = "0";
@@ -1453,6 +1453,47 @@
                     string sql = sql1 + sWhere;
                     ds = oCN.RunProcReturn(sql, "HEquipFileNumber");
                 }
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "false锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "Sucess锛�";
+                    objJsonResult.data = ds.Tables[0];
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+
+
+        #region 鍑哄簱鐢宠鍗曟煡璇㈠垪琛�
+        [Route("OtherOutRequestBillList/CX")]
+        [HttpGet]
+        public object CX(string sWhere)
+        {
+            try
+            {
+                
+                    string sql1 = "Select * from Kf_StockOutRequestBillMain where 1 = 1 ";
+                    string sql = sql1 + sWhere;
+                    ds = oCN.RunProcReturn(sql, "Kf_StockOutRequestBillMain");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
@@ -1899,23 +1940,41 @@
         {
             try
             {
-                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName,HModel from h_v_IF_Material "+sWhere+" Order by HItemID", "h_v_IF_Material");
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "false锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    objJsonResult.code = "1";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "Sucess锛�";
-                    objJsonResult.data = ds.Tables[0];
-                    return objJsonResult;
-                }
+                ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName,HModel from h_v_IF_Material " + sWhere + " Order by HItemID", "h_v_IF_Material");
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                return objJsonResult;
+
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鑾峰彇鍏ㄩ儴鐗╂枡淇℃伅
+        [Route("PublicPageMethod/MaterialList")]
+        [HttpGet]
+        public object MaterialList(string sWhere)
+        {
+            try
+            {
+                ds = oCN.RunProcReturn("select * from h_v_KF_ICInventoryList_IF" + sWhere , "h_v_KF_ICInventoryList_IF");
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                return objJsonResult;
+
             }
             catch (Exception e)
             {
@@ -1973,7 +2032,7 @@
             SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
             //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
 
-            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from h_v_IF_Material "+sWhere+"", "h_v_IF_Material");
+            ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from h_v_IF_Material " + sWhere + "", "h_v_IF_Material");
             if (ds == null || ds.Tables[0].Rows.Count == 0)
             {
                 objJsonResult.code = "0";
@@ -2237,7 +2296,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                    objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -2311,7 +2370,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -2342,7 +2401,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                    objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -2447,7 +2506,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+                    objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -3360,7 +3419,7 @@
         #region 鏉′欢鏌ヨ鏉冮檺鍒楄〃
         [Route("PublicPageMethod/PowerList")]
         [HttpGet]
-        public object PowerList(string czybm,string sGnbm)
+        public object PowerList(string czybm, string sGnbm)
         {
             try
             {
@@ -3371,11 +3430,12 @@
                     {
                         sName = "";
                     }
-                    else {
+                    else
+                    {
                         sName = sGnbm;
                     }
                 }
-                
+
                 ds = oCN.RunProcReturn("select * from  Gy_Czygl where czybm='" + czybm + "'", "Gy_Czygl");
                 string AuthorityID = ClsPub.isStrNull(ds.Tables[0].Rows[0]["AuthorityID"]);
                 ds = oCN.RunProcReturn("SELECT id hid,case when id<=" + AuthorityID.Length + " then case when SUBSTRING('" + AuthorityID + "',id,1)=1 then 1 else 0 end else 0 end AuthorityID,'' AuthorityHID, gnms ,gnbm hgnbm FROM  xt_xtgnb where useflag=1 and sjgnbm='" + sName + "'  and rightflag=1  order by gnbm", "xt_xtgnb");
@@ -3512,7 +3572,7 @@
                             }
                         }
                     }
-                    oDs = null; 
+                    oDs = null;
                 }
                 oCN.RunProc("UPDATE  Gy_Czygl SET AuthorityID='" + Auth_str + "' WHERE czybm='" + msg4.Trim() + "'");
                 objJsonResult.code = "1";
@@ -3525,16 +3585,115 @@
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
                 objJsonResult.Message = e.Message;
-                objJsonResult.data =null;
+                objJsonResult.data = null;
             }
             return objJsonResult;
         }
 
 
-       
+
         #endregion
 
         #endregion
 
+
+        #region 鐢ㄦ埛绌挎妗嗘煡璇㈠垪琛�
+        [Route("PublicPageMethod/PeopleTransFerList")]
+        [HttpGet]
+        public object PeopleTransFerList()
+        {
+            try
+            {
+
+                ds = oCN.RunProcReturn("Select czybm value,czymc title from h_v_Gy_UserList Order by czybm ", "h_v_Gy_UserList");
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犵敤鎴锋暟鎹紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "Sucess锛�";
+                    objJsonResult.data = ds.Tables[0];
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鑾峰彇鏍哥畻鏂瑰紡鍒楄〃
+        /// <summary>
+        /// 鑾峰彇鏍哥畻鏂瑰紡鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        [Route("PublicPageMethod/GetClassTimePrjList_Json")]
+        [HttpGet]
+        public object GetClassTimePrjList_Json(string Gy_ClassTimePrj)
+        {
+            string sWhere = "";
+            //sWhere = " Where HStopFlag=0  and HEndFlag=1";
+            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+            if (Gy_ClassTimePrj != "")
+            {
+                sWhere = sWhere + " and ( HNumber like '%" + Gy_ClassTimePrj + "%' or HName like '%" + Gy_ClassTimePrj + "%' ) ";
+            }
+            try
+            {
+                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");
+                }
+                else
+                {
+                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_ClassTimePrjGroup where HStopflag=0  ";
+                    string sql = sql1 + sWhere;
+                    ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
+                }
+
+                //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鑾峰彇鎴愬姛";
+                    objJsonResult.data = ds.Tables[0];
+                    return objJsonResult;
+                }
+            }
+            catch (Exception ex)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
     }
 }

--
Gitblit v1.9.1