From bf24909c6d9cad6fd4bd7335e5f70b45c6a5212b Mon Sep 17 00:00:00 2001 From: jinghz@oceic.com <jinghz@oceic.com> Date: 星期四, 24 八月 2023 17:13:08 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/ListModels.cs | 324 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 321 insertions(+), 3 deletions(-) diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index 5de991c..8e3d79a 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> @@ -493,7 +507,7 @@ /// <summary> - /// 澶勭悊鏂板妯″叿缁翠慨瀛愯〃鐨刯son + /// 澶勭悊鏂板妯″叿缁翠慨瀛愯〃淇濆吇淇℃伅鐨刯son /// </summary> /// <param name="jsonString"></param> /// <returns></returns> @@ -501,6 +515,18 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsSb_MouldRepairWorkBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板妯″叿缁翠慨瀛愯〃閰嶄欢淇℃伅鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSb_MouldRepairWorkBillSub_Item> getObjectByJson_Gy_MouldRepairWorkBillSub_Item(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSb_MouldRepairWorkBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillSub_Item>>(jsonString); return list; } @@ -712,6 +738,42 @@ } /// <summary> + /// 澶勭悊鏂板鍣ㄥ叿鐐规瑙勭▼椤圭洰鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_MouldDotCheckRuleBillMain> getObjectByJson_Sc_MouldDotCheckRuleBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_MouldDotCheckRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckRuleBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板鍣ㄥ叿鐐规瑙勭▼ 瀛愯〃鐐规椤圭洰鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_MouldDotCheckRuleBillSub> getObjectByJson_Sc_MouldDotCheckRuleBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_MouldDotCheckRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckRuleBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板鍣ㄥ叿鐐规瑙勭▼ 瀛愯〃 閰嶄欢鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_MouldDotCheckRuleBillSub_Item> getObjectByJson_Sc_MouldDotCheckRuleBillSub_Item(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_MouldDotCheckRuleBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckRuleBillSub_Item>>(jsonString); + return list; + } + + /// <summary> /// 澶勭悊鏂板妯″叿淇濆吇璁板綍琛ㄥ瓙琛ㄩ厤浠堕」鐨刯son /// </summary> /// <param name="jsonString"></param> @@ -809,7 +871,7 @@ } /// <summary> - /// 澶勭悊鏂板妯″叿鐐规璁板綍琛ㄥ瓙琛ㄧ殑json + /// 澶勭悊鏂板妯″叿鐐规璁板綍琛ㄥ瓙琛� 鐐规椤圭洰 鐨刯son /// </summary> /// <param name="jsonString"></param> /// <returns></returns> @@ -817,6 +879,18 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsSc_MouldDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板妯″叿鐐规璁板綍琛ㄥ瓙琛� 閰嶄欢淇℃伅 鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_MouldDotCheckBillSub_Item> getObjectByJson_Sc_MouldDotCheckBillSub_Item(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_MouldDotCheckBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckBillSub_Item>>(jsonString); return list; } @@ -847,6 +921,19 @@ } /// <summary> + /// 澶勭悊鏂板妯″叿鐐规璁″垝琛� 閰嶄欢瀛愯〃鐨刯son + /// ClsSc_MouldDotCheckPlanBillSub + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_MouldDotCheckPlanBillSub_Item> getObjectByJson_Sc_MouldDotCheckPlanBillSub_Item(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_MouldDotCheckPlanBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckPlanBillSub_Item>>(jsonString); + return list; + } + + /// <summary> /// 澶勭悊鏂板鑱屽憳琛ㄧ殑json /// </summary> /// <param name="jsonString"></param> @@ -868,6 +955,18 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Models.ClsGy_Material_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Material_Model>>(jsonString); + return list; + } + + /// <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; } @@ -1050,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> @@ -1397,6 +1508,171 @@ 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; + } + + ///娴佽浆鍗″伐搴忓澶栨淳宸ュ崟 涓昏〃 + ///ClsWW_EntrustWorkOrderBillMain + public List<Model.ClsWW_EntrustWorkOrderBillMain> getObjectByJson_ClsWW_EntrustWorkOrderBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsWW_EntrustWorkOrderBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsWW_EntrustWorkOrderBillMain>>(jsonString); + return list; + } + + ///娴佽浆鍗″伐搴忓澶栨淳宸ュ崟 瀛愯〃 + ///ClsWW_EntrustWorkOrderBillSub + public List<Model.ClsWW_EntrustWorkOrderBillSub> getObjectByJson_ClsWW_EntrustWorkOrderBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsWW_EntrustWorkOrderBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsWW_EntrustWorkOrderBillSub>>(jsonString); + return list; + } + + ///渚涘簲鍟嗚浠峰崟 涓昏〃 + ///ClsSup_AskPriceBillMain + public List<Model.ClsSup_AskPriceBillMain> getObjectByJson_ClsSup_AskPriceBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSup_AskPriceBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSup_AskPriceBillMain>>(jsonString); + return list; + } + + ///渚涘簲鍟嗚浠峰崟 瀛愯〃 + ///ClsSup_AskPriceBillSub + public List<Model.ClsSup_AskPriceBillSub> getObjectByJson_ClsClsSup_AskPriceBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSup_AskPriceBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSup_AskPriceBillSub>>(jsonString); + return list; + } + + ///渚涘簲鍟嗘姤浠峰崟 涓昏〃 + ///ClsSup_QuotePriceBillMain + public List<Model.ClsSup_QuotePriceBillMain> getObjectByJson_ClsSup_QuotePriceBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSup_QuotePriceBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSup_QuotePriceBillMain>>(jsonString); + return list; + } + + ///渚涘簲鍟嗘姤浠峰崟 瀛愯〃 + ///ClsSup_QuotePriceBillSub + public List<Model.ClsSup_QuotePriceBillSub> getObjectByJson_ClsSup_QuotePriceBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSup_QuotePriceBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSup_QuotePriceBillSub>>(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> /// 璁惧淇濆吇璁″垝 涓昏〃 @@ -2056,6 +2332,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> @@ -2136,6 +2424,18 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Models.Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Department>>(jsonString); + return list; + } + + /// <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; } @@ -2378,5 +2678,23 @@ return list; } + ///棣栦欢妫�楠屽崟 瀛欒〃 + ///ClsQC_FirstPieceCheckBillSub_ValueGrid + public List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid> getObjectByJson_ClsQC_FirstPieceCheckBillSub_ValueGrid(string jsonString) + { + //jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid>>(jsonString); + return list; + } + + ///宸ュ簭妫�楠屽崟 瀛欒〃 + ///ClsQC_ProcessCheckBillSub_ValueGrid + public List<Model.ClsQC_ProcessCheckBillSub_ValueGrid> getObjectByJson_ClsQC_ProcessCheckBillSub_ValueGrid(string jsonString) + { + //jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_ProcessCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillSub_ValueGrid>>(jsonString); + return list; + } + } } \ No newline at end of file -- Gitblit v1.9.1