From 549df1cac1529f4fc9b5d9b64e27de5d5d8b8951 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 22 十月 2025 13:53:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/ListModels.cs | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 159 insertions(+), 1 deletions(-)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 6ca5832..a5ccc91 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -9,6 +9,7 @@
using Model;
using System.Data;
using System.Text.RegularExpressions;
+using WebAPI.Models;
namespace WebAPI
{
@@ -602,6 +603,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>
@@ -921,6 +946,7 @@
List<Model.ClsSc_MouldMaintainPlanBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainPlanBillSub_Item>>(jsonString);
return list;
}
+
/// <summary>
/// 澶勭悊鏂板涓嶈壇鍘熷洜琛ㄧ殑json
@@ -934,6 +960,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>
@@ -2332,6 +2370,55 @@
}
/// <summary>
+ /// 澶勭悊涓氬姟缁勮〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_OperatorGroup> getObjectByJson_Gy_OperatorGroup(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_OperatorGroup> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_OperatorGroup>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鎶樻墸琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_DiscountList> getObjectByJson_Gy_DiscountList(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_DiscountList> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_DiscountList>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊杈呭姪璧勬枡绫诲埆鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_AssistantData> getObjectByJson_Gy_AssistantData(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_AssistantData> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_AssistantData>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊杈呭姪璧勬枡鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_AssistantDataEntry> getObjectByJson_Gy_AssistantDataEntry(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_AssistantDataEntry> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_AssistantDataEntry>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
/// 澶勭悊浣滀笟琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
@@ -2378,6 +2465,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
@@ -3556,6 +3668,18 @@
{
jsonString = "[" + jsonString.ToString() + "]";
List<Models.ClsSc_MESStopWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESStopWorkBillMain>>(jsonString);
+ 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;
}
@@ -4919,6 +5043,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)
@@ -5018,10 +5169,17 @@
List<Model.ClsGy_SOPBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SOPBillSub>>(jsonString);
return list;
}
-
+
public static implicit operator ListModels(DataTable v)
{
throw new NotImplementedException();
}
+
+ public List<ClsWW_EntrustOrderBillMain_1> getObjectByJson_WW_EntrustOrderBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<ClsWW_EntrustOrderBillMain_1> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsWW_EntrustOrderBillMain_1>>(jsonString);
+ return list;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1