From 165e90b5b1a6ac057cf0ace591f8fd66244742d7 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 27 十月 2022 15:10:24 +0800
Subject: [PATCH] 动态列（物料、仓库、工位、职员、部门、辅助属性、组织、计量单位、货币、月度设置、客户、供应商、订单等级、订单反馈状态、工艺参数、工艺参数单位、工艺参数对应表、包装方式、故障类别）
---
WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs | 93 ++++++++++++++++++++++++++++------------------
1 files changed, 56 insertions(+), 37 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs b/WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs
index d5cd288..27d9d0f 100644
--- a/WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs
+++ b/WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -26,10 +27,20 @@
/// </summary>
[Route("Pay_PeriodInfoSet/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user)
{
try
{
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Pay_PeriodInfoSetList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_Pay_PeriodInfoSetList " + sWhere, "h_v_Pay_PeriodInfoSetList");
@@ -40,22 +51,32 @@
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_Pay_PeriodInfoSetList");
}
- 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.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)
{
@@ -187,7 +208,7 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
- //string msg3 = sArray[1].ToString();
+ string msg3 = sArray[1].ToString();
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
//鍙嶅簭鍒楀寲
@@ -204,15 +225,15 @@
bool HStopflag = list[0].HStopflag;
string HUseFlag = list[0].HUseFlag;
- ////鍒ゆ柇鏉冮檺
- //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("Pay_PeriodInfoSet_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//if (!DBUtility.ClsPub.AllowNumber(HNumber))
//{
@@ -285,22 +306,20 @@
/// <returns></returns>
[Route("DeltetPay_PeriodInfoSet")]
[HttpGet]
- public object DeltetPay_PeriodInfoSet(string HItemID)
+ public object DeltetPay_PeriodInfoSet(string HItemID,string user)
{
DataSet ds;
- DataSet ds1;
- //string ModRightNameCheck = "Sc_ProcessReport_check";
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("Pay_PeriodInfoSet_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