From 862c0d13dc63efbe73f379580d50a5d36e97a64e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 12 三月 2025 14:38:16 +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