器具主档：增加制造厂商字段HMadeSupID，计算 保养/校正日期

duhe

2023-09-01 1739eb7838984e9a55fbbb5d4705f55908749375

 WebAPI/Controllers/BaseSet/Gy_TechnologyParUnitController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -30,6 +31,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_TechnologyParameterUnit", 1, false, user))
                {
@@ -39,21 +41,30 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql1 = string.Format(@"select * from h_v_Gy_TechnologyParameterUnit where 1 = 1");//where 组织名称='" + Organization + "'
                string sql1 = string.Format(@"select * from h_v_Gy_TechnologyParameterUnitList where 1 = 1");//where 组织名称='" + Organization + "'
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "h_v_Gy_TechnologyParameterUnit");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "h_v_Gy_TechnologyParameterUnitList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by HItemID";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_TechnologyParameterUnit");
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_TechnologyParameterUnitList");
                }

                //添加列名
                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列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)