From e7ef7f02094dbfc44950cb5bb363b95f0c77c57a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 01 七月 2025 15:44:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/ListModels.cs |  185 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 184 insertions(+), 1 deletions(-)

diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 3842248..6ca5832 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -8,6 +8,7 @@
 using WebAPI.Code;
 using Model;
 using System.Data;
+using System.Text.RegularExpressions;
 
 namespace WebAPI
 {
@@ -223,6 +224,30 @@
         {
             jsonString = "[" + jsonString.ToString() + "]";
             List<Model.ClsKf_SellOutBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_SellOutBillSub>>(jsonString);
+            return list;
+        }
+
+        /// <summary>
+        /// 瀹㈡埛鏍囩鍙嶅簭鍒楀寲
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsSc_CustomerTagInfoMain> getCustomerTagInfoMainByJson(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsSc_CustomerTagInfoMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_CustomerTagInfoMain>>(jsonString);
+            return list;
+        }
+
+        /// <summary>
+        /// 瀹㈡埛鏍囩鍙嶅簭鍒楀寲瀛愯〃
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsSc_CustomerTagInfoSub> getCustomerTagInfoSubByJson(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsSc_CustomerTagInfoSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_CustomerTagInfoSub>>(jsonString);
             return list;
         }
 
@@ -1170,6 +1195,18 @@
         {
             jsonString = "[" + jsonString.ToString() + "]";
             List<Model.ClsGy_ProjectMoneyClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectMoneyClass_Model>>(jsonString);
+            return list;
+        }
+
+        /// <summary>  
+        /// 澶勭悊鏂板璁惧鑺傛媿琛ㄧ殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsEqiupMaterWorkTimes_Model> getObjectByJson_EqiupMaterWorkTimes(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsEqiupMaterWorkTimes_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsEqiupMaterWorkTimes_Model>>(jsonString);
             return list;
         }
 
@@ -2130,7 +2167,10 @@
         /// <returns></returns>
         public List<Models.ClsGy_Material_Model> getObjectByJson_Gy_Material(string jsonString)
         {
-            jsonString = "[" + jsonString.ToString() + "]";
+            if (Regex.IsMatch(jsonString, @"^\[.*\]$") == false)
+            {
+                jsonString = "[" + jsonString.ToString() + "]";
+            }
             List<Models.ClsGy_Material_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Material_Model>>(jsonString);
             return list;
         }
@@ -2148,6 +2188,18 @@
         }
 
         /// <summary>
+        /// 澶勭悊鏂板宸℃椤圭洰鍒嗙被琛ㄧ殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsGy_PatrolCheckItemClass_Model> getObjectByJson_Gy_PatrolCheckItemClass(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsGy_PatrolCheckItemClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PatrolCheckItemClass_Model>>(jsonString);
+            return list;
+        }
+
+        /// <summary>
         /// 澶勭悊鏂板鐐规鏂规硶琛ㄧ殑json
         /// </summary>
         /// <param name="jsonString"></param>
@@ -2156,6 +2208,18 @@
         {
             jsonString = "[" + jsonString.ToString() + "]";
             List<Model.ClsGy_DotCheckItemMethod_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_DotCheckItemMethod_Model>>(jsonString);
+            return list;
+        }
+
+        /// <summary>
+        /// 澶勭悊鏂板宸℃鏂规硶琛ㄧ殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsGy_PatrolCheckItemMethod_Model> getObjectByJson_Gy_PatrolCheckItemMethod(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsGy_PatrolCheckItemMethod_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PatrolCheckItemMethod_Model>>(jsonString);
             return list;
         }
 
@@ -2525,6 +2589,28 @@
             return list;
         }
 
+        /// <summary>
+        /// 璁惧宸℃璁″垝鍗� 涓昏〃
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsSb_EquipPatrolCheckPlanBillMain> getObjectByJson_Sb_EquipPatrolCheckPlanBillMain(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsSb_EquipPatrolCheckPlanBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipPatrolCheckPlanBillMain>>(jsonString);
+            return list;
+        }
+        /// <summary>
+        /// 璁惧宸℃璁″垝鍗� 瀛愯〃
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsSb_EquipPatrolCheckPlanBillSub> getObjectByJson_Sb_EquipPatrolCheckPlanBillSub(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsSb_EquipPatrolCheckPlanBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipPatrolCheckPlanBillSub>>(jsonString);
+            return list;
+        }
 
 
         /// <summary>
