From b047a149650c16a6b0c0e412c0dfa08a064ff0f5 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 28 二月 2025 09:06:09 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BLL/Xt_XtgnbController.cs | 116 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 79 insertions(+), 37 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_XtgnbController.cs b/WebAPI/Controllers/BLL/Xt_XtgnbController.cs
index e789ccc..74ad14a 100644
--- a/WebAPI/Controllers/BLL/Xt_XtgnbController.cs
+++ b/WebAPI/Controllers/BLL/Xt_XtgnbController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -12,11 +13,9 @@
public class Xt_XtgnbController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
/// <summary>
/// 杩斿洖绯荤粺妯″潡鍒楄〃
@@ -29,32 +28,44 @@
{
try
{
+ List<object> columnNameList = new List<object>();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Xt_XtgnbList " + sWhere, "h_v_Xt_XtgnbList");
+ ds = oCN.RunProcReturn("select * from h_v_Xt_XtgnbList " + sWhere+ " order by hitemid desc", "h_v_Xt_XtgnbList");
}
else
{
string sql1 = "select * from h_v_Xt_XtgnbList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by hitemid desc";
ds = oCN.RunProcReturn(sql, "h_v_Xt_XtgnbList");
}
- 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 = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- 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.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
@@ -135,7 +146,6 @@
}
}
-
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -152,8 +162,6 @@
//鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
-
-
List<xtgnb> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<xtgnb>>(msg1);
long HItemID = list[0].id;
@@ -168,12 +176,6 @@
string useflag = list[0].useflag;
string netmenulist = list[0].netmenulist;
string buyFlag = list[0].buyflag;
-
-
-
-
-
-
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -205,19 +207,16 @@
return objJsonResult;
}
}
-
-
-
+
+ #region 鏀舵鍗� 鍒犻櫎
/// <summary>
- /// 绯荤粺鍔熻兘鍒楄〃鍒犻櫎鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
+ ///鍙傛暟锛歴tring HInterID銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Xt_Xtgnb/Delete_Json")]
+ [Route("YS_ReceiveBill/delete_Test")]
[HttpGet]
- public object Delete_Json(long HItemID)
+ public object deleteYS_ReceiveBill(long HItemID)
{
-
try
{
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
@@ -240,7 +239,50 @@
return objJsonResult;
}
}
+ #endregion
- //
+
+
+
+ /// <summary>
+ /// 鑾峰彇缂栬緫瀵硅薄鏁版嵁
+ /// </summary>
+ /// <param name="HItemID"></param>
+ /// <returns></returns>
+ [Route("Xt_Xtgnb/get_Bill")]
+ [HttpGet]
+ public object getBill(long HItemID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Xt_XtgnbList where Hitemid =" + HItemID, "h_v_Xt_XtgnbList");
+ 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;
+ }
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1