From 2087c9488e478c95509da9e7ed942ca7a62f9f50 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期二, 10 九月 2024 09:43:30 +0800 Subject: [PATCH] 增加异常工艺参数预警列表信息查询 --- WebAPI/WebAPI.csproj.user | 4 +- WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs | 49 ++++++++++++++++++++++++ WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user | 44 +++++++++++----------- 3 files changed, 73 insertions(+), 24 deletions(-) diff --git a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs index 0ae4bd1..1a3e078 100644 --- a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs +++ b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs @@ -799,6 +799,55 @@ #endregion + #region 寮傚父宸ヨ壓鍙傛暟棰勮鍒楄〃淇℃伅 + /// <summary> + /// 寮傚父宸ヨ壓鍙傛暟棰勮鍒楄〃淇℃伅 + /// </summary> + /// <returns></returns> + [Route("SB_EquipICMOTechParamBillController/GetSb_EquipMentCollectionTechParam_ERR")] + [HttpGet] + public object GetSb_EquipMentCollectionTechParam_ERR(string sWhere, string HMaker) + { + try + { + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, HMaker)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠$悊鍛樿仈绯伙紒"; + objJsonResult.data = null; + return objJsonResult; + } + + //杩斿洖鍒楄〃淇℃伅 + ds = oCn.RunProcReturn("select * from h_v_Sb_EquipMentCollectionTechParam_ERRList where 1=1 " + sWhere + " order by 鍙戠幇寮傚父鏃堕棿 desc", "h_v_Sb_EquipMentCollectionTechParam_ERRList"); + List<object> columnNameList = new List<object>(); + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + } diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user index e755bae..d4a3747 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user @@ -4,7 +4,7 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <History>True|2024-09-06T09:00:13.2484828Z;False|2024-09-06T17:00:06.1281061+08:00;True|2024-09-05T11:39:53.4537518+08:00;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History> + <History>True|2024-09-09T11:14:08.0718627Z;True|2024-09-09T19:08:42.5709780+08:00;False|2024-09-09T19:08:33.7817129+08:00;True|2024-09-06T17:00:13.2484828+08:00;False|2024-09-06T17:00:06.1281061+08:00;True|2024-09-05T11:39:53.4537518+08:00;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History> <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>09/06/2024 16:59:21</publishTime> + <publishTime>09/09/2024 19:13:43</publishTime> </File> <File Include="bin/BLL.pdb"> - <publishTime>09/06/2024 16:59:21</publishTime> + <publishTime>09/09/2024 19:13:43</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>09/06/2024 16:59:19</publishTime> + <publishTime>09/09/2024 19:13:42</publishTime> </File> <File Include="bin/DAL.pdb"> - <publishTime>09/06/2024 16:59:19</publishTime> + <publishTime>09/09/2024 19:13:42</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>09/06/2024 16:59:17</publishTime> + <publishTime>09/09/2024 19:13:40</publishTime> </File> <File Include="bin/DBUtility.pdb"> - <publishTime>09/06/2024 16:59:17</publishTime> + <publishTime>09/09/2024 19:13:40</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -111,10 +111,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>09/06/2024 16:59:18</publishTime> + <publishTime>09/09/2024 19:13:40</publishTime> </File> <File Include="bin/Model.pdb"> - <publishTime>09/06/2024 16:59:18</publishTime> + <publishTime>09/09/2024 19:13:40</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>05/25/2024 09:46:41</publishTime> @@ -147,34 +147,34 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>09/06/2024 16:59:15</publishTime> + <publishTime>09/09/2024 19:13:38</publishTime> </File> <File Include="bin/Pub_Class.pdb"> - <publishTime>09/06/2024 16:59:15</publishTime> + <publishTime>09/09/2024 19:13:38</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>09/06/2024 16:59:15</publishTime> + <publishTime>09/09/2024 19:13:39</publishTime> </File> <File Include="bin/Pub_Control.pdb"> - <publishTime>09/06/2024 16:59:15</publishTime> + <publishTime>09/09/2024 19:13:39</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>09/06/2024 16:59:16</publishTime> + <publishTime>09/09/2024 19:13:39</publishTime> </File> <File Include="bin/SQLHelper.pdb"> - <publishTime>09/06/2024 16:59:16</publishTime> + <publishTime>09/09/2024 19:13:39</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> - <publishTime>09/05/2024 13:47:05</publishTime> + <publishTime>09/09/2024 19:13:38</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> - <publishTime>09/05/2024 13:47:05</publishTime> + <publishTime>09/09/2024 19:13:38</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> @@ -285,19 +285,19 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> - <publishTime>09/06/2024 16:59:16</publishTime> + <publishTime>09/09/2024 19:13:41</publishTime> </File> <File Include="bin/TopSdk.pdb"> - <publishTime>09/06/2024 16:59:16</publishTime> + <publishTime>09/09/2024 19:13:41</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>09/06/2024 16:59:44</publishTime> + <publishTime>09/09/2024 19:14:01</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>09/06/2024 16:59:44</publishTime> + <publishTime>09/09/2024 19:14:01</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -492,7 +492,7 @@ <publishTime>05/25/2024 09:46:41</publishTime> </File> <File Include="Web.config"> - <publishTime>09/06/2024 17:00:11</publishTime> + <publishTime>09/09/2024 19:14:07</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user index 8f42713..f882051 100644 --- a/WebAPI/WebAPI.csproj.user +++ b/WebAPI/WebAPI.csproj.user @@ -9,8 +9,8 @@ <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> - <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠g爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile5.pubxml</NameOfLastUsedPublishProfile> - <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> + <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile> + <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> -- Gitblit v1.9.1