From ba6d2fff0224e8694c782a7e1154d0abd7a32c20 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 17 十一月 2021 08:48:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/ListModels.cs | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 114 insertions(+), 3 deletions(-)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index d50fa2a..c8796ba 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -559,7 +559,7 @@
}
/// <summary>
- /// 澶勭悊鏂板妯″叿淇濆吇璁板綍琛ㄥ瓙琛ㄤ繚鍏婚」鐩殑json
+ /// 澶勭悊鏂板鍣ㄥ叿淇濆吇瑙勭▼瀛愯〃1椤圭洰鐨刯son
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
@@ -567,6 +567,30 @@
{
jsonString = "[" + jsonString.ToString() + "]";
List<Model.ClsSc_MouldMaintainRuleBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainRuleBillSub_Item>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板鍣ㄥ叿淇濆吇瑙勭▼瀛愯〃2椤圭洰鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_MouldMaintainRuleBillSub> getObjectByJson_Sc_MouldMaintainRuleBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_MouldMaintainRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainRuleBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板鍣ㄥ叿淇濆吇瑙勭▼椤圭洰鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_MouldMaintainRuleBillMain> getObjectByJson_Sc_MouldMaintainRuleBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_MouldMaintainRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainRuleBillMain>>(jsonString);
return list;
}
@@ -1315,7 +1339,7 @@
/// <summary>
- /// 澶勭悊鏂板鐐规璁板綍琛ㄥ崟琛ㄧ殑json
+ /// 澶勭悊鏂板妯″叿鐐规璁板綍琛ㄥ崟琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
@@ -1328,7 +1352,20 @@
/// <summary>
- /// 澶勭悊鏂板鐐规璁板綍鍗曞瓙琛ㄧ殑json
+ /// 澶勭悊鏂板璁惧鐐规璁板綍琛ㄥ崟琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipDotCheckBillMain> getObjectByJson_Gy_EquipCheckBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipDotCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿鐐规璁板綍鍗曞瓙琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
@@ -1336,6 +1373,45 @@
{
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.ClsSb_EquipRepairWorkBillMain> wxmain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipRepairWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipRepairWorkBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿缁翠慨褰曞崟瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipRepairWorkBillSub> wxsub(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<Models.ClsSb_EquipDotCheckBillSub> getObjectByJson_Gy_EquipDotCheckBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckBillSub>>(jsonString);
return list;
}
@@ -1399,6 +1475,18 @@
{
jsonString = "[" + jsonString.ToString() + "]";
List<Models.ClsSb_EquipMaintainBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipMaintainBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板璁惧鍒嗙被涓昏〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsGy_EquipFileType> getObjectByJson_Gy_EquipFileType(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsGy_EquipFileType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileType>>(jsonString);
return list;
}
@@ -1562,5 +1650,28 @@
return list;
}
+ /// <summary>
+ /// 鍏憡鍒楄〃涓昏〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsOA_InformBillMain> getObjectByJson_GG_NoticeBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsOA_InformBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsOA_InformBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 鐢ㄦ埛鏉冮檺鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.UserPower> getObjectByJson_UserPower(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.UserPower> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.UserPower>>(jsonString);
+ return list;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1