From c8d2de403e86ebe8a6188f70f4bf684aa504173a Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 02 十二月 2024 16:26:39 +0800
Subject: [PATCH] 检验仪器增加附件上传
---
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index 21a4668..89c8342 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -3376,6 +3376,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鍒ゆ柇鏌ヨ鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
{
@@ -3395,9 +3396,18 @@
ds = oCN.RunProcReturn("exec h_p_Xs_SeOrderBillList_Query " + page + "," + size + ",'" + Organization + "','" + sWhere + "',2", "h_p_Xs_SeOrderBillList_Query");
}
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -3537,7 +3547,7 @@
}
string sql = "select * from h_v_Xs_SeOrderBillQuerySub where hmainid = " + hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_SeOrderBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Xs_SeOrderBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
--
Gitblit v1.9.1