From 0e10409fd2badcc71ed5a001565f230422373c31 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期二, 10 九月 2024 10:02:15 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/ListModels.cs | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index 0513f13..3511795 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 { @@ -1407,6 +1408,18 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsSb_EquipRepairSignBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipRepairSignBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊璁惧缁翠慨绛惧埌鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSb_EquipRepairSignBillMain> getObjectByJson_Sb_EquipRepairSignBill_PDA(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSb_EquipRepairSignBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipRepairSignBillMain>>(jsonString); return list; } @@ -3851,6 +3864,32 @@ } #endregion + + #region 瀹㈡埛椤圭洰淇℃伅 + /// <summary> + /// 瀹㈡埛椤圭洰淇℃伅涓昏〃json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsPM_CustomerProInfoBillMain> getObjectByJson_ClsPM_CustomerProInfoBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsPM_CustomerProInfoBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_CustomerProInfoBillMain>>(jsonString); + return list; + } + /// <summary> + /// 瀹㈡埛椤圭洰淇℃伅瀛愯〃json2 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsPM_CustomerProInfoBillSub> getObjectByJson_ClsPM_CustomerProInfoBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsPM_CustomerProInfoBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_CustomerProInfoBillSub>>(jsonString); + return list; + } + #endregion + #region 搴旀敹鍗� /// <summary> /// 搴旀敹鍗曚富琛╦son @@ -4374,5 +4413,9 @@ return list; } + public static implicit operator ListModels(DataTable v) + { + throw new NotImplementedException(); + } } } \ No newline at end of file -- Gitblit v1.9.1