From a7941316a0d4945eb2d35fa86ab983c0ec8e6534 Mon Sep 17 00:00:00 2001 From: 仲国强 <519541279@qq.com> Date: 星期四, 16 九月 2021 16:05:45 +0800 Subject: [PATCH] 1、工序委外接收单新增修改、审核、反审核功能。 2、修复工序流转卡保存未保存委外标记问题。 --- WebAPI/ListModels.cs | 310 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 292 insertions(+), 18 deletions(-) diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index 717e6d6..2b97fe3 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -35,6 +35,7 @@ /// <returns></returns> public List<Model.ClsKf_ICStockBillMain> getICStockBillMainByJson(string jsonString) { + jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsKf_ICStockBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_ICStockBillMain>>(jsonString); return list; @@ -557,9 +558,20 @@ return list; } + /// <summary> + /// 澶勭悊鏂板妯″叿淇濆吇璁板綍琛ㄥ瓙琛ㄤ繚鍏婚」鐩殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_MouldMaintainRuleBillSub_Item> getObjectByJson_Sc_MouldMaintainRuleBillSub_Item(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_MouldMaintainRuleBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainRuleBillSub_Item>>(jsonString); + return list; + } /// <summary> - /// 澶勭悊鏂板妯″叿淇濆吇璁板綍琛ㄥ瓙琛ㄧ殑json + /// 澶勭悊鏂板妯″叿淇濆吇璁板綍琛ㄥ瓙琛ㄩ厤浠堕」鐨刯son /// </summary> /// <param name="jsonString"></param> /// <returns></returns> @@ -569,6 +581,7 @@ List<Model.ClsSc_MouldMaintainBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainBillSub>>(jsonString); return list; } + /// <summary> /// 澶勭悊鏂板璐у竵璁剧疆琛ㄧ殑json @@ -665,6 +678,19 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsGy_Employee_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Employee_Model>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板鐗╂枡琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsGy_Material_Model> getObjectByJson_Gy_Material(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsGy_Material_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Material_Model>>(jsonString); return list; } @@ -776,10 +802,10 @@ /// </summary> /// <param name="jsonString"></param> /// <returns></returns> - public List<Model.ClsSc_MouldStockBillMain> getObjectByJson_Gy_MouldScrapInHouseBillMain(string jsonString) + public List<Models.ClsSc_MouldStockBillMain> getObjectByJson_Gy_MouldScrapInHouseBillMain(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; - List<Model.ClsSc_MouldStockBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldStockBillMain>>(jsonString); + List<Models.ClsSc_MouldStockBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldStockBillMain>>(jsonString); return list; } @@ -789,10 +815,35 @@ /// </summary> /// <param name="jsonString"></param> /// <returns></returns> - public List<Model.ClsSc_MouldStockBillSub> getObjectByJson_Gy_MouldScrapInHouseBillSub(string jsonString) + public List<Models.ClsSc_MouldStockBillSub> getObjectByJson_Gy_MouldScrapInHouseBillSub(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; - List<Model.ClsSc_MouldStockBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(jsonString); + List<Models.ClsSc_MouldStockBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldStockBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板妯″叿閲囪喘鍏ュ簱鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSc_MouldProdBillMain> getObjectByJson_Gy_MouldProdInHouseBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSc_MouldProdBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldProdBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板妯″叿閲囪喘鍏ュ簱鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSc_MouldProdBillSub> getObjectByJson_Gy_MouldProdInHouseBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSc_MouldProdBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldProdBillSub>>(jsonString); return list; } @@ -826,7 +877,7 @@ } /// <summary> - /// 璁惧淇濆吇璁″垝 瀛愯〃 + /// 璁惧淇濆吇璁″垝 閰嶄欢瀛愯〃 /// </summary> /// <param name="jsonString"></param> /// <returns></returns> @@ -834,6 +885,17 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsSb_EquipMaintainPlanBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipMaintainPlanBillSub>>(jsonString); + return list; + } + /// <summary> + /// 璁惧淇濆吇璁″垝 淇濆吇瀛愯〃 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_EquipMaintainPlanBillSub_Item> getObjectByJson_Sc_EquipMaintainPlanBillSub_Item(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_EquipMaintainPlanBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_EquipMaintainPlanBillSub_Item>>(jsonString); return list; } @@ -851,7 +913,7 @@ } /// <summary> - /// 璁惧淇濆吇璁板綍 瀛愯〃 + /// 璁惧淇濆吇璁板綍 閰嶄欢瀛愯〃 /// ClsSb_EquipMaintainBillSub /// </summary> /// <param name="jsonString"></param> @@ -862,7 +924,18 @@ List<Model.ClsSb_EquipMaintainBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipMaintainBillSub>>(jsonString); return list; } - + /// <summary> + /// 璁惧淇濆吇璁板綍 淇濆吇瀛愯〃 + /// ClsSc_EquipMaintainBillSub_Item + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_EquipMaintainBillSub_Item> getObjectByJson_Sc_EquipMaintainBillSub_Item(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_EquipMaintainBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_EquipMaintainBillSub_Item>>(jsonString); + return list; + } /// <summary> /// 妯℃不鍏峰叾浠栧嚭搴撳崟 涓昏〃 @@ -997,10 +1070,10 @@ /// </summary> /// <param name="jsonString"></param> /// <returns></returns> - public List<Model.ClsSc_ICMOReportBillMain> getObjectByJson_Gy_ICMOReportBillMain(string jsonString) + public List<Models.ClsSc_ICMOReportBillMain> getObjectByJson_Gy_ICMOReportBillMain(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; - List<Model.ClsSc_ICMOReportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOReportBillMain>>(jsonString); + List<Models.ClsSc_ICMOReportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ICMOReportBillMain>>(jsonString); return list; } @@ -1010,10 +1083,10 @@ /// </summary> /// <param name="jsonString"></param> /// <returns></returns> - public List<Model.ClsSc_ICMOReportBillSub> getObjectByJson_Gy_ICMOReportBillSub(string jsonString) + public List<Models.ClsSc_ICMOReportBillSub> getObjectByJson_Gy_ICMOReportBillSub(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; - List<Model.ClsSc_ICMOReportBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOReportBillSub>>(jsonString); + List<Models.ClsSc_ICMOReportBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ICMOReportBillSub>>(jsonString); return list; } @@ -1022,10 +1095,10 @@ /// </summary> /// <param name="jsonString"></param> /// <returns></returns> - public List<Model.ClsSc_MESBeginWorkBillMain> getObjectByJson_Gy_MESBeginWorkBillMain(string jsonString) + public List<Models.ClsSc_MESBeginWorkBillMain> getObjectByJson_Gy_MESBeginWorkBillMain(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; - List<Model.ClsSc_MESBeginWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MESBeginWorkBillMain>>(jsonString); + List<Models.ClsSc_MESBeginWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillMain>>(jsonString); return list; } @@ -1034,10 +1107,10 @@ /// </summary> /// <param name="jsonString"></param> /// <returns></returns> - public List<Model.ClsSc_MESEndWorkBillMain> getObjectByJson_Gy_MESEndWorkBillMain(string jsonString) + public List<Models.ClsSc_MESEndWorkBillMain> getObjectByJson_Gy_MESEndWorkBillMain(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; - List<Model.ClsSc_MESEndWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MESEndWorkBillMain>>(jsonString); + List<Models.ClsSc_MESEndWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESEndWorkBillMain>>(jsonString); return list; } @@ -1046,10 +1119,211 @@ /// </summary> /// <param name="jsonString"></param> /// <returns></returns> - public List<Model.ClsSc_MESStopWorkBillMain> getObjectByJson_Gy_MESStopWorkBillMain(string jsonString) + public List<Models.ClsSc_MESStopWorkBillMain> getObjectByJson_Gy_MESStopWorkBillMain(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; - List<Model.ClsSc_MESStopWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MESStopWorkBillMain>>(jsonString); + List<Models.ClsSc_MESStopWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESStopWorkBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板鐐规璁板綍琛ㄥ崟琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSc_MouldDotCheckBillMain> getObjectByJson_Gy_MoudlCheckBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSc_MouldDotCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldDotCheckBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板鐐规璁板綍鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSc_MouldDotCheckBillSub> getObjectByJson_Gy_MouldDotCheckBillSub(string jsonString) + { + 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.ClsSc_MouldMaintainBillMain> getObjectByJson_Gy_MouldMaintainBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSc_MouldMaintainBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldMaintainBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板淇濆吇璁板綍鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSc_MouldMaintainBillSub> getObjectByJson_Gy_MouldMaintainBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSc_MouldMaintainBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldMaintainBillSub>>(jsonString); + return list; + } + + /// <summary> + /// PDA澶勭悊鏂板璁惧鐐规璁板綍鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSb_EquipDotCheckBillMain> getObjectByJson_Sb_EquipDotCheckBillMainPDA(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSb_EquipDotCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// PDA澶勭悊鏂板璁惧鐐规璁板綍鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSb_EquipDotCheckBillSub> getObjectByJson_Sb_EquipDotCheckBillSubPDA(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSb_EquipDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckBillSub>>(jsonString); + return list; + } + + /// <summary> + /// PDA澶勭悊鏂板璁惧淇濆吇璁板綍鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSb_EquipMaintainBillMain> getObjectByJson_Sb_EquipMaintainBillMainPDA(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSb_EquipMaintainBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipMaintainBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// PDA澶勭悊鏂板璁惧淇濆吇璁板綍鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSb_EquipMaintainBillSub> getObjectByJson_Sb_EquipMaintainBillSubPDA(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSb_EquipMaintainBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipMaintainBillSub>>(jsonString); + return list; + } + + /// <summary> + /// PDA澶勭悊鏂板璁惧缁翠慨鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSb_EquipRepairWorkBillMain> getObjectByJson_Sb_EqpRepairWorkBillMainPDA(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSb_EquipRepairWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipRepairWorkBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// PDA澶勭悊鏂板璁惧缁翠慨鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSb_EquipRepairWorkBillSub> getObjectByJson_Sb_EquipRepairWorkBillSubPDA(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<Model.ClsSc_MouldOtherInBillMain> getObjectByJson_Sc_MouldOtherInBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_MouldOtherInBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldOtherInBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板妯″叿鍏ュ簱鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_MouldOtherInBillSub> getObjectByJson_Sc_MouldOtherInBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_MouldOtherInBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldOtherInBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 鎶ュ伐骞冲彴寮�宸ュ崟涓昏〃json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSc_MESBeginWorkBillMain> getObjectByJson_Gy_MESBeginWorkFrom(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSc_MESBeginWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 鎶ュ伐骞冲彴浜ч噺姹囨姤涓昏〃json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSc_ICMOBillWorkQtyStatus_Tmp> getObjectByJson_Gy_MESProductReportFrom(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSc_ICMOBillWorkQtyStatus_Tmp> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ICMOBillWorkQtyStatus_Tmp>>(jsonString); + return list; + } + + /// <summary> + /// 鎶ュ伐骞冲彴鏂板涓婃枡闃查敊鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_MaterToSourceBillMain> getObjectByJson_Sc_MaterToSourceBillMain(string jsonString) + { + 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.ClsSc_MaterToSourceBillSub> getObjectByJson_Sc_MaterToSourceBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_MaterToSourceBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MaterToSourceBillSub>>(jsonString); return list; } } -- Gitblit v1.9.1