@@ -2676,6 +2762,56 @@
         {
             jsonString = "[" + jsonString.ToString() + "]";
             List<Models.ClsSb_EquipDotCheckRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckRuleBillSub>>(jsonString);
+            return list;
+        }
+
+        /// <summary>
+        ///  璁惧宸℃瑙勭▼琛� 涓昏〃
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Models.ClsSb_EquipPatrolCheckRuleBillMain> getObjectByJson_Sb_EquipPatrolCheckRuleBillMain(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Models.ClsSb_EquipPatrolCheckRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipPatrolCheckRuleBillMain>>(jsonString);
+            return list;
+        }       
+
+        /// <summary>
+        /// 璁惧宸℃瑙勭▼琛� 瀛愯〃
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Models.ClsSb_EquipPatrolCheckRuleBillSub> getObjectByJson_Sb_EquipPatrolCheckRuleBillSub(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Models.ClsSb_EquipPatrolCheckRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipPatrolCheckRuleBillSub>>(jsonString);
+            return list;
+        }
+
+
+
+        /// <summary>
+        /// 璁惧宸℃璁板綍琛� 涓昏〃
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsSb_EquipPatrolCheckBillMain> getObjectByJson_Sb_EquipPatrolCheckBillMain(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsSb_EquipPatrolCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipPatrolCheckBillMain>>(jsonString);
+            return list;
+        }
+        
+        /// <summary>
+        /// 璁惧宸℃璁板綍琛� 瀛愯〃
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsSb_EquipPatrolCheckBillSub> getObjectByJson_Sb_EquipPatrolCheckBillSub(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsSb_EquipPatrolCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipPatrolCheckBillSub>>(jsonString);
             return list;
         }
 
@@ -3539,6 +3675,17 @@
             return list;
         }
 
+        /// <summary>
+        /// PDA澶勭悊鏂板璁惧宸℃璁板綍鍗曚富琛ㄧ殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Models.ClsSb_EquipPatrolCheckBillMain> getObjectByJson_Sb_EquipPatrolCheckBillMainPDA(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Models.ClsSb_EquipPatrolCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipPatrolCheckBillMain>>(jsonString);
+            return list;
+        }
 
         /// <summary>
         /// PDA澶勭悊鏂板璁惧鐐规璁板綍鍗曞瓙琛ㄧ殑json
@@ -3549,6 +3696,18 @@
         {
             jsonString = "[" + jsonString.ToString() + "]";
             List<Models.ClsSb_EquipDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckBillSub>>(jsonString);
+            return list;
+        }
+
+        /// <summary>
+        /// PDA澶勭悊鏂板璁惧宸℃璁板綍鍗曞瓙琛ㄧ殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Models.ClsSb_EquipPatrolCheckBillSub> getObjectByJson_Sb_EquipPatrolCheckBillSubPDA(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Models.ClsSb_EquipPatrolCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipPatrolCheckBillSub>>(jsonString);
             return list;
         }
 
@@ -3700,6 +3859,30 @@
         }
 
         /// <summary>
+        /// 杞﹂棿瀹氫綅灏忚溅閿佸畾涓昏〃json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsKf_TrolleyPositionBillMain> getObjectByJson_Kf_TrolleyPositionBillMain(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsKf_TrolleyPositionBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_TrolleyPositionBillMain>>(jsonString);
+            return list;
+        }
+
+        /// <summary>
+        /// 杞﹂棿瀹氫綅灏忚溅閿佸畾瀛愯〃json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsKf_TrolleyPositionBillSub> getObjectByJson_Kf_TrolleyPositionBillSub(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsKf_TrolleyPositionBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_TrolleyPositionBillSub>>(jsonString);
+            return list;
+        }
+
+        /// <summary>
         /// 鎶ュ伐骞冲彴杩斿伐鍗曚富琛╦son
         /// </summary>
         /// <param name="jsonString"></param>

--
Gitblit v1.9.1