From abf59bc386d65013b4782eb0b3af463457dbe968 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 12 三月 2024 09:23:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/LMESController.cs | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 1824817..85f99bd 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -105,28 +105,8 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-
- //鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁鏌ョ湅鎵�鏈夊鎴锋潈闄�
- if (DBUtility.ClsPub.Security_Log_second("Gy_UserLookAllCus", 1, false, user))
- {
- ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillQuery");
- }
- else
- {
- //鑾峰彇鐢ㄦ埛缂栫爜
- string sql = "select * from Gy_Czygl where Czymc = '" + user + "'";
- ds = oCN.RunProcReturn(sql, "Gy_Czygl");
- string userID = ds.Tables[0].Rows[0]["Czybm"].ToString();
- string sql1 = " and HCusID in (select HCusID from Gy_UserCustomerRelation Where HUserID = '" + userID + "')";
- string sql2 = "select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere + sql1 + " order by hmainid desc ";
- ds = oCN.RunProcReturn(sql2, "h_v_Sc_ProcessExchangeBillQuery");
- }
-
-
-
-
-
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillQuery");
//娣诲姞鍒楀悕
@@ -1349,6 +1329,7 @@
List<object> columnNameList3 = new List<object>();
List<object> columnNameList4 = new List<object>();
List<object> columnNameList5 = new List<object>();
+ List<object> columnNameList6 = new List<object>();
string sql = "exec h_p_Sc_ICMOBillList_LookDown " + HInterID;
ds = oCN.RunProcReturn(sql, "h_p_Xs_SeOrderBill_lookdown");
@@ -1401,12 +1382,21 @@
columnNameList5.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
+ //娣诲姞 鐢熶骇璁㈠崟鍙樻洿鍗� 鍒楀悕
+ foreach (DataColumn col in ds.Tables[6].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList6.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
columnNameListSum.Add(columnNameList0);
columnNameListSum.Add(columnNameList1);
columnNameListSum.Add(columnNameList2);
columnNameListSum.Add(columnNameList3);
columnNameListSum.Add(columnNameList4);
columnNameListSum.Add(columnNameList5);
+ columnNameListSum.Add(columnNameList6);
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1