From 54c10168f9082762cb3ff02cde879a6c2d73f9b5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 07 十二月 2022 16:33:05 +0800
Subject: [PATCH] 收料通知单子表插入语句去除 HGIVEAWAY 字段

---
 WebAPI/Controllers/BaseSet/Gy_SourceController.cs |   47 +++++++++++++++++++++++++++++------------------
 1 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
index 4146847..28dfdea 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Pub_Class;
 using System;
 using System.Collections;
@@ -32,15 +33,16 @@
         {
             try
             {
+                List<object> columnNameList = new List<object>();
                 //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
-                if (!DBUtility.ClsPub.Security_Log("Gy_Source_Query", 1, false, user))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
+                //if (!DBUtility.ClsPub.Security_Log("Gy_Source_Query", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
 
                 if (sWhere == null || sWhere.Equals(""))
                 {
@@ -53,12 +55,21 @@
                     ds = oCN.RunProcReturn(sql, "h_v_IF_SourceList");
                 }
 
+                //娣诲姞鍒楀悕
+                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鍒楀璞$殑鍒楀悕
+                }
+
                 //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
@@ -96,15 +107,15 @@
             string msg1 = sArray[0].ToString();
             string msg2 = sArray[1].ToString();
 
-            //鏌ョ湅鏉冮檺
-            if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, msg2))
-            {
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
+            ////鏌ョ湅鏉冮檺
+            //if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, msg2))
+            //{
+            //    objJsonResult.code = "0";
+            //    objJsonResult.count = 0;
+            //    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+            //    objJsonResult.data = null;
+            //    return objJsonResult;
+            //}
 
             Int64 HItemID = 0;
             SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

--
Gitblit v1.9.1