From d39e6a7dcb32ab0d8dd4e087106cfd8f6307823b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 06 三月 2024 15:35:31 +0800
Subject: [PATCH] 设备档案列表 增加 左边树形 器具分类，点击分类，根据分类来过滤，方便选择 设备档案分类 的基础资料 完善禁用 反禁用按钮
---
WebAPI/Controllers/WebAPIController.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 3cb072b..abc503b 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -8951,11 +8951,11 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("Select HInterID,HEquipFileNumber,HName from Gy_EquipFileBillMain where 0=0 Order by HInterID ", "Gy_EquipFileBillMain");
+ ds = oCN.RunProcReturn("Select HInterID,HEquipFileNumber,HName,HModel2 from Gy_EquipFileBillMain where 0=0 Order by HInterID ", "Gy_EquipFileBillMain");
}
else
{
- string sql1 = "Select HInterID,HEquipFileNumber,HName from Gy_EquipFileBillMain where 0=0 ";
+ string sql1 = "Select HInterID,HEquipFileNumber,HName,HModel2 from Gy_EquipFileBillMain where 0=0 ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "Gy_EquipFileBillMain");
}
@@ -9984,7 +9984,7 @@
/// <returns></returns>
[Route("Web/GetItemByEquipFile")]
[HttpGet]
- public object GetItemByEquipFile(int EquipProjectID,string Type)
+ public object GetItemByEquipFile(int EquipProjectID,string Type,string HDate)
{
if (EquipProjectID <= 0)
{
@@ -10014,7 +10014,8 @@
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql = string.Format(@"select * from " + HView + " where HInterID = " + EquipProjectID);
+ //string sql = string.Format(@"select * from " + HView + " where HInterID = " + EquipProjectID);
+ string sql = string.Format(@"Exec h_p_Sb_GetCheckItem_PDA '" + EquipProjectID + "','" + Type + "','" + HDate + "'");
ds = oCN.RunProcReturn(sql, HView);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
--
Gitblit v1.9.1