From 32a10c272b7cd543a7172a6ebc222e6f8c8b0334 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期四, 20 二月 2025 15:24:23 +0800 Subject: [PATCH] 森楷自动包装线同步金蝶入库申请单,如果没有审核,则在扫物料条码时自动审核;排产匹配产品器具清单,产线器具清单,器具占用时间存入数据库 --- WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 269 insertions(+), 21 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs index 57b9a60..4d893d2 100644 --- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs +++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs @@ -280,11 +280,11 @@ (HInterID,HENTRYID,HBillNo_bak,HEmpID,HBarCode,HBadReasonID,HAddr,HMaker,HMakeDate ,HMaterID,HUnitID,HRemark,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HReportType ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney -,HQty,HResult,HProcExchInterID,HProcExchEntryID,HProcExchBillNo) +,HQty,HResult,HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HProcID) values({HInterID},1,'{oSub.HBillNo_bak}',{oSub.HEmpID},'{oSub.HBarCode}',{oSub.HBadReasonID},'','{oSub.HMaker}','{oSub.HMakeDate}' ,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HICMOInterID},{oSub.HICMOEntryID},'{oSub.HICMOBillNo}',{oSub.HReportType} ,0,0,'','',0,0 -,0,'{HResult}',{oSub.HProcExchInterID},{oSub.HProcExchEntryID},'{oSub.HProcExchBillNo}')"); +,1,'{HResult}',{oSub.HProcExchInterID},{oSub.HProcExchEntryID},'{oSub.HProcExchBillNo}',{oSub.HProcID})"); //淇敼鏉$爜琛ㄧ殑鐘舵�� oCN.RunProc("update Gy_BarCodeBill set HStatus='"+ HResult + "' where HBarCode='"+ oSub.HBarCode + "'"); @@ -322,9 +322,23 @@ objJsonResult.data = null; return objJsonResult; } - + string HProcID = "0"; ds = oCN.RunProcReturn("select * from gy_czygl WITH(NOLOCK) where czymc='" + user + "'", "gy_czygl"); - string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString(); + if (ds.Tables[0].Rows.Count > 0) + { + HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString(); + } + + //鍒ゆ柇褰撳墠娴佽浆鍗℃槸鍚︽槸寮�宸� + ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp"); + if (ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗″彿:" + HBarCode + ",娴佽浆鍗℃湭寮�宸�!"; + objJsonResult.data = null; + return objJsonResult; + } ds = oCN.RunProcReturn(@"exec h_p_Gy_BarCodeBillBomList '" + HBarCode + "'," + HProcID, "h_p_Gy_BarCodeBillBomList"); if (ds.Tables[0].Rows.Count == 0) @@ -571,7 +585,7 @@ sMainStr = "[" + sMainStr + "]"; List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(sMainStr); - ds = oCN.RunProcReturn("select HCenterID from Sc_ProcessExchangeBillSub WITH(NOLOCK) where HInterID=" + list[0].HProcExchInterID + " and HEntryID=" + list[0].HProcExchEntryID, "Sc_ProcessExchangeBillSub"); + ds = oCN.RunProcReturn("select HCenterID from Sc_ProcessExchangeBillSub WITH(NOLOCK) where HInterID=" + list[0].HProcExchInterID + " and HEntryID=" + list[0].HProcExchEntryID, "Sc_ProcessExchangeBillSub"); if (ds.Tables[0].Rows.Count > 0) { list[0].HCenterID = long.Parse(ds.Tables[0].Rows[0]["HCenterID"].ToString()); @@ -645,7 +659,13 @@ double HmaterOutqty = 0;//鐧藉澂鍙戝竷 double HProcPriceRate = 0;//宸ヤ环绯绘暟 int HTemporaryAreaID = 0;//鏆傛斁鍖� + int HShiftsID = 0; + DataSet set = oCN.RunProcReturn("exec h_p_Gy_GetWorkShiftInfo " + HDeptID + "," + HCenterID, "h_p_Gy_GetWorkShiftInfo"); + if (set.Tables[0].Rows.Count > 0) + { + HShiftsID = int.Parse(set.Tables[0].Rows[0]["HInterID"].ToString()); + } ds = oCN.RunProcReturn("select * from Sc_StationOutBillMain a WITH(NOLOCK) left join Sc_StationOutBillSub_SN sn WITH(NOLOCK) on a.HInterID=sn.HInterID where a.HInterID=" + HInterID + " and HBillNo='" + HBillNo + "' and CONVERT(varchar(10),HDate,20) ='" + DateTime.Now.ToString("yyyy-MM-dd") + "' ", "Sc_StationOutBillMain"); if (ds.Tables[0].Rows.Count == 0) @@ -662,9 +682,9 @@ ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" + ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" + ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" + - ",HmaterOutqty,HProcPriceRate,HTemporaryAreaID" + + ",HmaterOutqty,HProcPriceRate,HTemporaryAreaID,HShiftsID" + ") " + - " values('" + BillType + "','"+ HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" + + " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" + "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL + "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID + ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + "," + HPayProcID + @@ -672,7 +692,7 @@ "," + 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 + "," + HPRDOrgID + - "," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + ") "); + "," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + "," + HShiftsID + ") "); } @@ -682,8 +702,26 @@ oCN.RunProc($@"insert into Sc_StationOutBillSub_SN(HInterID,HBillNo_bak,HEntryID,HBarCode,HBarCodeQty,HMakeTime,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney) values({HInterID}, '{HBillNo}', {(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)}, '{omodel.HBarCode_P}', 1, GETDATE(), '', " + HProcExchInterID + ","+ HProcExchEntryID + ", '"+ HProcExchBillNo + "', '', 0, 0)"); + //鎶婃潯鐮佸啓鍏ユ棩蹇楅噷闈� + LogService.CustomWriteLog("鏉$爜:" + omodel.HBarCode_P + ",宸ュ簭:"+ HProcID + ",鍑虹珯鏃堕棿:" + DateTime.Now, "TM" + DateTime.Now.ToString("yyyy-MM-dd")); + //鍙嶅啓宸ュ簭鍑虹珯鍗曠殑鍚堟牸鏁伴噺 oCN.RunProc("update Sc_StationOutBillMain set HQty+=1 where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID+ " and HInterID=" + HInterID); + + + ds = oCN.RunProcReturn($@"select (b.HQty -sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_ProcessExchangeBillSub b WITH(NOLOCK) +left join Sc_StationOutBillMain ou WITH(NOLOCK) on b.HInterID=ou.HProcExchInterID and b.HEntryID=ou.HProcExchEntryID +where b.HInterID={HProcExchInterID} and b.HEntryID={HProcExchEntryID} +group by b.HInterID,b.HEntryID,b.HQty", "Sc_ProcessExchangeBill_Out"); + + if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0) { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!"; + objJsonResult.data = null; + return objJsonResult; + } oCN.Commit(); @@ -714,16 +752,75 @@ try { ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "h_v_Gy_BarCodeBill"); + + //鍒ゆ柇鏉$爜鏄惁瀛樺湪鏉$爜妗f + if (ds.Tables[0].Rows.Count > 0) + { + string HSourceBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString(); + DataSet dataTable = oCN.RunProcReturn(@"select * from Sc_ProcessExchangeBillMain where HBillNo='" + HSourceBillNo + "'", "Sc_ProcessExchangeBillMain"); + //鍒ゆ柇鏉$爜鐨勬簮鍗� 娴佽浆鍗℃槸鍚﹁鍒犻櫎 + if (dataTable.Tables[0].Rows.Count == 0) + { + //濡傛灉婧愬崟宸茬粡鍒犻櫎 鍒欐潯鐮佷篃鍒犻櫎閲嶆柊鐢熸垚 + oCN.RunProc("delete from Gy_BarCodeBill where HBarCode='" + HBarCode + "'"); + + //閲嶆柊鏌ヨ鏉$爜妗f 杩涘叆鏂板鏂规硶 + ds = oCN.RunProcReturn(@"select * from Gy_BarCodeBill where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill"); + } + } + if (ds.Tables[0].Rows.Count == 0) { + //鍒ゆ柇闀垮害鏄惁涓�29浣� 鏃犲皹杞﹂棿 if (HBarCode.Length == 29) { - string str1 = HBarCode.Substring(23, 3); + string str1 = HBarCode.Substring(18, 8); DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠g爜,o.HNumber 缁勭粐浠g爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK) left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID -where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID="+ HOrgID, "Sc_ProcessExchangeBillMain"); +where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain"); + + if (dataSet.Tables[0].Rows.Count == 0) + { + str1 = HBarCode.Substring(23, 3); + + dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠g爜,o.HNumber 缁勭粐浠g爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK) +left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID +left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID +where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain"); + + if (dataSet.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + ClsPub.CurUserName = user; + //鏉$爜鐢熸垚 + return get_HBardBillSave(HProcExchBillNo, HBarCode); + } + } + else + { + ClsPub.CurUserName = user; + //鏉$爜鐢熸垚 + return get_HBardBillSave(HProcExchBillNo, HBarCode); + } + } + //鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿 + else if (HBarCode.Length == 50) + { + string str1 = HBarCode.Substring(42, 8); + + DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠g爜,o.HNumber 缁勭粐浠g爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK) +left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID +left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID +where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain"); if (dataSet.Tables[0].Rows.Count == 0) { @@ -733,7 +830,8 @@ objJsonResult.data = null; return objJsonResult; } - else { + else + { ClsPub.CurUserName = user; //鏉$爜鐢熸垚 return get_HBardBillSave(HProcExchBillNo, HBarCode); @@ -749,21 +847,53 @@ } } else { - - string str1 = HBarCode.Substring(23, 3); + //鍒ゆ柇闀垮害鏄惁涓�29浣� 鏃犲皹杞﹂棿 + if (HBarCode.Length == 29) + { + string str1 = HBarCode.Substring(18, 8); - DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠g爜,o.HNumber 缁勭粐浠g爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK) + DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠g爜,o.HNumber 缁勭粐浠g爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK) left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain"); - if (dataSet.Tables[0].Rows.Count == 0) + if (dataSet.Tables[0].Rows.Count == 0) + { + str1 = HBarCode.Substring(23, 3); + + dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠g爜,o.HNumber 缁勭粐浠g爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK) +left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID +left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID +where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain"); + + if (dataSet.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + //鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿 + else if (HBarCode.Length == 50) { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; - objJsonResult.data = null; - return objJsonResult; + string str1 = HBarCode.Substring(42, 8); + + DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠g爜,o.HNumber 缁勭粐浠g爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK) +left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID +left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID +where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain"); + + if (dataSet.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏉$爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!"; + objJsonResult.data = null; + return objJsonResult; + } } if (ds.Tables[0].Rows[0]["HStatus"].ToString() != "") @@ -900,7 +1030,7 @@ #region 宸ュ簭鍗曞搧杩囩珯 閰嶄欢鐮佹煡璇� [Route("Cj_SingleStation/HBardCodeAccessoryList")] [HttpGet] - public object HBardCodeAccessoryList(string HBarCode, string user) + public object HBardCodeAccessoryList(string HBarCode, string HProcExchBillNo, string user,string HBillType) { try { @@ -929,6 +1059,25 @@ objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "褰撳墠鏉$爜鐨勭姸鎬佷负:"+ ds.Tables[0].Rows[0]["HStatus"].ToString() + "锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + DataSet dataSet = oCN.RunProcReturn(@"exec h_p_CJ_SNBarCodeBillMouldBathSelect '" + HBarCode + "','" + HProcExchBillNo + "','"+ HBillType + "'", "h_p_CJ_SNBarCodeBillMouldBathSelect"); + + if (dataSet.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "閰嶄欢鏉$爜鍒ゆ柇澶辫触锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBack"]) == "2") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = DBUtility.ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBackRemark"]); objJsonResult.data = null; return objJsonResult; } @@ -1502,9 +1651,28 @@ // } oCN.RunProc("update Gy_BarCodeBill set HStatus='' where HBarCode='" + model.HBarCode + "'"); + + DataSet dataSet = oCN.RunProcReturn($"select top 1 HInterID from Sc_StationOutBillMain where HProcExchInterID={subLsit[0].HProcExchInterID} and HProcExchEntryID={subLsit[0].HProcExchEntryID} and HBadCount>0", "Sc_StationOutBillMain"); + + if (dataSet.Tables[0].Rows.Count > 0) + { + string HOutInterID = dataSet.Tables[0].Rows[0][0].ToString(); + + oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1 where HInterID='" + HOutInterID + "'"); + } + else + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触,褰撳墠娴佽浆鍗″綋鍓嶅伐搴忕殑鍑虹珯鍗曟病鏈変笉鑹暟閲�!"; + objJsonResult.data = null; + return objJsonResult; + } } } else { + oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "淇濆瓨澶辫触,鏃犵粨鏋滐紒"; @@ -2010,5 +2178,85 @@ } #endregion + #region 宸ュ簭鍗曞搧杩囩珯 鍗曞搧杩囩珯鏌ヨ + [Route("Cj_SingleStation/SingleItemTransitList")] + [HttpGet] + public object SingleItemTransitList(string HProcExchBillNo, string user) + { + try + { + + List<object> columnNameList = new List<object>(); + + string sql = @"exec h_p_SingleItemTransitList '" + HProcExchBillNo + "'"; + ds = oCN.RunProcReturn(sql, "h_p_SingleItemTransitList"); + + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 宸ュ簭鍗曞搧杩囩珯 鍗曞搧杩囩珯鏌ヨ 鏌ヨ鍏蜂綋鏉$爜 + [Route("Cj_SingleStation/SingleItemTransit_SN_List")] + [HttpGet] + public object SingleItemTransit_SN_List(string sWhere, string TableName) + { + try + { + + List<object> columnNameList = new List<object>(); + + string sql = @"exec h_p_SingleItemTransit_SN_List '" + sWhere + "','"+ TableName + "'"; + ds = oCN.RunProcReturn(sql, "h_p_SingleItemTransit_SN_List"); + + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + } } \ No newline at end of file -- Gitblit v1.9.1