From a91fdba94705dd25cecccc7a4a5dcc2b3f2c09a6 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 22 十二月 2025 16:16:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/ListModels.cs | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 286 insertions(+), 4 deletions(-)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index ba58962..6bcf816 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>
@@ -674,7 +699,17 @@
return list;
}
-
+ /// <summary>
+ /// 澶勭悊妫�楠屼华鍣ㄨ褰曞崟鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_QCVerificationBillMain> getObjectByJson_Gy_QCVerificationBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_QCVerificationBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_QCVerificationBillMain>>(jsonString);
+ return list;
+ }
/// <summary>
/// 澶勭悊鏂板妯″叿缁翠慨瀛愯〃淇濆吇淇℃伅鐨刯son
/// </summary>
@@ -698,6 +733,18 @@
List<Model.ClsSb_MouldRepairWorkBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillSub_Item>>(jsonString);
return list;
}
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿缁翠慨瀛愯〃閰嶄欢淇℃伅鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_QCVerificationBillSub> getObjectByJson_Gy_QCVerificationBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_QCVerificationBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_QCVerificationBillSub>>(jsonString);
+ return list;
+ }
+
/// <summary>
/// 澶勭悊鏂板妯″叿缁翠慨楠屾敹鍗曚富琛ㄧ殑json
@@ -921,6 +968,7 @@
List<Model.ClsSc_MouldMaintainPlanBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainPlanBillSub_Item>>(jsonString);
return list;
}
+
/// <summary>
/// 澶勭悊鏂板涓嶈壇鍘熷洜琛ㄧ殑json
@@ -934,6 +982,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>
@@ -1185,6 +1245,19 @@
List<Model.ClsGy_ProjectMoney_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectMoney_Model>>(jsonString);
return list;
}
+
+ /// <summary>
+ /// 澶勭悊鏂板椤圭洰璐圭敤琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_ItemMoney_Model> getObjectByJson_Gy_ItemMoney(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_ItemMoney_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ItemMoney_Model>>(jsonString);
+ return list;
+ }
+
/// <summary>
/// 澶勭悊鏂板椤圭洰璐圭敤鍒嗙被琛ㄧ殑json
@@ -2332,6 +2405,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 +2500,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
@@ -3285,9 +3432,30 @@
List<Model.ClsGy_MaterPreventErrMouldBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaterPreventErrMouldBillMain>>(jsonString);
return list;
}
-
-
/// <summary>
+ /// 澶勭悊鎵胯繍鍚堝悓娓呭崟涓昏〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsCg_ContractTransportBillMain> getObjectByJson_ContractTransportBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsCg_ContractTransportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_ContractTransportBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>ClsCg_ContractTransportBillSub
+ /// 澶勭悊鏂板鎵胯繍鍚堝悓瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsCg_ContractTransportBillSub> getObjectByJson_Cg_ContractTransportBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsCg_ContractTransportBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_ContractTransportBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>ClsCg_ContractTransportBillSub
/// 澶勭悊鏂板浜у搧鐘敊楠岃瘉娓呭崟瀛愯〃鐨刯son
/// </summary>
/// <param name="jsonString"></param>
@@ -3556,6 +3724,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;
}
@@ -3855,6 +4035,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;
}
@@ -4895,6 +5099,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)
@@ -4977,6 +5208,13 @@
return list;
}
+ public List<Model.ClsGy_Car_Model_2> getObjectByJson_Gy_Car2(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_Car_Model_2> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Car_Model_2>>(jsonString);
+ return list;
+ }
+
///浣滀笟鎸囧涔� 涓昏〃
///ClsGy_SOPBillMain
public List<Model.ClsGy_SOPBillMain> getObjectByJson_Gy_SOPBillMain(string jsonString)
@@ -4994,10 +5232,54 @@
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;
+ }
+
+ /// <summary>
+ /// 杩愬崟鐢宠 涓昏〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<ClsCg_OrderTransportBill_Model> getObjectByJson_Cg_OrderTransportBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<ClsCg_OrderTransportBill_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBill_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 杩愬崟鐢宠 瀛愯〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<ClsCg_OrderTransportBillSub_Model> getObjectByJson_Cg_OrderTransportBill_Sub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<ClsCg_OrderTransportBillSub_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBillSub_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 杩愬崟鐢宠 瀛愯〃 Money
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<ClsCg_OrderTransportBillSub_Money_Model> getObjectByJson_Cg_OrderTransportBill_SubMoney(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<ClsCg_OrderTransportBillSub_Money_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBillSub_Money_Model>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1