From 16f1fe483c481641f6a8a8ae81461ae15d91e54e Mon Sep 17 00:00:00 2001 From: 沈泽 <211959439@qq.com> Date: 星期五, 05 十一月 2021 16:54:13 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/ListModels.cs | 93 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 91 insertions(+), 2 deletions(-) diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index 4c93580..e9c88df 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -1315,7 +1315,7 @@ /// <summary> - /// 澶勭悊鏂板鐐规璁板綍琛ㄥ崟琛ㄧ殑json + /// 澶勭悊鏂板妯″叿鐐规璁板綍琛ㄥ崟琛ㄧ殑json /// </summary> /// <param name="jsonString"></param> /// <returns></returns> @@ -1328,7 +1328,20 @@ /// <summary> - /// 澶勭悊鏂板鐐规璁板綍鍗曞瓙琛ㄧ殑json + /// 澶勭悊鏂板璁惧鐐规璁板綍琛ㄥ崟琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSb_EquipDotCheckBillMain> getObjectByJson_Gy_EquipCheckBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSb_EquipDotCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板妯″叿鐐规璁板綍鍗曞瓙琛ㄧ殑json /// </summary> /// <param name="jsonString"></param> /// <returns></returns> @@ -1336,6 +1349,45 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Models.ClsSc_MouldDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldDotCheckBillSub>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板璁惧缁翠慨璁板綍琛ㄥ崟琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSb_EquipRepairWorkBillMain> wxmain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSb_EquipRepairWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipRepairWorkBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板妯″叿缁翠慨褰曞崟瀛愯〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSb_EquipRepairWorkBillSub> wxsub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSb_EquipRepairWorkBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipRepairWorkBillSub>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板璁惧鐐规璁板綍鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSb_EquipDotCheckBillSub> getObjectByJson_Gy_EquipDotCheckBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSb_EquipDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckBillSub>>(jsonString); return list; } @@ -1549,5 +1601,42 @@ List<Model.ClsSc_MaterToSourceBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MaterToSourceBillSub>>(jsonString); return list; } + + /// <summary> + /// 鐢ㄦ埛淇℃伅琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.Gy_User> getObjectByJson_Gy_Gy_User(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.Gy_User> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Gy_User>>(jsonString); + return list; + } + + /// <summary> + /// 鐢ㄦ埛渚涘簲鍟嗗叧绯讳俊鎭〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.Gy_UserSupper> getObjectByJson_Gy_UserSupper(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.Gy_UserSupper> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Gy_UserSupper>>(jsonString); + return list; + } + + /// <summary> + /// 鍏憡鍒楄〃涓昏〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsOA_InformBillMain> getObjectByJson_GG_NoticeBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsOA_InformBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsOA_InformBillMain>>(jsonString); + return list; + } + } } \ No newline at end of file -- Gitblit v1.9.1