From c7964cefb465dfa8e33d96eae2de331e1e9772a2 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 19 十月 2022 10:55:34 +0800
Subject: [PATCH] 动态列

---
 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs |  400 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 349 insertions(+), 51 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 6091287..dab03e3 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Pub_Class;
 using System;
 using System.Collections;
@@ -115,6 +116,7 @@
                 double HPriceRate = list[0].HPriceRate;//绯绘暟
                 double HWorkTimes = list[0].HWorkTimes;//宸ユ椂
                 long HQCCheckID = list[0].HQCCheckID;//妫�楠屽憳ID
+                long HPRDOrgID = list[0].HPRDOrgID;//缁勭粐ID
                 //鍗曟嵁瀹屾暣鎬у垽鏂�
                 if (HProcExchInterID <= 0)
                 {
@@ -156,14 +158,14 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                if (HGroupID == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鐢熶骇鐝粍娌℃湁閫夋嫨锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
+                //if (HGroupID == 0)
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鐢熶骇鐝粍娌℃湁閫夋嫨锛�";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
 
                 if (HProcID == 0)
                 {
@@ -181,22 +183,22 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                if (HQCCheckID == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "妫�楠屽憳娌℃湁閫夋嫨锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                if (HSourceID == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
+                //if (HQCCheckID == 0)
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "妫�楠屽憳娌℃湁閫夋嫨锛�";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+                //if (HSourceID == 0)
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
                 if (HCenterID == 0)
                 {
                     objJsonResult.code = "0";
@@ -213,14 +215,14 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                if (HWorkTimes <= 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "宸ユ椂蹇呴』澶т簬0锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
+                //if (HWorkTimes <= 0)
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "宸ユ椂蹇呴』澶т簬0锛�";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
                 //if (HEmpID2 == 0 )
                 //{
                 //    objJsonResult.code = "0";
@@ -274,7 +276,7 @@
                     ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
                     ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
                     ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
-                    ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID" +
+                    ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
                     ") " +
                     " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
                     "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
@@ -283,7 +285,7 @@
                     "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSourceID2 + "," + HSourceID3 + "," + HSourceID4 + "," + HSourceID5 +
                     "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
                     "," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
-                    "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID +
+                    "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
                     ") ");
                 }
                 else if ("Modify".Equals(eventType))
@@ -400,6 +402,289 @@
             }
         }
 
+
+
+
+
+
+
+        /// <summary>
+        /// 鏂板鍗曟嵁-鎵归噺鍑虹珯鍗曚繚瀛樻寜閽�
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Cj_StationOutBill/AddBill_Mul")]
+        [HttpPost]
+        public object AddBill_Mul([FromBody] JObject oMain)
+        {
+           
+
+            string UserName = "";
+            
+
+            try
+            {
+                var _value = oMain["oMain"].ToString();
+                string msg1 = _value.ToString();
+
+                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+                string msg2 = sArray[0].ToString();
+                string msg3 = sArray[1].ToString();
+                string msg4 = sArray[2].ToString();
+
+                List<Model.ClsSc_StationOutBillMain> list = new List<Model.ClsSc_StationOutBillMain>();
+                
+                msg1 = msg1.Replace("\\", "");
+                msg1 = msg1.Replace("\n", "");  //\n
+                ListModels oListModels = new ListModels();
+                list = oListModels.getObjectByJson_Sc_StationOutBillMain(msg2);
+                int i = 0;
+                int j = 0;
+                foreach (Model.ClsSc_StationOutBillMain oItemSub in list)
+                {
+                    DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
+                    j++;
+                    oBill.omodel.HInterID = list[i].HInterID;
+                    oBill.omodel.HBillNo = msg3 + "- " + j;
+                    oBill.omodel.HBillStatus = 0;
+                    oBill.omodel.HMouldNum = list[i].HMouldNum;
+                    oBill.omodel.HYear = 2022;
+                    oBill.omodel.HPeriod = 1;
+                    oBill.omodel.HRemark = list[i].HRemark;
+                    oBill.omodel.HSourceName = list[i].HSourceName;
+                    oBill.omodel.HPieceQty = list[i].HPieceQty;
+                    oBill.omodel.HWasterQty = list[i].HWasterQty;
+                    oBill.omodel.HPlanPieceQty = list[i].HPlanPieceQty;
+                    oBill.omodel.HBadPNL = list[i].HBadPNL;
+                    oBill.omodel.HICMOInterID = list[i].HICMOInterID;
+                    oBill.omodel.HICMOBillNo = list[i].HICMOBillNo;
+                    oBill.omodel.HProcExchInterID = list[i].HProcExchInterID;
+                    oBill.omodel.HProcExchEntryID = list[i].HProcExchEntryID;
+                    oBill.omodel.HProcExchBillNo = list[i].HProcExchBillNo;
+                    oBill.omodel.HMaterID = list[i].HMaterID;
+                    oBill.omodel.HProcID = list[i].HProcID;
+                    oBill.omodel.HICMOQty = list[i].HICMOQty;
+                    oBill.omodel.HPlanQty = list[i].HPlanQty;
+                    oBill.omodel.HStationOutTime = list[i].HStationOutTime;
+                    oBill.omodel.HSourceID = list[i].HSourceID;
+                    oBill.omodel.HPayProcID = list[i].HPayProcID;
+                    oBill.omodel.HGroupID = list[i].HGroupID;
+                    oBill.omodel.HDeptID = list[i].HDeptID;
+                    oBill.omodel.HEmpID = list[i].HEmpID;
+                    oBill.omodel.HBarCode = list[i].HBarCode;
+                    oBill.omodel.HAddr = list[i].HAddr;
+                    //oBill.omodel.HBarCodeMaker = list[i].HBarCodeMaker;
+                    oBill.omodel.HBarCodeMaker = msg4;
+                    oBill.omodel.HSourceID2 = list[i].HSourceID2;
+                    oBill.omodel.HSourceID3 = list[i].HSourceID3;
+                    oBill.omodel.HSourceID4 = list[i].HSourceID4;
+                    oBill.omodel.HSourceID5 = list[i].HSourceID5;
+                    oBill.omodel.HSupID = list[i].HSupID;
+                    oBill.omodel.HQty = list[i].HQty;
+                    oBill.omodel.HPrice = list[i].HPrice;
+                    oBill.omodel.HMoney = list[i].HMoney;
+                    oBill.omodel.HBadCount = list[i].HBadCount;
+                    oBill.omodel.HCenterID = list[i].HCenterID;
+                    oBill.omodel.HProcNo = list[i].HProcNo;
+                    oBill.omodel.HOrderProcNO = list[i].HOrderProcNO;
+                    oBill.omodel.HSourceNameList = list[i].HSourceNameList;
+                    oBill.omodel.HMainSourceInterID = list[i].HMainSourceInterID;
+                    oBill.omodel.HMainSourceBillNo = list[i].HMainSourceBillNo;
+                    oBill.omodel.HMainSourceBillType = list[i].HMainSourceBillType;
+                    oBill.omodel.HLastSubProc = true;
+                    oBill.omodel.HEmpID2 = list[i].HEmpID2;
+                    oBill.omodel.HEmpID3 = list[i].HEmpID3;
+                    oBill.omodel.HEmpID4 = list[i].HEmpID4;
+                    oBill.omodel.HEmpID5 = list[i].HEmpID5;
+                    oBill.omodel.HDSQty = list[i].HDSQty;
+                    oBill.omodel.HChongQty = list[i].HChongQty;
+                    oBill.omodel.HPriceRate = list[i].HPriceRate;
+                    oBill.omodel.HWorkTimes = list[i].HWorkTimes;
+                    oBill.omodel.HQCCheckID = list[i].HQCCheckID;
+                    oBill.omodel.HMaker = msg4;
+
+                    //string HBillSubType = "3791";
+                    //long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+                    //string HBillNo = msg3 + "- " + i;//閫掑叆type寰楀埌鐨勫崟鎹彿
+                    //int HBillStatus = 0;
+                    //string HMaker = list[0].HMaker;//鍒跺崟浜�
+                    //string HMouldNum = list[0].HMouldNum;//妯$┐鍙�
+                    //int HYear = 2021;
+                    //double HPeriod = 1;
+                    //string HRemark = list[0].HRemark;//澶囨敞
+                    //string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
+                    //double HPieceQty = list[0].HPieceQty;//杩涚珯PCS鏁�
+                    //double HWasterQty = list[0].HWasterQty;//鎶ュ簾鏁伴噺
+                    //double HPlanPieceQty = list[0].HPlanPieceQty;//杩涚珯PNL鏁�
+                    //double HBadPNL = list[0].HBadPNL;//鎶ュ簾PNL鏁�
+                    //long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+                    //string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+                    //int HProcPlanInterID = 0;
+                    //int HProcPlanEntryID = 0;
+                    //string HProcPlanBillNo = "";
+                    //long HProcExchInterID = list[0].HProcExchInterID;
+                    //long HProcExchEntryID = list[0].HProcExchEntryID;
+                    //string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
+                    //long HMaterID = list[0].HMaterID;//浜у搧ID
+                    //long HProcID = list[0].HProcID;//褰撳墠宸ュ簭ID
+                    //double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
+                    //double HPlanQty = list[0].HPlanQty;//绉讳氦PNL鏁�
+                    //DateTime HStationOutTime = list[0].HStationOutTime;//姹囨姤鏃堕棿
+                    //long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID
+                    //long HPayProcID = list[0].HPayProcID;//鏍哥畻宸ュ簭ID
+                    //long HGroupID = list[0].HGroupID;//鐝粍ID
+                    //long HDeptID = 0;
+                    //long HEmpID = list[0].HEmpID;//鎿嶄綔鍛業D
+                    //string HBarCode = list[0].HBarCode;//鏉″舰鐮�
+                    //string HAddr = "";
+                    //string HBarCodeMaker = "";
+                    //long HSourceID2 = list[0].HSourceID2;//鐢熶骇璧勬簮2ID
+                    //long HSourceID3 = list[0].HSourceID3;//鐢熶骇璧勬簮3ID
+                    //long HSourceID4 = list[0].HSourceID4;//鐢熶骇璧勬簮4ID
+                    //long HSourceID5 = list[0].HSourceID5;//鐢熶骇璧勬簮5ID
+                    //long HSupID = 0;
+                    //double HQty = list[0].HQty;//鍚堟牸鏁伴噺
+                    //double HPrice = 0;
+                    //double HMoney = 0;
+                    //double HBadCount = list[0].HBadCount;//涓嶈壇鏁伴噺
+                    //long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
+                    //long HProcNo = list[0].HProcNo;//娴佹按鍙�
+                    //string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+                    //string HSourceNameList = list[0].HSourceNameList;//璁惧娓呭崟
+                    //long HMainSourceInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+                    //string HMainSourceBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+                    //string HMainSourceBillType = "3790";
+                    //bool HLastSubProc = list[0].HLastSubProc;//杞笅宸ュ簭
+                    //long HEmpID2 = list[0].HEmpID2;//鎿嶄綔鍛�2ID
+                    //long HEmpID3 = list[0].HEmpID3;//鎿嶄綔鍛�3ID
+                    //long HEmpID4 = list[0].HEmpID4;//鎿嶄綔鍛�4ID
+                    //long HEmpID5 = list[0].HEmpID5;//鎿嶄綔鍛�5ID
+                    //double HDSQty = list[0].HDSQty;//鎶樺集鍒�鏁�
+                    //double HChongQty = list[0].HChongQty;//NCT鍐叉鏁�
+                    //double HPriceRate = list[0].HPriceRate;//绯绘暟
+                    //double HWorkTimes = list[0].HWorkTimes;//宸ユ椂
+                    //long HQCCheckID = list[0].HQCCheckID;//妫�楠屽憳ID
+
+                    //淇濆瓨
+                    //淇濆瓨瀹屾瘯鍚庡鐞�
+                    bool bResult;
+                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+                    i++;
+                    //if (bResult)
+                    //{
+                    //    objJsonResult.code = "0";
+                    //    objJsonResult.count = 1;
+                    //    objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+                    //    //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+                    //    objJsonResult.data = 1;
+                    //    return objJsonResult;
+                    //}
+                    //else
+                    //{
+                    //    objJsonResult.code = "0";
+                    //    objJsonResult.count = 0;
+                    //    objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+                    //    objJsonResult.data = 1;
+                    //    return objJsonResult;
+                    //}
+                }
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+                objJsonResult.data = 1;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+                objJsonResult.data = 1;
+                return objJsonResult;
+            }
+        }
+
+        //閫掑叆鐗╂枡淇℃伅 杩斿洖鏈畬鍏ㄦ眹鎶ョ殑娴佽浆鍗�
+        [Route("LEMS/Sc_StationOutBill_Mul_RYQ")]
+        [HttpGet]
+        public object Sc_StationOutBill_Mul_RYQ(String HMaterName, Int64 HOrgID)
+        {
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                DataSet ds = oCN.RunProcReturn("exec h_p_CJGXPLHB_Query '" + HMaterName + "'," + HOrgID + "", "h_p_CJGXPLHB_Query");
+               
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+                }
+                else
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                    objJsonResult.data = ds.Tables[0];
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        //閫変腑缃戞牸閲岄潰鐨勬煇涓�琛屾祦杞崱  杩斿洖璇ユ祦杞崱鐨勮繘鍑虹珯鎯呭喌
+        [Route("LEMS/Mul_RYQ_DisPlayBillList")]
+        [HttpGet]
+        public object Mul_RYQ_DisPlayBillList(String HBillNo,String HProcName)
+        {
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                DataSet ds = oCN.RunProcReturn("exec h_P_Mul_RYQ_DisPlayBillList '" + HBillNo + "','" + HProcName + "'", "h_P_Mul_RYQ_DisPlayBillList");
+
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+                }
+                else
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                    objJsonResult.data = ds.Tables[0];
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+
+
         private bool AllowbillNo(string HBillNo)
         {
             ds = oCN.RunProcReturn("select HBillNo from Sc_StationOutBillMain where  HBillNo = '" + HBillNo + "'", "Sc_StationOutBillMain");
@@ -418,6 +703,7 @@
         {
             try
             {
+                List<object> columnNameList = new List<object>();
                 //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
                 if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
                 {
@@ -430,30 +716,40 @@
 
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList " + sWhere + " order by 鍑虹珯鏃堕棿 desc", "h_v_MES_StationOutBillList");
+                    ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList  order by hmainid desc", "h_v_MES_StationOutBillList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_MES_StationOutBillList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere+ "  order by hmainid desc";
                     ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
                 }
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
                 {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "false锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
                 }
-                else
-                {
-                    objJsonResult.code = "1";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "Sucess锛�";
-                    objJsonResult.data = ds.Tables[0];
-                    return objJsonResult;
-                }
+
+                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+                //{
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.list = columnNameList;
+                objJsonResult.data = ds.Tables[0];
+                return objJsonResult;
+                //}
+                //else
+                //{
+                //objJsonResult.code = "0";
+                //objJsonResult.count = 0;
+                //objJsonResult.Message = "鏃犳暟鎹�";
+                //objJsonResult.data = null;
+                //return objJsonResult;
+                //}
             }
             catch (Exception e)
             {
@@ -1148,5 +1444,7 @@
         }
         #endregion
 
+
+        
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1