From 6628d9bda9d34a7f611b951c931f7a465ee20c6d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 12 一月 2024 10:30:47 +0800
Subject: [PATCH] 用户关联用户查询 删除
---
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index 21886e5..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";
@@ -2062,6 +2064,8 @@
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");
@@ -2090,9 +2094,27 @@
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;
--
Gitblit v1.9.1