From 02a1b9d8ab3cfb893beb27bfeb6c11c3dcf4a5a4 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 28 十二月 2023 17:49:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index 69b8419..b33599b 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1914,29 +1914,29 @@
}
else
{
- //string sql = "select * from Gy_UserCustomerRelation where HUserID = '" + CurUserID + "'";
- //ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
- //if (ds == null || ds.Tables[0].Rows.Count == 0)
- //{
- // sWhere = " and 1 = 0";
- //}
- //else
- //{
- // sWhere = " and HCusID in (";
- // for(var i = 0; i < ds.Tables[0].Rows.Count; i++)
- // {
- // if (i < ds.Tables[0].Rows.Count - 1)
- // {
- // sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ",";
- // }
- // else
- // {
- // sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ")";
- // }
- // }
- //}
+ string sql = "select * from Gy_UserCustomerRelation where HUserID = '" + CurUserID + "'";
+ ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ sWhere = " and 1 = 0";
+ }
+ else
+ {
+ sWhere = " and HCusID in (";
+ for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ if (i < ds.Tables[0].Rows.Count - 1)
+ {
+ sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ",";
+ }
+ else
+ {
+ sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ")";
+ }
+ }
+ }
- sWhere = " and 1=1 ";
+ //sWhere = " and 1=1 ";
}
objJsonResult.code = "1";
@@ -2065,6 +2065,7 @@
List<object> columnNameList1 = new List<object>();
List<object> columnNameList2 = new List<object>();
List<object> columnNameList3 = new List<object>();
+ List<object> columnNameList4 = new List<object>();
string sql = "exec h_p_Xs_SeOrderBill_lookdown " + HInterID;
ds = oCN.RunProcReturn(sql, "h_p_Xs_SeOrderBill_lookdown");
@@ -2101,10 +2102,19 @@
columnNameList3.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
+ //娣诲姞 宸ュ簭娴佽浆鍗� 鍒楀悕
+ foreach (DataColumn col in ds.Tables[4].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList4.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
columnNameListSum.Add(columnNameList0);
columnNameListSum.Add(columnNameList1);
columnNameListSum.Add(columnNameList2);
columnNameListSum.Add(columnNameList3);
+ columnNameListSum.Add(columnNameList4);
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1