From e3de172430f5fcce6b4253eade3056caab96ac29 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 28 十一月 2022 17:47:08 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 99 ++++++++++++++++++++++++-------------------------
1 files changed, 48 insertions(+), 51 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index 735c091..1436746 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -25,10 +26,20 @@
/// </summary>
[Route("Gy_Warehouse/list")]
[HttpGet]
- public object list(string sWhere,string Organization)
+ public object list(string sWhere,string user,string Organization)
{
try
{
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Warehouse", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
string sql1 = string.Format(@"select * from h_v_IF_WareHouseList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
@@ -39,22 +50,21 @@
string sql = sql1 + sWhere + " order by 浠撳簱浠ｇ爜 ";
ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
}
- //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;
- //}
+
+ //娣诲姞鍒楀悕
+ 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)
{
@@ -279,22 +289,9 @@
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();//淇濆瓨鏁版嵁
- string user = sArray[1].ToString();//鐢ㄦ埛鍚�
- //string msg4 = sArray[2].ToString();
- //string msg5 = sArray[3].ToString();
-
- ////鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
- //if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBill_Edit", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
-
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(msg2);
@@ -317,14 +314,14 @@
string HUpDater = list[0].HUpDater;
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!ClsPub.Security_Log("Gy_Warehouse_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//if (!DBUtility.ClsPub.AllowNumber(HNumber))
//{
@@ -407,21 +404,21 @@
/// <returns></returns>
[Route("DeltetGy_Warehouse")]
[HttpGet]
- public object DeltetGy_Warehouse(string HItemID)
+ public object DeltetGy_Warehouse(string HItemID,string user)
{
DataSet ds;
DataSet ds1;
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Gy_Warehouse_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (string.IsNullOrWhiteSpace(HItemID))
--
Gitblit v1.9.1