From d586211dd69b25e73593576b1a36616a2ae294b7 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 10 三月 2025 19:15:52 +0800 Subject: [PATCH] 仓库列表 增加 仓库类型字段 班次 ,,点检项目,维修项目,维修验收项目,设备档案,器具主档维护,检验项目分类,检验项目,检验值,检验仪器,异常反馈类型,工艺路线大类,维修验收项目分类,维修项目分类,保养项目分类 审核 反审核 禁用 反禁用 删除前 删除后 控制 增加页签 增加字段 增加点检项目分类字段 保养项目 维修项目 维修验收项目 增加树形图 --- WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 56 insertions(+), 2 deletions(-) diff --git a/WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs index 1e3c9a8..5073cc8 100644 --- a/WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs +++ b/WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs @@ -33,7 +33,7 @@ List<object> columnNameList = new List<object>(); //鏌ョ湅鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipBeginBillMain_Check", 1, false, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipBeginBillMain_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -67,6 +67,59 @@ objJsonResult.Message = "Sucess锛�"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 璁惧寮�鏈哄崟鍒嗛〉鏌ヨ + [Route("Sb_EquipBeginBill/get锘縎b_EquipBeginBillListPage")] + [HttpGet] + public object Sb_EquipBeginBillListPage(string sWhere, string user, int page, int size) + { + try + { + List<object> columnNameList = new List<object>(); + //缂栬緫鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipBeginBillMain_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + sWhere = sWhere.Replace("'", "''"); + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("exec h_p_Sb_EquipBeginBillMainListPage " + page + "," + size + ",''", "h_p_Sb_EquipBeginBillMainListPage"); + } + else + { + ds = oCN.RunProcReturn("exec h_p_Sb_EquipBeginBillMainListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipBeginBillMainListPage"); + } + + //娣诲姞鍒楀悕 + 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 = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); + objJsonResult.Message = "Sucess锛�"; + objJsonResult.list = columnNameList; + objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) @@ -748,7 +801,7 @@ List<object> columnNameList = new List<object>(); //鏌ョ湅鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipBeginBillMain_Check", 1, false, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipBeginBillMain_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -795,5 +848,6 @@ } #endregion + } } \ No newline at end of file -- Gitblit v1.9.1