From df80023baf4e5eba2de7dcbe9dd1bdd3aeaa607e Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期二, 14 一月 2025 12:58:50 +0800 Subject: [PATCH] 设备档案 增加 字段; IP地址,MAC地址,联网方式,采集类型,采集方式 HMacAddress varchar(50) //数采MAC地址 HIPAddress varchar(50) //数采IP地址 HLinkNETMode varchar(50) //联网方式 HCollectMode varchar(50) //采集方式 HCollectClass varchar(50) //采集类型 --- WebAPI/ListModels.cs | 193 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 193 insertions(+), 0 deletions(-) diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index 9765133..201b0bd 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -7,6 +7,7 @@ using System.Text; using WebAPI.Code; using Model; +using System.Data; namespace WebAPI { @@ -836,6 +837,18 @@ } /// <summary> + /// 澶勭悊鏂板宸ュ簭娴佽浆鍗″瓙琛�2鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit> getObjectByJson_Sc_ProcessExchangeBillSub_BatchSplit(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit>>(jsonString); + return list; + } + + /// <summary> /// 澶勭悊鏂板鍑虹珯姹囨姤鍗曚富琛ㄧ殑json /// </summary> /// <param name="jsonString"></param> @@ -858,6 +871,19 @@ List<Model.ClsSc_MouldMaintainPlanBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainPlanBillSub>>(jsonString); return list; } + + /// <summary> + /// 澶勭悊鏂板妯″叿淇濆吇璁″垝鍗曞瓙琛╛璁″垝鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_MouldMaintainPlanBillSub_Plan> getObjectByJson_Sc_MouldMaintainPlanBillSub_Plan(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_MouldMaintainPlanBillSub_Plan> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainPlanBillSub_Plan>>(jsonString); + return list; + } + /// <summary> /// 澶勭悊鏂板妯″叿淇濆吇璁″垝鍗曞瓙琛ㄤ繚鍏讳俊鎭殑json @@ -1170,6 +1196,17 @@ return list; } + /// <summary> + /// 澶勭悊鏂板鐜妫�娴嬮」鐩〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_EnvironmentTestItem_Model> getObjectByJson_Gy_EnvironmentTestItem(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_EnvironmentTestItem_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_EnvironmentTestItem_Model>>(jsonString); + return list; + } /// <summary> /// 澶勭悊鏂板淇濆吇绾у埆琛ㄧ殑json @@ -2969,6 +3006,82 @@ } /// <summary> + /// 澶勭悊鏂板鐜妫�娴嬫柟妗堜富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.Cls锘縂y_EnvironmentTestSchemeBillMain> getObjectByJson_锘縂y_EnvironmentTestSchemeBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.Cls锘縂y_EnvironmentTestSchemeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Cls锘縂y_EnvironmentTestSchemeBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板鐜妫�娴嬫柟妗堝瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_EnvironmentTestSchemeBillSub> getObjectByJson_Gy_EnvironmentTestSchemeBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_EnvironmentTestSchemeBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_EnvironmentTestSchemeBillSub>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板鐜妫�娴嬪崟涓昏〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.Cls锘縌C_EnvironmentTestDotCheckBillMain> getObjectByJson_锘縌C_EnvironmentTestDotCheckBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.Cls锘縌C_EnvironmentTestDotCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Cls锘縌C_EnvironmentTestDotCheckBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板鐜妫�娴嬪崟瀛愯〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsQC_EnvironmentTestDotCheckBillSub> getObjectByJson_QC_EnvironmentTestDotCheckBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_EnvironmentTestDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_EnvironmentTestDotCheckBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板鐝寮�鐝崟涓昏〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.Cls锘縎c_ShiftsBeginInfoBillMain> getObjectByJson_锘縎c_ShiftsBeginInfoBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.Cls锘縎c_ShiftsBeginInfoBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Cls锘縎c_ShiftsBeginInfoBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板鐝寮�鐝崟瀛愯〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_ShiftsBeginInfoBillSub> getObjectByJson_Sc_ShiftsBeginInfoBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_ShiftsBeginInfoBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ShiftsBeginInfoBillSub>>(jsonString); + return list; + } + + /// <summary> /// 澶勭悊鏂板闃查敊楠岃瘉妫�鏌ヤ富琛ㄧ殑json /// </summary> /// <param name="jsonString"></param> @@ -3377,6 +3490,18 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Models.ClsSc_MESBeginWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 鎶ュ伐骞冲彴寮�宸ュ崟瀛愯〃json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSc_MESBeginWorkBillSub> getObjectByJson_Sc_MESBeginWorkBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSc_MESBeginWorkBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillSub>>(jsonString); return list; } @@ -3952,6 +4077,31 @@ } #endregion + #region 琛ㄥご鑷姩鍔犺浇 + /// <summary> + /// 琛ㄥご鑷姩鍔犺浇涓昏〃json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsXt_DefineBillMainSetMain> getObjectByJson_Xt_DefineBillMainSetMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsXt_DefineBillMainSetMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_DefineBillMainSetMain>>(jsonString); + return list; + } + /// <summary> + /// 琛ㄥご鑷姩鍔犺浇瀛愯〃json2 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsXt_DefineBillMainSetSub> getObjectByJson_Xt_DefineBillMainSetSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsXt_DefineBillMainSetSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_DefineBillMainSetSub>>(jsonString); + return list; + } + #endregion + #region 鐢熶骇璐ㄩ噺姹囨姤鍗� /// <summary> /// 鐢熶骇璐ㄩ噺姹囨姤鍗曚富琛╦son @@ -4122,6 +4272,21 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsXs_SellOutChangeBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_SellOutChangeBillSub>>(jsonString); + return list; + } + #endregion + + #region 鍑洪棬纭鍗昣鏂� + public List<Model.ClsXs_OutDoorBillMain> getObjectByJson_Xs_OutDoorBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsXs_OutDoorBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_OutDoorBillMain>>(jsonString); + return list; + } + public List<Model.ClsXs_OutDoorBillSub> getObjectByJson_Xs_OutDoorBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsXs_OutDoorBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_OutDoorBillSub>>(jsonString); return list; } #endregion @@ -4300,6 +4465,30 @@ return list; } + /// <summary> + /// 缁勮杩芥函-涓�2 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_AssemblyBillMain> getObjectByJson_Sc_AssemblyBillMain2(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_AssemblyBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_AssemblyBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 缁勮杩芥函-瀛�2 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_AssemblyBillSub> getObjectByJson_Sc_AssemblyBillSub2(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_AssemblyBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_AssemblyBillSub>>(jsonString); + return list; + } + ///棣栦欢妫�楠屽崟 瀛欒〃 ///ClsQC_FirstPieceCheckBillSub_ValueGrid public List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid> getObjectByJson_ClsQC_FirstPieceCheckBillSub_ValueGrid(string jsonString) @@ -4400,5 +4589,9 @@ return list; } + public static implicit operator ListModels(DataTable v) + { + throw new NotImplementedException(); + } } } \ No newline at end of file -- Gitblit v1.9.1