From 6fbf013c660aa0d8b44a28be57ed2bf6704ab816 Mon Sep 17 00:00:00 2001 From: wtt <1985833171@qq.com> Date: 星期四, 11 七月 2024 15:00:01 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/ListModels.cs | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 235 insertions(+), 0 deletions(-) diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index 89ba9ac..5d49cc9 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -1136,6 +1136,30 @@ } /// <summary> + /// 澶勭悊鏂板淇濆吇绾у埆琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_MaintainLev_Model> getObjectByJson_Gy_MaintainLev(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_MaintainLev_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaintainLev_Model>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板鍚姩妫�鏌ラ」鐩〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_CheckNoteItem_Model> getObjectByJson_Gy_CheckNoteItem(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_CheckNoteItem_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CheckNoteItem_Model>>(jsonString); + return list; + } + + /// <summary> /// 澶勭悊鏂板椤圭洰绫诲埆琛ㄧ殑json /// </summary> /// <param name="jsonString"></param> @@ -1274,6 +1298,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; } @@ -1417,6 +1465,29 @@ return list; } + /// <summary> + /// 澶勭悊鏂板璁惧鍋滄満鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSb_EquipStopBillMain> getObjectByJson_锘縎b_EquipStopBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSb_EquipStopBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipStopBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板璁惧寮�鏈哄崟涓昏〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSb_EquipBeginBillMain> getObjectByJson_锘縎b_EquipBeginBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSb_EquipBeginBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipBeginBillMain>>(jsonString); + return list; + } /// <summary> /// 澶勭悊鏂板椤圭洰鍚姩琛ㄧ殑json @@ -2758,6 +2829,108 @@ List<Model.ClsSc_MouldProdMoveBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdMoveBillSub>>(jsonString); return list; } + + + /// <summary> + /// 澶勭悊鏂板鍚姩鐐规涓昏〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_WorkBeginDotCheckBillMain> getObjectByJson_Sc_WorkBeginDotCheckBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_WorkBeginDotCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_WorkBeginDotCheckBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板鍚姩鐐规瀛愯〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_WorkBeginDotCheckBillSub> getObjectByJson_Sc_WorkBeginDotCheckBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_WorkBeginDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_WorkBeginDotCheckBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板璁惧鍚姩鐐规娓呭崟涓昏〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_WorkBeginDotCheckListBillMain> getObjectByJson_Gy_WorkBeginDotCheckListBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_WorkBeginDotCheckListBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_WorkBeginDotCheckListBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板璁惧鍚姩鐐规娓呭崟瀛愯〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_WorkBeginDotCheckListBillSub> getObjectByJson_Gy_WorkBeginDotCheckListBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_WorkBeginDotCheckListBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_WorkBeginDotCheckListBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板浜у搧闃查敊楠岃瘉娓呭崟涓昏〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_MaterPreventErrMouldBillMain> getObjectByJson_Gy_MaterPreventErrMouldBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_MaterPreventErrMouldBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaterPreventErrMouldBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板浜у搧鐘敊楠岃瘉娓呭崟瀛愯〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_MaterPreventErrMouldBillSub> getObjectByJson_Gy_MaterPreventErrMouldBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_MaterPreventErrMouldBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaterPreventErrMouldBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板闃查敊楠岃瘉妫�鏌ヤ富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsQc_PreventErrMouldCheckBillMain> getObjectByJson_Qc_PreventErrMouldCheckBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQc_PreventErrMouldCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQc_PreventErrMouldCheckBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板闃查敊楠岃瘉妫�鏌ュ瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsQc_PreventErrMouldCheckBillSub> getObjectByJson_Qc_PreventErrMouldCheckBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQc_PreventErrMouldCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQc_PreventErrMouldCheckBillSub>>(jsonString); + return list; + } + /// <summary> /// 澶勭悊鏂板鍣ㄥ叿鍒嗗竷寮忚皟鍏ュ崟涓昏〃鐨刯son /// </summary> @@ -3177,6 +3350,41 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsSc_MaterToSourceBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MaterToSourceBillMain>>(jsonString); + 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; } @@ -3999,6 +4207,33 @@ 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) + { + //jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_StockCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_StockCheckBillSub_ValueGrid>>(jsonString); + 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) + { + //jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_WorkSelfCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_WorkSelfCheckBillSub_ValueGrid>>(jsonString); + return list; + } ///宸ュ簭妫�楠屽崟 瀛欒〃 ///ClsQC_ProcessCheckBillSub_ValueGrid -- Gitblit v1.9.1