From 5ec48dc417b2d99a8686f5833c575914b4bd5334 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 10 七月 2023 13:15:53 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/ListModels.cs | 199 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 198 insertions(+), 1 deletions(-) diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index c958e6c..c7536c8 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -40,6 +40,20 @@ List<Model.ClsSc_ICMOReportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOReportBillMain>>(jsonString); return list; } + + + + /// <summary> + /// 鏀舵枡閫氱煡鍗曞弽搴忓垪鍖� + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsCg_POInStockBillMain> getPOInStockBillMainByJson(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsCg_POInStockBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_POInStockBillMain>>(jsonString); + return list; + } /// <summary> /// 澶栬喘鍏ュ簱(绾㈠瓧)鍙嶅簭鍒楀寲 /// </summary> @@ -945,6 +959,18 @@ } /// <summary> + /// 澶勭悊鏂板鏉$爜鎷嗙爜鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_BarCodeEdit_Model> getObjectByJson_Gy_SplitBarCode(string jsonString) + { + //jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_BarCodeEdit_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_BarCodeEdit_Model>>(jsonString); + return list; + } + + /// <summary> /// 澶勭悊搴撳瓨鐘舵�佽〃鐨刯son /// </summary> /// <param name="jsonString"></param> @@ -1089,6 +1115,30 @@ } /// <summary> + /// 澶勭悊鍣ㄥ叿鐘舵�佽〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_MouldStatus_Model> getObjectByJson_Gy_MouldStatus(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_MouldStatus_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MouldStatus_Model>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊璁惧鐘舵�佽〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_EquipStatus_Model> getObjectByJson_Gy_EquipStatus(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_EquipStatus_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_EquipStatus_Model>>(jsonString); + return list; + } + + /// <summary> /// 澶勭悊鍗曟嵁绫诲瀷琛ㄧ殑json /// </summary> /// <param name="jsonString"></param> @@ -1099,7 +1149,19 @@ List<Model.ClsXt_BillType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_BillType_Model>>(jsonString); return list; } - + + /// <summary> + /// 澶勭悊鍗曟嵁瀛愮被鍨嬭〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsXt_BillSubType_Model> getObjectByJson_Xt_BillSubType(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsXt_BillSubType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_BillSubType_Model>>(jsonString); + return list; + } + /// <summary> /// 澶勭悊鏀舵鏉′欢琛ㄧ殑json /// </summary> @@ -1446,6 +1508,117 @@ List<Model.ClsSb_EquipDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipDotCheckBillSub>>(jsonString); return list; } + + ///璁惧鍏ュ簱妫�楠岄獙鏀跺崟 瀛愯〃 + ///ClsSb_EquipStockInCheckBillSub + public List<Model.ClsSb_EquipStockInCheckBillSub> getObjectByJson_ClsSb_EquipStockInCheckBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSb_EquipStockInCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipStockInCheckBillSub>>(jsonString); + return list; + } + + + ///璁惧鍏ュ簱妫�楠岄獙鏀跺崟 涓昏〃 + ///ClsSb_EquipStockInCheckBillMain + public List<Model.ClsSb_EquipStockInCheckBillMain> getObjectByJson_ClsSb_EquipStockInCheckBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSb_EquipStockInCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipStockInCheckBillMain>>(jsonString); + return list; + } + + ///宸ュ簭杩斿伐鐢宠鍗� 涓昏〃 + ///ClsSc_ProcExchWorkBackBillMain + public List<Model.ClsSc_ProcExchWorkBackBillMain> getObjectByJson_ClsSc_ProcExchWorkBackBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_ProcExchWorkBackBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchWorkBackBillMain>>(jsonString); + return list; + } + + ///宸ュ簭杩斿伐鐢宠鍗� 瀛愯〃 + ///ClsSb_EquipStockInCheckBillSub + public List<Model.ClsSc_ProcExchWorkBackBillSub> getObjectByJson_ClsSc_ProcExchWorkBackBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_ProcExchWorkBackBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchWorkBackBillSub>>(jsonString); + return list; + } + + ///宸ュ簭杩斿伐璁板綍鍗� 涓昏〃 + ///ClsSc_ProcExchRecordBackBillMain + public List<Model.ClsSc_ProcExchRecordBackBillMain> getObjectByJson_ClsSc_ProcExchRecordBackBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_ProcExchRecordBackBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchRecordBackBillMain>>(jsonString); + return list; + } + + ///宸ュ簭杩斿伐璁板綍鍗� 瀛愯〃 + ///ClsSc_ProcExchRecordBackBillSub + public List<Model.ClsSc_ProcExchRecordBackBillSub> getObjectByJson_ClsSc_ProcExchRecordBackBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_ProcExchRecordBackBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchRecordBackBillSub>>(jsonString); + return list; + } + + ///宸ュ簭娲惧伐鍗� 涓昏〃 + ///ClsSc_ProcExchWorkBackBillMain + public List<Model.ClsSc_ProcessSendWorkMain> getObjectByJson_ClsSc_ProcessSendWorkMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_ProcessSendWorkMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessSendWorkMain>>(jsonString); + return list; + } + + ///宸ュ簭娲惧伐鍗� 瀛愯〃 + ///ClsSc_ProcExchWorkBackBillMain + public List<Model.ClsSc_ProcessSendWorkSub> getObjectByJson_ClsSc_ProcessSendWorkSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_ProcessSendWorkSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessSendWorkSub>>(jsonString); + return list; + } + + ///娴佽浆鍗″伐搴忔淳宸ュ崟 涓昏〃 + ///ClsSc_ProcExchWorkBackBillMain + public List<Model.ClsSc_ProcExchSendWorkBillMain> getObjectByJson_ClsSc_ProcExchSendWorkBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_ProcExchSendWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchSendWorkBillMain>>(jsonString); + return list; + } + + ///娴佽浆鍗″伐搴忔淳宸ュ崟 瀛愯〃 + ///ClsSc_ProcExchWorkBackBillMain + public List<Model.ClsSc_ProcExchSendWorkBillSub> getObjectByJson_ClsSc_ProcExchSendWorkBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_ProcExchSendWorkBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchSendWorkBillSub>>(jsonString); + return list; + } + + ///璁惧鎶曚骇妫�楠岄獙鏀跺崟 瀛愯〃 + ///ClsSb_EquipWorkBeforeCheckBillSub + public List<Model.ClsSb_EquipWorkBeforeCheckBillSub> getObjectByJson_ClsSb_EquipWorkBeforeCheckBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSb_EquipWorkBeforeCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipWorkBeforeCheckBillSub>>(jsonString); + return list; + } + + + ///璁惧鎶曚骇妫�楠岄獙鏀跺崟 涓昏〃 + ///ClsSb_EquipWorkBeforeCheckBillMain + public List<Model.ClsSb_EquipWorkBeforeCheckBillMain> getObjectByJson_ClsSb_EquipWorkBeforeCheckBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSb_EquipWorkBeforeCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipWorkBeforeCheckBillMain>>(jsonString); + return list; + } + /// <summary> /// 璁惧淇濆吇璁″垝 涓昏〃 @@ -2105,6 +2278,18 @@ } /// <summary> + /// 鐢ㄦ埛宸ュ簭鍏崇郴淇℃伅琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.Gy_UserProcess> getObjectByJson_Gy_UserProcess(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.Gy_UserProcess> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Gy_UserProcess>>(jsonString); + return list; + } + + /// <summary> /// 鐢ㄦ埛-鐢ㄦ埛鍏崇郴淇℃伅琛ㄧ殑json /// </summary> /// <param name="jsonString"></param> @@ -2189,6 +2374,18 @@ } /// <summary> + /// 鐢ㄦ埛宸ヤ綔涓績鍏崇郴淇℃伅琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.WorkCenter> getObjectByJson_WorkCenter(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.WorkCenter>>(jsonString); + return list; + } + + /// <summary> /// 鐢ㄦ埛鑱屽憳鍏崇郴淇℃伅琛ㄧ殑json /// </summary> /// <param name="jsonString"></param> -- Gitblit v1.9.1