From 45334377dbbe7f6c0132f4b9c581b1a3fa133861 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 28 十月 2022 11:55:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 57 insertions(+), 22 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs b/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
index 814dedf..aff5b57 100644
--- a/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
@@ -1,4 +1,5 @@
using DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -27,36 +28,56 @@
/// </summary>
[Route("Gy_OrderLev/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("Gy_OrderLev", 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_Gy_OrderLevList " + sWhere, "h_v_Gy_OrderLevList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_OrderLevList " + sWhere+ " order by 璁㈠崟绛夌骇浠ｇ爜", "h_v_Gy_OrderLevList");
}
else
{
string sql1 = "select * from h_v_Gy_OrderLevList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by 璁㈠崟绛夌骇浠ｇ爜";
ds = oCN.RunProcReturn(sql, "h_v_Gy_OrderLevList");
}
- 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)
{
@@ -126,7 +147,7 @@
DAL.ClsGy_OrderLev_View oDeptHlp = new DAL.ClsGy_OrderLev_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -206,7 +227,11 @@
try
{
var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+
//鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
@@ -227,7 +252,17 @@
string HYX = list[0].HYX;
bool HStopflag = list[0].HStopflag;
bool HUseFlag = list[0].HUseFlag;
-
+
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_VipLevel_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
objJsonResult.code = "0";
@@ -310,11 +345,11 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1