From d4f7212718f775586ffba74960d78dca5ee4aad2 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 19 九月 2024 09:03:37 +0800
Subject: [PATCH] 1.工艺参数点检:增加附件上传功能 2.设备工艺参数趋势图:根据流转卡的子表进站出站时间查询工艺参数(增加一个选择框 采集来源:(设备采集,手动输入)) 3.开工:增加设备启动点检,防错验证控制 .设备/模具:保养规程 表头增加 HErrWarDays int --预警天数 2.设备/模具:保养计划单增加HErrBeginTime datetime --预警开始时间点,审核时把子表 预警开始时间点, 填入 3.设备启动点检清单/启动点检清单:增加字段HDotCheckType varchar(50) --点检类型(设备,模具,作业指导书,检验指导书) HRelationID int --关联ID(设备内码或模具内码)
---
WebAPI/ListModels.cs | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 1 deletions(-)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 14979fa..3511795 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -7,6 +7,7 @@
using System.Text;
using WebAPI.Code;
using Model;
+using System.Data;
namespace WebAPI
{
@@ -836,6 +837,18 @@
}
/// <summary>
+ /// 澶勭悊鏂板宸ュ簭娴佽浆鍗″瓙琛�2鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit> getObjectByJson_Sc_ProcessExchangeBillSub_BatchSplit(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板鍑虹珯姹囨姤鍗曚富琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
@@ -1099,7 +1112,19 @@
List<Model.ClsGy_CusType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CusType_Model>>(jsonString);
return list;
}
-
+
+ /// <summary>
+ /// 澶勭悊鏂板宸ヨ壓鍙傛暟鍒嗙被琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_TechnologyParameterType_Model> getObjectByJson_Gy_TechnologyParameterType(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_TechnologyParameterType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_TechnologyParameterType_Model>>(jsonString);
+ return list;
+ }
+
/// <summary>
/// 澶勭悊鏂板渚涘簲鍟嗗垎绫昏〃鐨刯son
/// </summary>
@@ -1383,6 +1408,18 @@
{
jsonString = "[" + jsonString.ToString() + "]";
List<Model.ClsSb_EquipRepairSignBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipRepairSignBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊璁惧缁翠慨绛惧埌鍗曚富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipRepairSignBillMain> getObjectByJson_Sb_EquipRepairSignBill_PDA(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipRepairSignBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipRepairSignBillMain>>(jsonString);
return list;
}
@@ -3827,6 +3864,32 @@
}
#endregion
+
+ #region 瀹㈡埛椤圭洰淇℃伅
+ /// <summary>
+ /// 瀹㈡埛椤圭洰淇℃伅涓昏〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsPM_CustomerProInfoBillMain> getObjectByJson_ClsPM_CustomerProInfoBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsPM_CustomerProInfoBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_CustomerProInfoBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 瀹㈡埛椤圭洰淇℃伅瀛愯〃json2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsPM_CustomerProInfoBillSub> getObjectByJson_ClsPM_CustomerProInfoBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsPM_CustomerProInfoBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_CustomerProInfoBillSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
#region 搴旀敹鍗�
/// <summary>
/// 搴旀敹鍗曚富琛╦son
@@ -4350,5 +4413,9 @@
return list;
}
+ public static implicit operator ListModels(DataTable v)
+ {
+ throw new NotImplementedException();
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1