From bb48e7fb2979e4cb57a2fe6b744ae58016936d25 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 06 三月 2024 09:16:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/ListModels.cs | 149 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 145 insertions(+), 4 deletions(-)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 03ef777..04b5e19 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -101,6 +101,19 @@
List<Model.ClsKf_MoveStockStepOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_MoveStockStepOutBillMain>>(jsonString);
return list;
}
+
+ /// <summary>
+ /// 鍒嗘寮忚皟鍏ュ崟鍙嶅簭鍒楀寲
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsKf_MoveStockStepInBillMain> getMoveStockStepInBillMainByJson(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsKf_MoveStockStepInBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_MoveStockStepInBillMain>>(jsonString);
+ return list;
+ }
+
/// <summary>
/// 浜у搧鍏ュ簱鍙嶅簭鍒楀寲
/// </summary>
@@ -951,7 +964,7 @@
List<Model.ClsGy_CusType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CusType_Model>>(jsonString);
return list;
}
-
+
/// <summary>
/// 澶勭悊鏂板渚涘簲鍟嗗垎绫昏〃鐨刯son
/// </summary>
@@ -963,7 +976,17 @@
List<Model.ClsGy_SupType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SupType_Model>>(jsonString);
return list;
}
-
+ /// <summary>
+ /// 澶勭悊鏂板椤圭洰璐圭敤琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_ProjectMoney_Model> getObjectByJson_Gy_ProjectMoney(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_ProjectMoney_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectMoney_Model>>(jsonString);
+ return list;
+ }
/// <summary>
/// 澶勭悊鏂板寮傚父绫诲瀷琛ㄧ殑json
/// </summary>
@@ -1042,6 +1065,124 @@
{
jsonString = "[" + jsonString.ToString() + "]";
List<Model.ClsPM_CustomerTaskBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_CustomerTaskBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 澶勭悊鏂板椤圭洰璐圭敤琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsPM_ProjectMoneyBillMain> getObjectByJson_PM_ProjectMoneyBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsPM_ProjectMoneyBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_ProjectMoneyBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 澶勭悊鏂板椤圭洰璐圭敤瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsPM_ProjectMoneyBillSub> getObjectByJson_PM_ProjectMoneyBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsPM_ProjectMoneyBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_ProjectMoneyBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板椤圭洰鍚姩琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsPM_ProjectBeginBillMain> getObjectByJson_PM_ProjectBeginBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsPM_ProjectBeginBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_ProjectBeginBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板椤圭洰楠屾敹鍗曡〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsPM_ProjectEndBillMain> getObjectByJson_PM_ProjectEndBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsPM_ProjectEndBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_ProjectEndBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板浜у搧鍣ㄥ叿娓呭崟琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_MaterialMouldBillMain> getObjectByJson_Gy_MaterialMouldBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_MaterialMouldBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaterialMouldBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板浜у搧鍣ㄥ叿娓呭崟瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_MaterialMouldBillSub> getObjectByJson_Gy_MaterialMouldBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_MaterialMouldBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaterialMouldBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板浜у搧宸ヨ壓鍙傛暟娓呭崟琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_MaterialTechParamBillMain> getObjectByJson_Gy_MaterialTechParamBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_MaterialTechParamBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaterialTechParamBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板浜у搧宸ヨ壓鍙傛暟娓呭崟瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_MaterialTechParamBillSub> getObjectByJson_Gy_MaterialTechParamBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_MaterialTechParamBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaterialTechParamBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板鍏朵粬搴旀敹鍗曡〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsYS_ReceiveOtherBillMain> getObjectByJson_YS_ReceiveOtherBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsYS_ReceiveOtherBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsYS_ReceiveOtherBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板鍏朵粬搴斾粯鍗曡〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsYF_PayMentOtherBillMain> getObjectByJson_YF_PayMentOtherBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsYF_PayMentOtherBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsYF_PayMentOtherBillMain>>(jsonString);
return list;
}
@@ -3055,10 +3196,10 @@
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
- public List<Model.ClsCg_PayableBillSub> getObjectByJson_Cg_PayableBillSub(string jsonString)
+ public List<Model.ClsCg_PayableSub> getObjectByJson_Cg_PayableSub(string jsonString)
{
jsonString = "[" + jsonString.ToString() + "]";
- List<Model.ClsCg_PayableBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_PayableBillSub>>(jsonString);
+ List<Model.ClsCg_PayableSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_PayableSub>>(jsonString);
return list;
}
#endregion
--
Gitblit v1.9.1