From 5339020eae4f4ed4938302a902087a0693743898 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 22 五月 2024 11:28:00 +0800
Subject: [PATCH] 器具模块功能完善（器具档案、器具分类、器具保养项目，器具保养规程、器具保养计划、器具保养记录 器具维修项目、器具故障登记、器具维修记录单、器具维修验收单 器具寿命调整单、器具寿命耗用单 产品器具清单）
---
WebAPI/Controllers/XSGL/Kf_SellOutEntryReportController.cs | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutEntryReportController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutEntryReportController.cs
index fa22447..a13da08 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutEntryReportController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutEntryReportController.cs
@@ -37,15 +37,16 @@
try
{
List<object> columnNameList = new List<object>();
+ List<DataTable> tableList = new List<DataTable>();
////鏌ョ湅鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Kf_SellOutEntryReport_Query", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Kf_SellOutEntryReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鏌ヨ
@@ -60,6 +61,9 @@
ds = oCN.RunProcReturn(sql, "h_p_Kf_SellOutEntryReport");
}
+ tableList.Add(ds.Tables[0]);
+ tableList.Add(ds.Tables[1]);
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -71,7 +75,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = tableList;
objJsonResult.list = columnNameList;
return objJsonResult;
}
--
Gitblit v1.9.1