From 07be4d7d9002739b54170fdca63f0e8c7773e647 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 11 十一月 2021 15:56:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/ListModels.cs |   91 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index d50fa2a..763a0f1 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1315,7 +1315,7 @@
 
 
         /// <summary>
-        /// 澶勭悊鏂板鐐规璁板綍琛ㄥ崟琛ㄧ殑json
+        /// 澶勭悊鏂板妯″叿鐐规璁板綍琛ㄥ崟琛ㄧ殑json
         /// </summary>
         /// <param name="jsonString"></param>
         /// <returns></returns>
@@ -1328,7 +1328,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 +1349,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 +1451,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 +1626,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