From d8de78b09da94b54f105bb4a74cf4701128e7bf8 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期一, 22 四月 2024 17:26:23 +0800 Subject: [PATCH] 1.工程项目的编辑页面,增加 工程信息 页签; 页签里 增加字段 项目类别HProjectClassID,状态,建设单位HBuildComp,地点HBuildAddress,任务编号HWorkNo,受理日期HReDate,图纸编号HPicNo,任务下达HWorkTask,项目内容HProjectNote ; 2.仓储流程的测试并完善功能; 分步式调出单-》分布式调入单 直接调拨单 (注意: 源单类型的下拉框 需要 根据数据库 表动态加载, 关联数量 要准确 , 审核 且 未关闭 未行关闭的行 才能下推 ,关联数量超额后,要 反写 关闭 源单 ) --- WebAPI/ListModels.cs | 406 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 406 insertions(+), 0 deletions(-) diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index 722a262..6e44e80 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -395,6 +395,54 @@ } /// <summary> + /// 澶勭悊鏂板涓嶈壇鍝佽瘎瀹$敵璇峰崟琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsQC_NoPassProdRequestBillMain> getObjectByJson_QC_NoPassProdRequestBill(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_NoPassProdRequestBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_NoPassProdRequestBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板涓嶈壇鍝佽瘎瀹″鐞嗗崟琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsQC_NoPassProdDisposeBillMain> getObjectByJson_QC_NoPassProdDisposeBill(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_NoPassProdDisposeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_NoPassProdDisposeBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板涓嶈壇鍝佽瘎瀹″鐞嗛獙鏀跺崟琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsQC_NoPassProdDisposeCheckBillMain> getObjectByJson_QC_NoPassProdDisposeCheckBill(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_NoPassProdDisposeCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_NoPassProdDisposeCheckBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板涓嶈壇鍝佽瘎瀹$粨璁哄崟琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsQC_NoPassProdConclusionBillMain> getObjectByJson_QC_NoPassProdConclusionBill(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_NoPassProdConclusionBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_NoPassProdConclusionBillMain>>(jsonString); + return list; + } + + /// <summary> /// 澶勭悊鏂板閮ㄩ棬鍩虹璧勬枡鐨凧SON /// </summary> /// <param name="jsonString"></param> @@ -637,6 +685,7 @@ return list; } + /// <summary> /// 澶勭悊鏂板妯″叿缁翠慨楠屾敹鍗曞瓙琛ㄧ殑json @@ -649,6 +698,80 @@ List<Model.ClsSc_MouldRepairCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldRepairCheckBillSub>>(jsonString); return list; } + + /// <summary> + /// 澶勭悊鏂板鍏朵粬鍏ュ簱鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsKf_OtherInBillMain> getObjectByJson_Kf_OtherInBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsKf_OtherInBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_OtherInBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板鍏跺畠鍏ュ簱鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsKf_OtherInBillSub> getObjectByJson_Kf_OtherInBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsKf_OtherInBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_OtherInBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板鐩存帴璋冩嫧鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsKf_MoveStockBillMain> getObjectByJson_Kf_MoveStockBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsKf_MoveStockBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_MoveStockBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板鐩存帴璋冩嫧鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsKf_MoveStockBillSub> getObjectByJson_Kf_MoveStockBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsKf_MoveStockBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_MoveStockBillSub>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板鍏朵粬鍑哄簱鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsKf_OtherOutBillMain> getObjectByJson_Kf_OtherOutBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsKf_OtherOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_OtherOutBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板鍏跺畠鍑哄簱鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsKf_OtherOutBillSub> getObjectByJson_Kf_OtherOutBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsKf_OtherOutBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_OtherOutBillSub>>(jsonString); + return list; + } + /// <summary> /// 澶勭悊鏂板妯″叿鏁呴殰鐧昏鍗曚富琛ㄧ殑json @@ -769,6 +892,18 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsGy_BadResult_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_BadResult_Model>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板涓嶈壇鐜拌薄琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_BadPhenomena_Model> getObjectByJson_Gy_BadPhenomena(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_BadPhenomena_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_BadPhenomena_Model>>(jsonString); return list; } @@ -987,6 +1122,89 @@ List<Model.ClsGy_ProjectMoney_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectMoney_Model>>(jsonString); return list; } + + /// <summary> + /// 澶勭悊鏂板椤圭洰绫诲埆琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_ProjectClass_Model> getObjectByJson_Gy_ProjectClass(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_ProjectClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectClass_Model>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板椤圭洰绫诲埆琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_TaskClass_Model> getObjectByJson_Gy_TaskClass(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_TaskClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_TaskClass_Model>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板寮傚父鍙嶉鎺ユ敹鍗曡〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsOA_ErrMsgBackReceiveBillMain> getObjectByJson_OA_ErrMsgBackReceiveBill(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsOA_ErrMsgBackReceiveBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsOA_ErrMsgBackReceiveBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板寮傚父鍙嶉楠屾敹鍗曡〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsOA_ErrMsgBackCheckBillMain> getObjectByJson_OA_ErrMsgBackCheckBill(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsOA_ErrMsgBackCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsOA_ErrMsgBackCheckBillMain>>(jsonString); + return list; + } + /// <summary> + /// 澶勭悊鏂板寮傚父鍙嶉绛惧埌鍗曡〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsOA_ErrMsgBackSignBillMain> getObjectByJson_OA_ErrMsgBackSignBill(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsOA_ErrMsgBackSignBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsOA_ErrMsgBackSignBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板寮傚父鍙嶉澶勭悊鍗曡〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsOA_ErrMsgBackHandleBillMain> getObjectByJson_OA_ErrMsgBackHandleBill(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsOA_ErrMsgBackHandleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsOA_ErrMsgBackHandleBillMain>>(jsonString); + return list; + } + /// <summary> + /// 澶勭悊鏂板寮傚父鍙嶉绫诲瀷琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_ErrMsgBackType_Model> getObjectByJson_Gy_ErrMsgBackType(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_ErrMsgBackType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ErrMsgBackType_Model>>(jsonString); + return list; + } + /// <summary> /// 澶勭悊鏂板寮傚父绫诲瀷琛ㄧ殑json /// </summary> @@ -1022,6 +1240,80 @@ List<Models.ClsGy_StockCheckItemBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_StockCheckItemBill>>(jsonString); return list; } + + /// <summary> + /// 澶勭悊鏂板矖浣嶆妧鑳芥竻鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsHR_PostSkillBillMain> getObjectByJson_HR_PostSkillBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsHR_PostSkillBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsHR_PostSkillBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板矖浣嶆妧鑳芥竻鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsHR_PostSkillBillSub> getObjectByJson_HR_PostSkillBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsHR_PostSkillBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsHR_PostSkillBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊瀹夌伅閫愮骇鍛煎惛瑙勫垯涓昏〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsOA_AndengFlowRuleBillMain> getObjectByJson_OA_AndengFlowRuleBill(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsOA_AndengFlowRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsOA_AndengFlowRuleBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊瀹夌伅閫愮骇鍛煎惛瑙勫垯瀛愯〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsOA_AndengFlowRuleBillSub> getObjectByJson_OA_AndengFlowRuleBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsOA_AndengFlowRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsOA_AndengFlowRuleBillSub>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板憳宸ユ妧鑳芥竻鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsHR_EmployeeSkillBillMain> getObjectByJson_HR_EmployeeSkillBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsHR_EmployeeSkillBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsHR_EmployeeSkillBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板憳宸ユ妧鑳芥竻鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsHR_EmployeeSkillBillSub> getObjectByJson_HR_EmployeeSkillBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsHR_EmployeeSkillBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsHR_EmployeeSkillBillSub>>(jsonString); + return list; + } + + /// <summary> /// 澶勭悊鏂板鍛ㄦ�荤粨琛ㄧ殑json /// </summary> @@ -1089,6 +1381,8 @@ List<Model.ClsPM_ProjectMoneyBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_ProjectMoneyBillSub>>(jsonString); return list; } + + /// <summary> /// 澶勭悊鏂板椤圭洰鍚姩琛ㄧ殑json @@ -1175,6 +1469,18 @@ } /// <summary> + /// 澶勭悊鏂板鍏朵粬搴旀敹鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsYS_ReceiveOtherBillSub> getObjectByJson_YS_ReceiveOtherBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsYS_ReceiveOtherBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsYS_ReceiveOtherBillSub>>(jsonString); + return list; + } + + /// <summary> /// 澶勭悊鏂板鍏朵粬搴斾粯鍗曡〃鐨刯son /// </summary> /// <param name="jsonString"></param> @@ -1183,6 +1489,18 @@ { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsYF_PayMentOtherBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsYF_PayMentOtherBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板鍏朵粬搴旀敹鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsYF_PayMentOtherBillSub> getObjectByJson_YF_PayMentOtherBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsYF_PayMentOtherBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsYF_PayMentOtherBillSub>>(jsonString); return list; } @@ -3102,6 +3420,44 @@ return list; } + /// <summary> + /// 鍥哄畾璧勪骇鍗$墖 涓昏〃 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + // ClsGy_FixCardBillMain + public List<Model.ClsGy_FixCardBillMain> getObjectByJson_Gy_FixCardBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_FixCardBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_FixCardBillMain>>(jsonString); + return list; + } + /// <summary> + /// 鍥哄畾璧勪骇鍗$墖 瀛愯〃 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + // ClsGy_FixCardBillSub_Emp + public List<Model.ClsGy_FixCardBillSub_Emp> getObjectByJson_Gy_FixCardBillSub_Emp(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_FixCardBillSub_Emp> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_FixCardBillSub_Emp>>(jsonString); + return list; + } + + /// <summary> + /// 鍥哄畾璧勪骇鍙樺姩鍗� 涓昏〃 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + // ClsGy_FixCardChangeBillMain + public List<Model.ClsGy_FixCardChangeBillMain> getObjectByJson_Gy_FixCardChangeBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_FixCardChangeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_FixCardChangeBillMain>>(jsonString); + return list; + } + #region 瀹㈣瘔澶勭悊鍗� /// <summary> /// 瀹㈣瘔澶勭悊鍗曚富琛╦son @@ -3229,6 +3585,31 @@ } #endregion + #region 鐢熶骇璐ㄩ噺姹囨姤鍗� + /// <summary> + /// 鐢熶骇璐ㄩ噺姹囨姤鍗曚富琛╦son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_QualityReportBillMain> getObjectByJson_Sc_QualityReportBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_QualityReportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_QualityReportBillMain>>(jsonString); + return list; + } + /// <summary> + /// 鐢熶骇璐ㄩ噺姹囨姤鍗曞瓙琛╦son2 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_QualityReportBillSub> getObjectByJson_Sc_QualityReportBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_QualityReportBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_QualityReportBillSub>>(jsonString); + return list; + } + #endregion + #region 浠樻鍗� /// <summary> /// 浠樻鍗曚富琛╦son @@ -3353,6 +3734,31 @@ } #endregion + #region 閿�鍞皟浠峰崟 + /// <summary> + /// 閿�鍞皟浠峰崟涓昏〃json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsXs_SellOutChangeBillMain> getObjectByJson_Xs_SellOutChangeBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsXs_SellOutChangeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_SellOutChangeBillMain>>(jsonString); + return list; + } + /// <summary> + /// 閿�鍞皟浠峰崟瀛愯〃json2 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsXs_SellOutChangeBillSub> getObjectByJson_Xs_SellOutChangeBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsXs_SellOutChangeBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_SellOutChangeBillSub>>(jsonString); + return list; + } + #endregion + #region 搴旀敹閫�娆惧崟 /// <summary> /// 搴旀敹閫�娆惧崟涓昏〃json -- Gitblit v1.9.1