From 7fb870f53ccf134a4f3baef58ff98917d8c712bb Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期四, 18 七月 2024 11:31:54 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/ListModels.cs | 96 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 2 deletions(-) diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index f791426..0430f33 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -1122,7 +1122,7 @@ List<Model.ClsGy_ProjectMoney_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectMoney_Model>>(jsonString); return list; } - + /// <summary> /// 澶勭悊鏂板闃查敊瑁呯疆琛ㄧ殑json /// </summary> @@ -1134,6 +1134,30 @@ List<Model.ClsGy_PreventErrMould_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PreventErrMould_Model>>(jsonString); return list; } + /// <summary> + /// 澶勭悊鏂板浼戞伅鏃ヨ〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_RestDay_Model> getObjectByJson_Gy_RestDay(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_RestDay_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_RestDay_Model>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板浼戞伅鏃ヨ〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_RestDay_Model> getObjectByJson_SumGy_RestDay(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_RestDay_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_RestDay_Model>>(jsonString); + return list; + } + /// <summary> /// 澶勭悊鏂板淇濆吇绾у埆琛ㄧ殑json @@ -1298,6 +1322,30 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsHR_PostSkillBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsHR_PostSkillBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊浜哄憳鎶�鑳借�冩牳璁板綍鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsHR_EmployeeSkillExamBillMain> getObjectByJson_HR_EmployeeSkillExamBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsHR_EmployeeSkillExamBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsHR_EmployeeSkillExamBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊浜哄憳鎶�鑳借�冩牳璁板綍鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsHR_EmployeeSkillExamBillSub> getObjectByJson_HR_EmployeeSkillExamBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsHR_EmployeeSkillExamBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsHR_EmployeeSkillExamBillSub>>(jsonString); return list; } @@ -3329,6 +3377,41 @@ return list; } + /// <summary> + /// 鎶ュ伐骞冲彴妫�楠屽彇鏍蜂富琛╦son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsQC_TakeSampleCheckBillMain> getObjectByJson_QC_TakeSampleCheckBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_TakeSampleCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_TakeSampleCheckBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 鎶ュ伐骞冲彴妫�楠岃繕鏍蜂富琛╦son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsQC_BackSampleCheckBillMain> getObjectByJson_QC_BackSampleCheckBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_BackSampleCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_BackSampleCheckBillMain>>(jsonString); + return list; + } + /// <summary> + /// 鎶ュ伐骞冲彴妫�楠岃繕鏍蜂富琛╦son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsQC_BackSampleCheckBillSub> getObjectByJson_QC_TakeSampleCheckBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_BackSampleCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_BackSampleCheckBillSub>>(jsonString); + return list; + } + /// <summary> /// 鎶ュ伐骞冲彴鏂板涓婃枡闃查敊鍗曞瓙琛�(閰嶆枡)鐨刯son @@ -4148,7 +4231,7 @@ List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid>>(jsonString); return list; } - + ///搴撳瓨妫�楠屽崟 瀛欒〃 ///ClsQC_StockCheckBillSub_ValueGrid public List<Model.ClsQC_StockCheckBillSub_ValueGrid> getObjectByJson_ClsQC_StockCheckBillSub_ValueGrid(string jsonString) @@ -4158,6 +4241,15 @@ return list; } + ///宸℃鍗�2 瀛欒〃 + ///ClsQC_PatrolProcCheckOtherBillSub_ValueGrid + public List<Model.ClsQC_PatrolProcCheckOtherBillSub_ValueGrid> getObjectByJson_ClsQC_PatrolProcCheckOtherBillSub_ValueGrid(string jsonString) + { + //jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_PatrolProcCheckOtherBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_PatrolProcCheckOtherBillSub_ValueGrid>>(jsonString); + return list; + } + ///杞﹂棿鑷鍗� 瀛欒〃 ///ClsQC_WorkSelfCheckBillSub_ValueGrid public List<Model.ClsQC_WorkSelfCheckBillSub_ValueGrid> getObjectByJson_ClsQC_WorkSelfCheckBillSub_ValueGrid(string jsonString) -- Gitblit v1.9.1