From 8f19d764f9ce5eea37b25f5392507a0d8ed373f5 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 01 七月 2024 10:16:48 +0800
Subject: [PATCH] 销售订单：多级审批
---
WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs | 77 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
index a4a89bc..48220d8 100644
--- a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -19,7 +20,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
- #region 妫�楠岄」鐩垪琛ㄦ暟鎹�
+ #region 妫�楠岄」鐩垎绫诲垪琛ㄦ暟鎹�
/// <summary>
/// 杩斿洖妫�楠岄」鐩垪琛�
///鍙傛暟锛歴tring sql銆�
@@ -31,8 +32,9 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckClass_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -43,30 +45,41 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_QCCheckClassList " + sWhere, "h_v_IF_QCCheckClassList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_QCCheckClassList order by 浠ｇ爜", "h_v_IF_QCCheckClassList");
}
else
{
string sql1 = "select * from h_v_IF_QCCheckClassList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by 浠ｇ爜";
ds = oCN.RunProcReturn(sql, "h_v_IF_QCCheckClassList");
}
- 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)
{
@@ -136,6 +149,7 @@
DAL.ClsGy_QCCheckClass_View oDeptHlp = new DAL.ClsGy_QCCheckClass_View();
try
{
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
@@ -144,6 +158,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+
if (oDeptHlp.GetInfoByID(HItemID))
{
if (oDept.HavChildCodes(HItemID))
@@ -314,8 +329,18 @@
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 msg4 = sArray[2].ToString();//鐢ㄦ埛鍚�
+ string msg5 = sArray[3].ToString();//淇敼妯″潡鍚嶇О
+
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(msg5, 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
@@ -330,18 +355,6 @@
string HRemark = list[0].HRemark;
string HStopflag = list[0].HStopflag;
string HUseFlag = list[0].HUseFlag;
-
-
- //鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, false, msg4))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
--
Gitblit v1.9.1