From 7cff82da32a694368779bfff7c67e7d7827b957a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 20 十月 2025 08:36:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/ListModels.cs | 274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 273 insertions(+), 1 deletions(-)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index a30b31d..10b3eb4 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;
}
@@ -577,6 +602,30 @@
}
/// <summary>
+ /// 澶勭悊鏂板鐢熶骇鍏ュ簱妫�楠屼富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsQC_LastPieceCheckBillMain> getObjectByJson_ClsQC_LastPieceCheckBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_LastPieceCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_LastPieceCheckBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板鐢熶骇鍏ュ簱妫�楠屽瓙琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsQC_LastPieceCheckBillSub> getObjectByJson_ClsQC_LastPieceCheckBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_LastPieceCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_LastPieceCheckBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板棣栦欢妫�楠屼富琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
@@ -896,6 +945,7 @@
List<Model.ClsSc_MouldMaintainPlanBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainPlanBillSub_Item>>(jsonString);
return list;
}
+
/// <summary>
/// 澶勭悊鏂板涓嶈壇鍘熷洜琛ㄧ殑json
@@ -909,6 +959,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 +2204,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;
}
@@ -2160,6 +2225,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>
@@ -2168,6 +2245,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;
}
@@ -2326,6 +2415,31 @@
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_PurPrice_Model> getObjectByJson_Gy_PurPrice(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_PurPrice_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PurPrice_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
@@ -2537,6 +2651,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>
@@ -2688,6 +2824,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;
}
@@ -3435,6 +3621,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
@@ -3551,6 +3749,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
@@ -3561,6 +3770,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;
}
@@ -3708,6 +3929,30 @@
{
jsonString = "[" + jsonString.ToString() + "]";
List<Models.ClsSc_MESBeginWorkBillSub_RelationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillSub_RelationBill>>(jsonString);
+ return list;
+ }
+
+ /// <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;
}
@@ -4748,6 +4993,33 @@
return list;
}
+ ///鏉ユ枡妫�楠屽崟 瀛欒〃
+ ///ClsQC_POStockInCheckBillSub_ValueGrid
+ public List<Model.ClsQC_POStockInCheckBillSub_ValueGrid> getObjectByJson_ClsQC_POStockInCheckBillSub_ValueGrid(string jsonString)
+ {
+ //jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_POStockInCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_POStockInCheckBillSub_ValueGrid>>(jsonString);
+ return list;
+ }
+
+ ///鐢熶骇鍏ュ簱妫�楠屽崟 瀛欒〃
+ ///ClsQC_LastPieceCheckBillSub_ValueGrid
+ public List<Model.ClsQC_LastPieceCheckBillSub_ValueGrid> getObjectByJson_ClsQC_LastPieceCheckBillSub_ValueGrid(string jsonString)
+ {
+ //jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_LastPieceCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_LastPieceCheckBillSub_ValueGrid>>(jsonString);
+ return list;
+ }
+
+ ///鍑哄巶妫�楠屽崟 瀛欒〃
+ ///ClsQC_OutCompCheckBillSub_ValueGrid
+ public List<Model.ClsQC_OutCompCheckBillSub_ValueGrid> getObjectByJson_ClsQC_OutCompCheckBillSub_ValueGrid(string jsonString)
+ {
+ //jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_OutCompCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_OutCompCheckBillSub_ValueGrid>>(jsonString);
+ return list;
+ }
+
///棣栦欢妫�楠屽崟 瀛欒〃
///ClsQC_FirstPieceCheckBillSub_ValueGrid
public List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid> getObjectByJson_ClsQC_FirstPieceCheckBillSub_ValueGrid(string jsonString)
--
Gitblit v1.9.1