From 7cacc9eb3f246fa46e94c0f557fd6f4e1a07bb94 Mon Sep 17 00:00:00 2001
From: wyb <1qaz@123>
Date: 星期三, 26 五月 2021 17:43:25 +0800
Subject: [PATCH] 解决冲突
---
WebAPI/ListModels.cs | 75 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 12 deletions(-)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index a338bd7..27fc627 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -571,18 +571,6 @@
}
/// <summary>
- /// 澶勭悊鏂板璁￠噺鍗曚綅琛ㄧ殑json
- /// </summary>
- /// <param name="jsonString"></param>
- /// <returns></returns>
- public List<Model.ClsGy_Unit_Model> getObjectByJson_Gy_Unit(string jsonString)
- {
- jsonString = "[" + jsonString.ToString() + "]";
- List<Model.ClsGy_Unit_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Unit_Model>>(jsonString);
- return list;
- }
-
- /// <summary>
/// 澶勭悊鏂板璐у竵璁剧疆琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
@@ -606,5 +594,68 @@
return list;
}
+ /// <summary>
+ /// 澶勭悊鏂板璁￠噺鍗曚綅琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_Unit_Model> getObjectByJson_Gy_Unit(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_Unit_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Unit_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿鐐规璁板綍琛ㄤ富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_MouldDotCheckBillMain> getObjectByJson_Sc_MouldDotCheckBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_MouldDotCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿鐐规璁板綍琛ㄥ瓙琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_MouldDotCheckBillSub> getObjectByJson_Sc_MouldDotCheckBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_MouldDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿鐐规璁″垝琛ㄤ富琛ㄧ殑json
+ /// ClsSc_MouldDotCheckPlanBillMain
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_MouldDotCheckPlanBillMain> getObjectByJson_Sc_MouldDotCheckPlanBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_MouldDotCheckPlanBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckPlanBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿鐐规璁″垝琛ㄥ瓙琛ㄧ殑json
+ /// ClsSc_MouldDotCheckPlanBillSub
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_MouldDotCheckPlanBillSub> getObjectByJson_Sc_MouldDotCheckPlanBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_MouldDotCheckPlanBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckPlanBillSub>>(jsonString);
+ return list;
+ }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1