From 51705f1dc5802b25bc350b518272f1b068aa72b9 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 19 一月 2022 22:14:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/ListModels.cs | 266 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 237 insertions(+), 29 deletions(-)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 6a31c40..fadab98 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -583,6 +583,18 @@
}
/// <summary>
+ /// 澶勭悊鏂扮洏鐐规柟妗堣〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsGy_StockCheckItemBill> getObjectByJson_Gy_StockCheckItem(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsGy_StockCheckItemBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_StockCheckItemBill>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板妯″叿淇濆吇璁板綍琛ㄤ富琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
@@ -999,7 +1011,7 @@
return list;
} /// <summary>
- ///璁惧鐐规璁板綍琛� 涓昏〃
+ ///璁惧鐐规璁板綍琛� 涓昏〃
///ClsSb_EquipDotCheckBillMain
public List<Model.ClsSb_EquipDotCheckBillMain> getObjectByJson_Sb_EquipDotCheckBillMain(string jsonString)
{
@@ -1007,6 +1019,60 @@
List<Model.ClsSb_EquipDotCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipDotCheckBillMain>>(jsonString);
return list;
}
+
+ ///璁惧鐐规瑙勭▼琛� 涓昏〃 Models.ClsSb_EquipDotCheckRuleBillMain
+ ///ClsSb_EquipDotCheckBillMain
+ public List<Models.ClsSb_EquipDotCheckRuleBillMain> getObjectByJson_Sb_EquipDotCheckRuleBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipDotCheckRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckRuleBillMain>>(jsonString);
+ return list;
+ }
+
+ ///璁惧鐐规瑙勭▼琛� 瀛愯〃 Models.ClsSb_EquipDotCheckRuleBillMain
+ ///ClsSb_EquipDotCheckBillMain
+ public List<Models.ClsSb_EquipDotCheckRuleBillSub> getObjectByJson_Sb_EquipDotCheckRuleBillSub(string jsonString)
+ {
+ 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_EquipMaintainRuleBillMain> getObjectByJson_Sb_EquipMaintainRuleBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipMaintainRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipMaintainRuleBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 璁惧淇濆吇瑙勭▼ 閰嶄欢瀛愯〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipMaintainRuleBillSub> getObjectByJson_Sb_EquipMaintainRuleBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipMaintainRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipMaintainRuleBillSub>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 璁惧淇濆吇瑙勭▼ 淇濆吇瀛愯〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipMaintainRuleBillSub_Item> getObjectByJson_Sc_EquipMaintainRuleBillSub_Item(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipMaintainRuleBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipMaintainRuleBillSub_Item>>(jsonString);
+ return list;
+ }
+
+
///璁惧鐐规璁板綍琛� 瀛愯〃
///ClsSb_EquipDotCheckBillSub
public List<Model.ClsSb_EquipDotCheckBillSub> getObjectByJson_Sb_EquipDotCheckBillSub(string jsonString)
@@ -1263,31 +1329,7 @@
return list;
}
/// <summary>
- /// 澶勭悊宸ヨ祫涓汉缁撶畻鍗曚富琛ㄧ殑json
- /// </summary>
- /// <param name="jsonString"></param>
- /// <returns></returns>
- public List<Model.ClsPay_SingleBalBillMain> getObjectByJson_Pay_SingleBalBillMain(string jsonString)
- {
- jsonString = "[" + jsonString.ToString() + "]";
- List<Model.ClsPay_SingleBalBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_SingleBalBillMain>>(jsonString);
- return list;
- }
-
-
- /// <summary>
- /// 澶勭悊宸ヨ祫涓汉缁撶畻鍗曞瓙琛ㄧ殑json
- /// </summary>
- /// <param name="jsonString"></param>
- /// <returns></returns>
- public List<Model.ClsPay_SingleBalBillSub> getObjectByJson_Pay_SingleBalBillSub(string jsonString)
- {
- jsonString = "[" + jsonString.ToString() + "]";
- List<Model.ClsPay_SingleBalBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_SingleBalBillSub>>(jsonString);
- return list;
- }
- /// <summary>
- /// 澶勭悊鏂板妯″叿瀵垮懡璋冩暣鍗曚富琛ㄧ殑json
+ /// 澶勭悊鏂板妯″叿瀵垮懡璋冩暣鍗曞瓙琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
@@ -1297,7 +1339,6 @@
List<Model.ClsSc_MouldLifeChangeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldLifeChangeBillMain>>(jsonString);
return list;
}
-
/// <summary>
/// 澶勭悊鏂板妯″叿瀵垮懡璋冩暣鍗曞瓙琛ㄧ殑json
@@ -1624,7 +1665,19 @@
List<Models.ClsSc_MESBeginWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillMain>>(jsonString);
return list;
}
-
+
+ /// <summary>
+ /// 鎶ュ伐骞冲彴杩斿伐鍗曚富琛╦son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_ProcessPlanMain> getObjectByJson_Gy_MESReturnWorkFrom(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_ProcessPlanMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessPlanMain>>(jsonString);
+ return list;
+ }
+
/// <summary>
/// 鎶ュ伐骞冲彴浜ч噺姹囨姤涓昏〃json
/// </summary>
@@ -1716,7 +1769,7 @@
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
- public List<Models.ClsKf_MateOutBillMain> getObjectByJson_Kf_ICStockBillMain(string jsonString)
+ public List<Models.ClsKf_MateOutBillMain> getObjectByJson_Kf_MateOutBillMain(string jsonString)
{
jsonString = "[" + jsonString.ToString() + "]";
List<Models.ClsKf_MateOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsKf_MateOutBillMain>>(jsonString);
@@ -1735,5 +1788,160 @@
List<Models.ClsKf_MateOutBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsKf_MateOutBillSub>>(jsonString);
return list;
}
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsKf_ICStockBillMain> getObjectByJson_Kf_ICStockBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsKf_ICStockBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsKf_ICStockBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsKf_ICStockBillSub> getObjectByJson_Kf_ICStockBillMSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsKf_ICStockBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsKf_ICStockBillSub>>(jsonString);
+ return list;
+ }
+
+ //宸ヨ祫绠＄悊 宸ヨ祫缁撶畻鍗�(涓汉)
+ public List<Models.ClsPay_SingleBalBillMain> getObjectByJson_Pay_SingleBalBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_SingleBalBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_SingleBalBillMain>>(jsonString);
+ return list;
+ }
+ public List<Models.ClsPay_SingleBalBillSub> getObjectByJson_Pay_SingleBalBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_SingleBalBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_SingleBalBillSub>>(jsonString);
+ return list;
+ }
+
+ //宸ヨ祫绠＄悊 宸ヨ祫缁撶畻鍗�(鍏跺畠)
+ public List<Models.ClsPay_OtherBalBillMain> getObjectByJson_Pay_OtherBalBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_OtherBalBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_OtherBalBillMain>>(jsonString);
+ return list;
+ }
+ public List<Models.ClsPay_OtherBalBillSub> getObjectByJson_Pay_OtherBalBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_OtherBalBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_OtherBalBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 寮傚父鍙嶉鍗曚富琛╦son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsOA_ErrMsgBackBillMain> getObjectByJson_Gy_MESTransFerWorkFrom(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsOA_ErrMsgBackBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsOA_ErrMsgBackBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 寮傚父鍙嶉鍗曟帴鏀朵汉瀛愯〃json2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsOA_ErrMsgBackBillSub2> getObjectByJson_Gy_MESTransFerWorkBillSub2(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsOA_ErrMsgBackBillSub2> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsOA_ErrMsgBackBillSub2>>(jsonString);
+ return list;
+ }
+
+ #region 宸ヨ祫璁＄畻鍗� 闆嗕綋
+ public List<Models.ClsPay_GroupBalBillMain> getObjectByJson_Pay_GroupBalBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_GroupBalBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_GroupBalBillMain>>(jsonString);
+ return list;
+ }
+ public List<Models.ClsPay_GroupBalBillSub> getObjectByJson_Pay_GroupBalBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_GroupBalBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_GroupBalBillSub>>(jsonString);
+ return list;
+ }
+ public List<Models.ClsPay_GroupBalBillEmp> getObjectByJson_Pay_GroupBalBillEmp(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_GroupBalBillEmp> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_GroupBalBillEmp>>(jsonString);
+ return list;
+ }
+ #endregion
+
+ #region 鑰冨嫟姹囨姤鍗�
+ public List<Models.ClsPay_WorkTimesBillMain> getObjectByJson_Pay_WorkTimesBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_WorkTimesBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_WorkTimesBillMain>>(jsonString);
+ return list;
+ }
+ public List<Models.ClsPay_WorkTimesBillSub> getObjectByJson_Pay_WorkTimesBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_WorkTimesBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_WorkTimesBillSub>>(jsonString);
+ return list;
+ }
+ #endregion
+ #region 鐝粍鑱屽憳娓呭崟
+ public List<Models.ClsGy_GroupEmpListMain> getObjectByJson_Gy_GroupEmpListMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsGy_GroupEmpListMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_GroupEmpListMain>>(jsonString);
+ return list;
+ }
+ public List<Models.ClsGy_GroupEmpListSub> getObjectByJson_Gy_GroupEmpListSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsGy_GroupEmpListSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_GroupEmpListSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
+ /// <summary>
+ /// 鎶ュ伐鍙板伐搴忔眹鎶ュ崟涓昏〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSc_ProcessReportMain> getObjectByJson_ProcessReportMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSc_ProcessReportMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ProcessReportMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 鎶ュ伐鍙板伐搴忔眹鎶ュ崟瀛愯〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSc_ProcessReportSub> getObjectByJson_ProcessReportSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSc_ProcessReportSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ProcessReportSub>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1