From f9ef44a67fbf73f073efe65600bc25e204fde04f Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 30 五月 2022 17:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/ListModels.cs | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index f247548..4ed8160 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -547,6 +547,29 @@
/// <summary>
+ /// 澶勭悊鏂板宸ュ簭娴佽浆鍗′富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_ProcessExchangeBillMain> getObjectByJson_Sc_ProcessExchangeBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_ProcessExchangeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 澶勭悊鏂板宸ュ簭娴佽浆鍗′富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_ProcessExchangeBillSub> getObjectByJson_Sc_ProcessExchangeBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_ProcessExchangeBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板妯″叿淇濆吇璁″垝鍗曞瓙琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
@@ -942,6 +965,18 @@
return list;
}
+ /// <summary>
+ /// 澶勭悊鐩樼偣瀹℃牳鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.Cls_InventoryAnalysisList> getObjectByJson_Gy_StockCheckItemBill(string jsonString)
+ {
+ //jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.Cls_InventoryAnalysisList> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Cls_InventoryAnalysisList>>(jsonString);
+ return list;
+ }
+
/// <summary>
/// 澶勭悊鏂板妯″叿閲囪喘鍏ュ簱鍗曞瓙琛ㄧ殑json
@@ -952,6 +987,13 @@
{
jsonString = "[" + jsonString.ToString() + "]";
List<Models.ClsSc_MouldProdBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldProdBillSub>>(jsonString);
+ return list;
+ }
+
+ public List<Models.ClsQK_PackingBill> getObjectByJson_QK_PackingBill(string jsonString)
+ {
+ //jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsQK_PackingBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsQK_PackingBill>>(jsonString);
return list;
}
@@ -1903,6 +1945,20 @@
return list;
}
#endregion
+ #region 鐝粍鑱屽憳娓呭崟
+ public List<Models.ClsGy_GroupEmpListMain> getObjectByJson_Gy_GroupEmpListMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsGy_GroupEmpListMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_GroupEmpListMain>>(jsonString);
+ return list;
+ }
+ public List<Models.ClsGy_GroupEmpListSub> getObjectByJson_Gy_GroupEmpListSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsGy_GroupEmpListSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_GroupEmpListSub>>(jsonString);
+ return list;
+ }
+ #endregion
/// <summary>
/// 鎶ュ伐鍙板伐搴忔眹鎶ュ崟涓昏〃json
@@ -1928,6 +1984,6 @@
List<Models.ClsSc_ProcessReportSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ProcessReportSub>>(jsonString);
return list;
}
-
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1