yangle
2023-08-30 75fa0fb23f1e1a51df578c758feb0f4c2a5b4810
WebAPI/Controllers/WebAPIController.cs
@@ -3410,7 +3410,7 @@
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.Message = "获取失败" + ",没有查询到数据";
                    objjson.data = null;
                    return objjson;
                }
@@ -3466,7 +3466,63 @@
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.Message = "获取失败" + ",没有查询到数据";
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "1";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    objjson.list = columnNameList;
                    return objjson;
                }
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        /// <summary>
        /// 获取检仪器列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetGy_InspectInstruMent")]
        [HttpGet]
        public object GetGy_InspectInstruMent(string InspectInstruMent, int OrganizationID)
        {
            if (InspectInstruMent != "")
            {
                sWhere = " and ( 检验仪器代码 like '%" + InspectInstruMent + "%' or 检验仪器名称 like '%" + InspectInstruMent + "%' ) ";
            }
            try
            {
                List<object> columnNameList = new List<object>();
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = "Select * from h_v_Gy_InspectInstruMent where 1 = 1 " + sWhere + "Order by HItemID ";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_InspectInstruMent");
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + ",没有查询到数据";
                    objjson.data = null;
                    return objjson;
                }