From 8658c02633f9746781d2e6f5da9998eef8c0e0a7 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 28 十月 2022 16:31:52 +0800
Subject: [PATCH] 动态列（点检项目、维修项目、维修检验项目、保养项目、产品与器具清单及维护、工作中心、工序、生产资源、生产班组、不良原因、故障原因、检验项目、检验项目分类、工序工价及维护、系统上机日志查询、系统参数查询、系统模块信息查询、系统单据类型、会计期间、公告信息维护）
---
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 87 ++++++++++++++++++++++++-------------------
1 files changed, 48 insertions(+), 39 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index 0805984..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,36 +26,45 @@
/// </summary>
[Route("Gy_Warehouse/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user,string Organization)
{
try
{
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_WareHouseList " + sWhere, "h_v_IF_WareHouseList");
- }
- else
- {
- string sql1 = "select * from h_v_IF_WareHouseList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ 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 = "false锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
+ string sql1 = string.Format(@"select * from h_v_IF_WareHouseList where 缁勭粐鍚嶇О='" + Organization + "'");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql1 + sWhere + " order by 浠撳簱浠ｇ爜 ", "h_v_IF_WareHouseList");
+ }
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql = sql1 + sWhere + " order by 浠撳簱浠ｇ爜 ";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
}
+
+ //娣诲姞鍒楀悕
+ 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)
{
@@ -280,9 +290,8 @@
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();
- //string msg5 = sArray[3].ToString();
+ string msg3 = sArray[1].ToString();
+
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(msg2);
@@ -305,14 +314,14 @@
string HUpDater = list[0].HUpDater;
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, 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))
//{
@@ -395,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, true, 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