From ea71b5007cf508dc30aab6b5792bde89f80292aa Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 30 五月 2025 11:11:59 +0800
Subject: [PATCH] 上料防错单 选着生产设备基础资料增加 工作中心过滤 增加 设备点检， 环境点检记录表，防错措施 报表查询方法
---
WebAPI/ListModels.cs | 137 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 136 insertions(+), 1 deletions(-)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 3842248..0707b17 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -8,6 +8,7 @@
using WebAPI.Code;
using Model;
using System.Data;
+using System.Text.RegularExpressions;
namespace WebAPI
{
@@ -1174,6 +1175,18 @@
}
/// <summary>
+ /// 澶勭悊鏂板璁惧鑺傛媿琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsEqiupMaterWorkTimes_Model> getObjectByJson_EqiupMaterWorkTimes(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsEqiupMaterWorkTimes_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsEqiupMaterWorkTimes_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板绠″緞琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
@@ -2130,7 +2143,10 @@
/// <returns></returns>
public List<Models.ClsGy_Material_Model> getObjectByJson_Gy_Material(string jsonString)
{
- jsonString = "[" + jsonString.ToString() + "]";
+ if (Regex.IsMatch(jsonString, @"^\[.*\]$") == false)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ }
List<Models.ClsGy_Material_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Material_Model>>(jsonString);
return list;
}
@@ -2148,6 +2164,18 @@
}
/// <summary>
+ /// 澶勭悊鏂板宸℃椤圭洰鍒嗙被琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_PatrolCheckItemClass_Model> getObjectByJson_Gy_PatrolCheckItemClass(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_PatrolCheckItemClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PatrolCheckItemClass_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板鐐规鏂规硶琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
@@ -2156,6 +2184,18 @@
{
jsonString = "[" + jsonString.ToString() + "]";
List<Model.ClsGy_DotCheckItemMethod_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_DotCheckItemMethod_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板宸℃鏂规硶琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_PatrolCheckItemMethod_Model> getObjectByJson_Gy_PatrolCheckItemMethod(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_PatrolCheckItemMethod_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PatrolCheckItemMethod_Model>>(jsonString);
return list;
}
@@ -2525,6 +2565,28 @@
return list;
}
+ /// <summary>
+ /// 璁惧宸℃璁″垝鍗� 涓昏〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSb_EquipPatrolCheckPlanBillMain> getObjectByJson_Sb_EquipPatrolCheckPlanBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSb_EquipPatrolCheckPlanBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipPatrolCheckPlanBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 璁惧宸℃璁″垝鍗� 瀛愯〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSb_EquipPatrolCheckPlanBillSub> getObjectByJson_Sb_EquipPatrolCheckPlanBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSb_EquipPatrolCheckPlanBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipPatrolCheckPlanBillSub>>(jsonString);
+ return list;
+ }
/// <summary>
@@ -2676,6 +2738,56 @@
{
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_EquipPatrolCheckRuleBillMain> getObjectByJson_Sb_EquipPatrolCheckRuleBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipPatrolCheckRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipPatrolCheckRuleBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 璁惧宸℃瑙勭▼琛� 瀛愯〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipPatrolCheckRuleBillSub> getObjectByJson_Sb_EquipPatrolCheckRuleBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipPatrolCheckRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipPatrolCheckRuleBillSub>>(jsonString);
+ return list;
+ }
+
+
+
+ /// <summary>
+ /// 璁惧宸℃璁板綍琛� 涓昏〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSb_EquipPatrolCheckBillMain> getObjectByJson_Sb_EquipPatrolCheckBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSb_EquipPatrolCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipPatrolCheckBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 璁惧宸℃璁板綍琛� 瀛愯〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSb_EquipPatrolCheckBillSub> getObjectByJson_Sb_EquipPatrolCheckBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSb_EquipPatrolCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipPatrolCheckBillSub>>(jsonString);
return list;
}
@@ -3539,6 +3651,17 @@
return list;
}
+ /// <summary>
+ /// PDA澶勭悊鏂板璁惧宸℃璁板綍鍗曚富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipPatrolCheckBillMain> getObjectByJson_Sb_EquipPatrolCheckBillMainPDA(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipPatrolCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipPatrolCheckBillMain>>(jsonString);
+ return list;
+ }
/// <summary>
/// PDA澶勭悊鏂板璁惧鐐规璁板綍鍗曞瓙琛ㄧ殑json
@@ -3553,6 +3676,18 @@
}
/// <summary>
+ /// PDA澶勭悊鏂板璁惧宸℃璁板綍鍗曞瓙琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipPatrolCheckBillSub> getObjectByJson_Sb_EquipPatrolCheckBillSubPDA(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipPatrolCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipPatrolCheckBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// PDA澶勭悊鏂板璁惧淇濆吇璁板綍鍗曚富琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
--
Gitblit v1.9.1