From bd557a97e6affa3335e384fd7fbf83c4be1375bf Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 27 十二月 2023 14:37:55 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 95 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index c76078c..b33599b 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1856,11 +1856,11 @@
try
{
string sql = @"select
- c.HEmpID
+ ISNULL(c.HEmpID,0) HEmpID
,e.HName HEmpName
- ,c.HDeptID
+ ,ISNULL(c.HDeptID,0) HDeptID
,d.HName HDeptName
- ,d.HEmpID HManagerID
+ ,ISNULL(d.HEmpID,0) HManagerID
,e1.HName HManagerName
from Gy_Czygl as c
left join Gy_Employee as e on c.HEmpID = e.HItemID
@@ -1923,7 +1923,7 @@
else
{
sWhere = " and HCusID in (";
- for(var i = 0; i < ds.Tables[0].Rows.Count; i++)
+ for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
{
if (i < ds.Tables[0].Rows.Count - 1)
{
@@ -1935,6 +1935,8 @@
}
}
}
+
+ //sWhere = " and 1=1 ";
}
objJsonResult.code = "1";
@@ -2046,5 +2048,90 @@
}
}
#endregion
+
+ #region 閿�鍞鍗� 涓嬫煡
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <returns></returns>
+ [Route("Xs_SeOrderBill/SeOrderBill_LookDown")]
+ [HttpGet]
+ public object SeOrderBill_LookDown(int HInterID)
+ {
+ try
+ {
+ List<object> columnNameListSum = new List<object>();
+ List<object> columnNameList0 = new List<object>();
+ 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");
+
+ //娣诲姞 閿�鍞鍗曞彉鏇村崟 鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList0.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ //娣诲姞 鐢熶骇璁㈠崟 鍒楀悕
+ foreach (DataColumn col in ds.Tables[1].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ //娣诲姞 鐗规壒鐢宠鍗� 鍒楀悕
+ foreach (DataColumn col in ds.Tables[2].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList2.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ //娣诲姞 閿�鍞嚭搴撳崟 鍒楀悕
+ foreach (DataColumn col in ds.Tables[3].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ 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;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables;
+ objJsonResult.list = columnNameListSum;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1