From 122e343b705b057e71f1ef677d18237900844a16 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 12 九月 2025 10:51:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index d57ff34..9e517c9 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;
         }
 
@@ -896,6 +921,7 @@
             List<Model.ClsSc_MouldMaintainPlanBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainPlanBillSub_Item>>(jsonString);
             return list;
         }
+        
 
         /// <summary>
         /// 澶勭悊鏂板涓嶈壇鍘熷洜琛ㄧ殑json
@@ -909,6 +935,18 @@
             return list;
         }
 
+
+        /// <summary>
+        /// 澶勭悊鏂板鐧芥爣鍩虹閰嶇疆琛ㄧ殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsSc_PackUnionBillBarCode_temp_Model> getObjectByJson_Sc_PackUnionBillBarCode_temp(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsSc_PackUnionBillBarCode_temp_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_PackUnionBillBarCode_temp_Model>>(jsonString);
+            return list;
+        }
         /// <summary>
         /// 澶勭悊鏂板涓嶈壇鍚庢灉琛ㄧ殑json
         /// </summary>
@@ -2142,7 +2180,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;
         }
@@ -2350,6 +2391,18 @@
             List<Model.ClsGy_MatePriceSup_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MatePriceSup_Model>>(jsonString);
             return list;
         }
+        /// <summary>
+        /// 澶勭悊閲囪喘浠锋牸琛ㄧ殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsGy_MatePrice_Model> getObjectByJson_Gy_MatePrice(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsGy_MatePrice_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MatePrice_Model>>(jsonString);
+            return list;
+        }
+
 
         /// <summary>
         /// 澶勭悊鍣ㄥ叿鐘舵�佽〃鐨刯son
@@ -2561,6 +2614,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>
@@ -2712,6 +2787,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;
         }
 
@@ -3459,6 +3584,18 @@
             return list;
         }
 
+        /// <summary>
+        /// 澶勭悊鏂板鐢熶骇鍋滃伐鎭㈠鍗曠殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Models.ClsSc_MESStopRestoreWorkBillMain> getObjectByJson_Gy_MESStopRestoreWorkBillMain(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Models.ClsSc_MESStopRestoreWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESStopRestoreWorkBillMain>>(jsonString);
+            return list;
+        }
+
 
         /// <summary>
         /// 澶勭悊鏂板妯″叿鐐规璁板綍琛ㄥ崟琛ㄧ殑json
@@ -3575,6 +3712,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
@@ -3585,6 +3733,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;
         }
 
@@ -3736,6 +3896,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