From b9c3841df9f9b0d1b365efd734a989976524d791 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 27 五月 2024 08:46:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/ListModels.cs | 380 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 379 insertions(+), 1 deletions(-)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 91a59dd..f791426 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -395,6 +395,54 @@
}
/// <summary>
+ /// 澶勭悊鏂板涓嶈壇鍝佽瘎瀹＄敵璇峰崟琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsQC_NoPassProdRequestBillMain> getObjectByJson_QC_NoPassProdRequestBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_NoPassProdRequestBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_NoPassProdRequestBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板涓嶈壇鍝佽瘎瀹″鐞嗗崟琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsQC_NoPassProdDisposeBillMain> getObjectByJson_QC_NoPassProdDisposeBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_NoPassProdDisposeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_NoPassProdDisposeBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板涓嶈壇鍝佽瘎瀹″鐞嗛獙鏀跺崟琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsQC_NoPassProdDisposeCheckBillMain> getObjectByJson_QC_NoPassProdDisposeCheckBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_NoPassProdDisposeCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_NoPassProdDisposeCheckBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板涓嶈壇鍝佽瘎瀹＄粨璁哄崟琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsQC_NoPassProdConclusionBillMain> getObjectByJson_QC_NoPassProdConclusionBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_NoPassProdConclusionBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_NoPassProdConclusionBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板閮ㄩ棬鍩虹璧勬枡鐨凧SON
/// </summary>
/// <param name="jsonString"></param>
@@ -848,6 +896,18 @@
}
/// <summary>
+ /// 澶勭悊鏂板涓嶈壇鐜拌薄琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_BadPhenomena_Model> getObjectByJson_Gy_BadPhenomena(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_BadPhenomena_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_BadPhenomena_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板妫�娴嬪�艰〃鐨刯son
/// </summary>
/// <param name="jsonString"></param>
@@ -1064,6 +1124,66 @@
}
/// <summary>
+ /// 澶勭悊鏂板闃查敊瑁呯疆琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_PreventErrMould_Model> getObjectByJson_Gy_PreventErrMould(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_PreventErrMould_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PreventErrMould_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板淇濆吇绾у埆琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_MaintainLev_Model> getObjectByJson_Gy_MaintainLev(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_MaintainLev_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaintainLev_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板鍚姩妫�鏌ラ」鐩〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_CheckNoteItem_Model> getObjectByJson_Gy_CheckNoteItem(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_CheckNoteItem_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CheckNoteItem_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板椤圭洰绫诲埆琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_ProjectClass_Model> getObjectByJson_Gy_ProjectClass(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_ProjectClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectClass_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板椤圭洰绫诲埆琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_TaskClass_Model> getObjectByJson_Gy_TaskClass(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_TaskClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_TaskClass_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板寮傚父鍙嶉鎺ユ敹鍗曡〃鐨刯son
/// </summary>
/// <param name="jsonString"></param>
@@ -1182,6 +1302,30 @@
}
/// <summary>
+ /// 澶勭悊瀹夌伅閫愮骇鍛煎惛瑙勫垯涓昏〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsOA_AndengFlowRuleBillMain> getObjectByJson_OA_AndengFlowRuleBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsOA_AndengFlowRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsOA_AndengFlowRuleBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊瀹夌伅閫愮骇鍛煎惛瑙勫垯瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsOA_AndengFlowRuleBillSub> getObjectByJson_OA_AndengFlowRuleBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsOA_AndengFlowRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsOA_AndengFlowRuleBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板憳宸ユ妧鑳芥竻鍗曚富琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
@@ -1273,7 +1417,54 @@
List<Model.ClsPM_ProjectMoneyBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_ProjectMoneyBillSub>>(jsonString);
return list;
}
-
+
+ /// <summary>
+ /// 澶勭悊鏂板浠诲姟璐圭敤涓昏〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsPM_WorkTaskMoneyBillMain> getObjectByJson_锘縋M_WorkTaskMoneyBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsPM_WorkTaskMoneyBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_WorkTaskMoneyBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 澶勭悊鏂板浠诲姟璐圭敤瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsPM_WorkTaskMoneyBillSub> getObjectByJson_锘縋M_WorkTaskMoneyBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsPM_WorkTaskMoneyBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_WorkTaskMoneyBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板璁惧鍋滄満鍗曚富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSb_EquipStopBillMain> getObjectByJson_锘縎b_EquipStopBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSb_EquipStopBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipStopBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板璁惧寮�鏈哄崟涓昏〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSb_EquipBeginBillMain> getObjectByJson_锘縎b_EquipBeginBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSb_EquipBeginBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipBeginBillMain>>(jsonString);
+ return list;
+ }
+
/// <summary>
/// 澶勭悊鏂板椤圭洰鍚姩琛ㄧ殑json
/// </summary>
@@ -1660,6 +1851,30 @@
{
jsonString = "[" + jsonString.ToString() + "]";
List<Models.ClsGy_Material_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Material_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板鐐规椤圭洰鍒嗙被琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_DotCheckItemClass_Model> getObjectByJson_Gy_DotCheckItemClass(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_DotCheckItemClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_DotCheckItemClass_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板鐐规鏂规硶琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_DotCheckItemMethod_Model> getObjectByJson_Gy_DotCheckItemMethod(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_DotCheckItemMethod_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_DotCheckItemMethod_Model>>(jsonString);
return list;
}
@@ -2590,6 +2805,108 @@
List<Model.ClsSc_MouldProdMoveBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdMoveBillSub>>(jsonString);
return list;
}
+
+
+ /// <summary>
+ /// 澶勭悊鏂板鍚姩鐐规涓昏〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_WorkBeginDotCheckBillMain> getObjectByJson_Sc_WorkBeginDotCheckBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_WorkBeginDotCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_WorkBeginDotCheckBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板鍚姩鐐规瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_WorkBeginDotCheckBillSub> getObjectByJson_Sc_WorkBeginDotCheckBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_WorkBeginDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_WorkBeginDotCheckBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板璁惧鍚姩鐐规娓呭崟涓昏〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_WorkBeginDotCheckListBillMain> getObjectByJson_Gy_WorkBeginDotCheckListBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_WorkBeginDotCheckListBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_WorkBeginDotCheckListBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板璁惧鍚姩鐐规娓呭崟瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_WorkBeginDotCheckListBillSub> getObjectByJson_Gy_WorkBeginDotCheckListBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_WorkBeginDotCheckListBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_WorkBeginDotCheckListBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板浜у搧闃查敊楠岃瘉娓呭崟涓昏〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_MaterPreventErrMouldBillMain> getObjectByJson_Gy_MaterPreventErrMouldBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ 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.ClsGy_MaterPreventErrMouldBillSub> getObjectByJson_Gy_MaterPreventErrMouldBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_MaterPreventErrMouldBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaterPreventErrMouldBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板闃查敊楠岃瘉妫�鏌ヤ富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsQc_PreventErrMouldCheckBillMain> getObjectByJson_Qc_PreventErrMouldCheckBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQc_PreventErrMouldCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQc_PreventErrMouldCheckBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板闃查敊楠岃瘉妫�鏌ュ瓙琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsQc_PreventErrMouldCheckBillSub> getObjectByJson_Qc_PreventErrMouldCheckBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQc_PreventErrMouldCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQc_PreventErrMouldCheckBillSub>>(jsonString);
+ return list;
+ }
+
/// <summary>
/// 澶勭悊鏂板鍣ㄥ叿鍒嗗竷寮忚皟鍏ュ崟涓昏〃鐨刯son
/// </summary>
@@ -3475,6 +3792,31 @@
}
#endregion
+ #region 鐢熶骇璐ㄩ噺姹囨姤鍗�
+ /// <summary>
+ /// 鐢熶骇璐ㄩ噺姹囨姤鍗曚富琛╦son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_QualityReportBillMain> getObjectByJson_Sc_QualityReportBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_QualityReportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_QualityReportBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 鐢熶骇璐ㄩ噺姹囨姤鍗曞瓙琛╦son2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_QualityReportBillSub> getObjectByJson_Sc_QualityReportBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_QualityReportBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_QualityReportBillSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
#region 浠樻鍗�
/// <summary>
/// 浠樻鍗曚富琛╦son
@@ -3807,6 +4149,24 @@
return list;
}
+ ///搴撳瓨妫�楠屽崟 瀛欒〃
+ ///ClsQC_StockCheckBillSub_ValueGrid
+ public List<Model.ClsQC_StockCheckBillSub_ValueGrid> getObjectByJson_ClsQC_StockCheckBillSub_ValueGrid(string jsonString)
+ {
+ //jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_StockCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_StockCheckBillSub_ValueGrid>>(jsonString);
+ return list;
+ }
+
+ ///杞﹂棿鑷鍗� 瀛欒〃
+ ///ClsQC_WorkSelfCheckBillSub_ValueGrid
+ public List<Model.ClsQC_WorkSelfCheckBillSub_ValueGrid> getObjectByJson_ClsQC_WorkSelfCheckBillSub_ValueGrid(string jsonString)
+ {
+ //jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_WorkSelfCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_WorkSelfCheckBillSub_ValueGrid>>(jsonString);
+ return list;
+ }
+
///宸ュ簭妫�楠屽崟 瀛欒〃
///ClsQC_ProcessCheckBillSub_ValueGrid
public List<Model.ClsQC_ProcessCheckBillSub_ValueGrid> getObjectByJson_ClsQC_ProcessCheckBillSub_ValueGrid(string jsonString)
@@ -3853,5 +4213,23 @@
return list;
}
+ ///浣滀笟鎸囧涔� 涓昏〃
+ ///ClsGy_SOPBillMain
+ public List<Model.ClsGy_SOPBillMain> getObjectByJson_Gy_SOPBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_SOPBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SOPBillMain>>(jsonString);
+ return list;
+ }
+
+ ///浣滀笟鎸囧涔� 瀛愯〃
+ ///ClsGy_SOPBillSub
+ public List<Model.ClsGy_SOPBillSub> getObjectByJson_Gy_SOPBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_SOPBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SOPBillSub>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1