From ca964154bcc4a8a7a617320b3c9355e0c464ad39 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 15 十一月 2022 15:09:49 +0800
Subject: [PATCH] 奥邦（新增车间报表，超产报表）
---
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index b23a06c..a87be27 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -29,6 +30,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Gy_Department", 1, false, user))
{
@@ -41,20 +43,28 @@
string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_DepartmentList");
+ ds = oCN.RunProcReturn(sql1 + sWhere + "order by 閮ㄩ棬浠ｇ爜", "h_v_IF_DepartmentList");
}
else
{
- string sql = sql1 + sWhere + "order by HItemID desc";
+ string sql = sql1 + sWhere + "order by 閮ㄩ棬浠ｇ爜 ";
ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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)
{
@@ -375,9 +385,10 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
-
+
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Edit", 1, false, msg3))
{
@@ -388,6 +399,8 @@
return objJsonResult;
}
//鍙嶅簭鍒楀寲
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
msg2 = "[" + msg2.ToString() + "]";
List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2);
@@ -407,7 +420,7 @@
//string HCreator = list[0].HCreator;
long HCreateOrgID = list[0].HCreateOrgID;
//DateTime HCreateDate = list[0].HCreateDate;
- long HUseOrgID = list[0].HUseOrgID;
+ long HUseOrgID = long.Parse(msg4);
string HUpdater = list[0].HUpDater;
//DateTime HUpdateDate = list[0].HUpDateDate;
string HChecker = list[0].HChecker;
--
Gitblit v1.9.1