From 42c5ed8edc862ebc80c117ed9a26e00f6f3e844d Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 17 十二月 2024 08:24:11 +0800
Subject: [PATCH] 基础资料单据（产品工艺参数、设备启动点检清单、产品防错验证清单）增加 导入按钮
---
WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
index a4f68bd..95d5d5b 100644
--- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
@@ -31,30 +31,31 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_View where 1=1 ", "h_v_IF_DataDictionary_View");
+ ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_View where 1=1 order by HItemID desc", "h_v_IF_DataDictionary_View");
}
else
{
string sql1 = "select * from h_v_IF_DataDictionary_View where 1=1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_View");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
--
Gitblit v1.9.1