From 5716ea802df23b110d2e30159775dc33778b1dd6 Mon Sep 17 00:00:00 2001 From: liangjunyu <13726812+shifang-tianhua_0@user.noreply.gitee.com> Date: Thu, 11 Sep 2025 17:50:45 +0800 Subject: [PATCH] 1 --- .../Alter_Table_r_ERPPutOperationAnchor.sql | 5 ++++ Controllers/EnpowerApiController.cs | 28 +++++++++++++------ Models/ERPPutOperationAnchor.cs | 1 + .../PublishProfiles/FolderProfile.pubxml.user | 2 +- RB_MES_APICore.csproj.user | 2 +- 5 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 Context/SQL/Alter_Table_r_ERPPutOperationAnchor.sql diff --git a/Context/SQL/Alter_Table_r_ERPPutOperationAnchor.sql b/Context/SQL/Alter_Table_r_ERPPutOperationAnchor.sql new file mode 100644 index 0000000..f7e5b32 --- /dev/null +++ b/Context/SQL/Alter_Table_r_ERPPutOperationAnchor.sql @@ -0,0 +1,5 @@ +ALTER TABLE r_ERPPutOperationAnchor ALTER COLUMN QUEUE_ID VARCHAR(50); + +CREATE INDEX IDX_r_ERPPutOperationAnchor_QUEUE_ID ON r_ERPPutOperationAnchor(QUEUE_ID); + + diff --git a/Controllers/EnpowerApiController.cs b/Controllers/EnpowerApiController.cs index fb0bcad..6278091 100644 --- a/Controllers/EnpowerApiController.cs +++ b/Controllers/EnpowerApiController.cs @@ -1065,7 +1065,7 @@ namespace RB_MES_API.Controllers stopwatch.Stop(); // 获取执行时间 TimeSpan elapsed = stopwatch.Elapsed; - LogHelper.WriteLog($"执行时间: {elapsed.TotalMilliseconds} 毫秒"); + LogHelper.WriteLog($"云星空API执行时间: {elapsed.TotalMilliseconds} 毫秒"); //如果访问正常 List> billnos = new List>(); @@ -1884,6 +1884,11 @@ namespace RB_MES_API.Controllers [Route("DataSave_Batch")] public async Task PostAsync([FromBody] RequestParm parm) { + Stopwatch stopwatchAll = new Stopwatch(); + // 开始计时 + stopwatchAll.Start(); + + //LogHelper.WriteLog(string.Format("收到MES数据：{0}", parm.DocType)); BreakData breakData = new BreakData() { Status = false }; if (parm == null) @@ -2211,6 +2216,13 @@ namespace RB_MES_API.Controllers E: string result = JsonConvert.SerializeObject(breakData); _shareController._SqlloggerInvoke(2, DocType, !breakData.Status ? result : "", data, breakData.Status, guid); + + // 停止计时 + stopwatchAll.Stop(); + // 获取执行时间 + TimeSpan elapsed = stopwatchAll.Elapsed; + LogHelper.WriteLog($"接口总执行时间: {elapsed.TotalMilliseconds} 毫秒"); + return result; } @@ -7685,7 +7697,7 @@ namespace RB_MES_API.Controllers // 停止计时 ExistsDoubleQueidWatch.Stop(); // 获取执行时间 - LogHelper.WriteLog($"校验是否有重复推单执行时间: {ExistsDoubleQueidWatch.Elapsed.TotalMilliseconds} 毫秒"); + LogHelper.WriteLog($"生产领料单_校验是否有重复推单执行时间: {ExistsDoubleQueidWatch.Elapsed.TotalMilliseconds} 毫秒"); if (breakData.Status || !string.IsNullOrEmpty(breakData.Message.ToString())) { @@ -7725,7 +7737,7 @@ namespace RB_MES_API.Controllers // 停止计时 sourcebillsWatch.Stop(); // 获取执行时间 - LogHelper.WriteLog($"获取源单执行时间: {sourcebillsWatch.Elapsed.TotalMilliseconds} 毫秒"); + LogHelper.WriteLog($"生产领料单_获取源单执行时间: {sourcebillsWatch.Elapsed.TotalMilliseconds} 毫秒"); if (!string.IsNullOrWhiteSpace(reason)) { @@ -7746,8 +7758,8 @@ namespace RB_MES_API.Controllers // 停止计时 dataConvertWatch.Stop(); // 获取执行时间 - LogHelper.WriteLog($"数据转换执行时间: {dataConvertWatch.Elapsed.TotalMilliseconds} 毫秒"); - + LogHelper.WriteLog($"生产领料单_数据转换执行时间: {dataConvertWatch.Elapsed.TotalMilliseconds} 毫秒"); + if (!string.IsNullOrWhiteSpace(reason)) { breakData.Message = reason; @@ -7817,7 +7829,7 @@ namespace RB_MES_API.Controllers stopwatchAll.Stop(); // 获取执行时间 TimeSpan elapsed = stopwatchAll.Elapsed; - LogHelper.WriteLog($"总执行时间: {elapsed.TotalMilliseconds} 毫秒"); + LogHelper.WriteLog($"生产领料单_总执行时间: {elapsed.TotalMilliseconds} 毫秒"); return breakData; } @@ -11102,9 +11114,7 @@ namespace RB_MES_API.Controllers if (queueIds.Any() && fm_post != null) { - var dataList = _context.r_ERPPutOperationAnchor - .Where(w => w.FDocType == docType && queueIds.Contains(w.QUEUE_ID)) - .ToList(); + var dataList = _context.r_ERPPutOperationAnchor.Where(w => w.FDocType == docType && queueIds.Contains(w.QUEUE_ID)).ToList(); if (dataList != null && dataList.Any()) { diff --git a/Models/ERPPutOperationAnchor.cs b/Models/ERPPutOperationAnchor.cs index 54f284a..d5b03f0 100644 --- a/Models/ERPPutOperationAnchor.cs +++ b/Models/ERPPutOperationAnchor.cs @@ -51,6 +51,7 @@ namespace RB_MES_APICore.Models public int FOperationResult { get; set; } [DisplayName("MES队列ID")] + [StringLength(50)] public string QUEUE_ID { get; set; } } } diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/Properties/PublishProfiles/FolderProfile.pubxml.user index 425c832..feb45c6 100644 --- a/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\WebSite\RBAPI - True|2025-09-09T09:11:14.6930554Z||;True|2025-09-09T17:02:53.5991796+08:00||;True|2025-09-09T16:44:32.5603697+08:00||;True|2025-09-09T16:13:19.5399031+08:00||;True|2025-09-04T09:47:55.0421904+08:00||;True|2025-02-27T09:55:37.6053113+08:00||;True|2025-02-27T09:54:36.3234126+08:00||;True|2025-02-27T09:46:13.6707513+08:00||;True|2025-02-19T04:03:03.9495931+08:00||;True|2025-02-18T16:35:04.9817308+08:00||;True|2025-02-18T04:20:46.0300999+08:00||;True|2025-02-11T03:32:57.1178800+08:00||;True|2025-01-17T12:16:10.4181111+08:00||;True|2025-01-14T03:39:58.4571946+08:00||;True|2025-01-08T11:32:01.3278361+08:00||;True|2025-01-07T18:08:24.2389428+08:00||;True|2025-01-07T02:12:16.6304242+08:00||;True|2025-01-03T17:11:11.7211857+08:00||;True|2024-12-02T09:15:59.0398045+08:00||;True|2024-11-28T14:15:49.4012503+08:00||;True|2024-11-22T12:17:43.9000614+08:00||;True|2024-11-20T14:54:00.8449133+08:00||;True|2024-11-14T12:13:11.7632889+08:00||;True|2024-11-07T17:37:39.8002229+08:00||;True|2024-11-07T16:09:19.9460688+08:00||;True|2024-11-06T19:38:26.5807602+08:00||;True|2024-11-06T09:18:52.8613714+08:00||;True|2024-11-05T14:32:49.4354697+08:00||;True|2024-10-30T14:18:22.3060216+08:00||;True|2024-10-30T09:48:05.2100855+08:00||;True|2024-10-28T10:07:38.7905172+08:00||;True|2024-10-10T11:50:46.7475246+08:00||;True|2024-09-24T17:43:20.8118701+08:00||;True|2024-09-23T12:27:56.4866950+08:00||;True|2024-09-23T12:21:21.5453008+08:00||;True|2024-09-23T11:57:14.1104738+08:00||;True|2024-09-23T11:53:56.8882248+08:00||;True|2024-09-23T11:07:25.7167442+08:00||;True|2024-09-13T18:01:13.1392733+08:00||;True|2024-09-13T17:43:05.5110664+08:00||;True|2024-09-13T17:35:31.3780268+08:00||;True|2024-09-13T17:35:11.8269478+08:00||;True|2024-09-13T17:30:04.4393950+08:00||;True|2024-09-13T17:24:10.3277000+08:00||;True|2024-09-13T17:19:59.8454645+08:00||;True|2024-09-13T17:14:27.2909368+08:00||;True|2024-09-02T10:31:11.1328878+08:00||;True|2024-08-28T13:32:00.0559997+08:00||;True|2024-08-28T03:55:49.6629404+08:00||;True|2024-08-16T09:30:52.8350832+08:00||;True|2024-08-16T09:19:08.4371764+08:00||;True|2024-08-16T09:18:09.0822564+08:00||;True|2024-08-16T09:17:08.5917114+08:00||;True|2024-08-16T09:14:00.5120433+08:00||;True|2024-08-16T09:04:04.4070879+08:00||;True|2024-08-14T15:59:51.6340285+08:00||;True|2024-08-14T15:33:33.8035811+08:00||;True|2024-08-14T14:48:35.4839539+08:00||;True|2024-08-14T14:38:49.1667042+08:00||;True|2024-08-14T11:40:18.1001797+08:00||;True|2024-08-14T09:31:06.6573001+08:00||;True|2024-08-14T09:15:39.6767647+08:00||;True|2024-08-14T03:55:34.6362026+08:00||;True|2024-08-02T14:27:38.1839643+08:00||;True|2024-08-02T12:27:49.6827844+08:00||;True|2024-08-01T11:48:04.1874898+08:00||;True|2024-07-31T10:06:01.8814903+08:00||;True|2024-07-24T02:34:33.0834111+08:00||;True|2024-07-18T11:17:22.0084700+08:00||;True|2024-07-17T12:32:22.9494469+08:00||;True|2024-04-23T17:16:29.5550923+08:00||;True|2024-04-22T11:55:01.6220896+08:00||;True|2024-04-22T09:44:50.9013919+08:00||;True|2024-04-19T16:10:25.7858111+08:00||;True|2024-04-19T13:59:22.3160058+08:00||;True|2024-04-19T13:09:29.5375049+08:00||;True|2024-04-19T13:02:38.5967537+08:00||;True|2024-04-19T11:53:46.1034839+08:00||;True|2024-04-19T10:55:21.6291964+08:00||;True|2024-04-18T21:42:37.9005750+08:00||;True|2024-04-18T15:41:18.3824045+08:00||;True|2024-04-17T19:00:16.4084085+08:00||;True|2024-04-17T17:51:36.1340812+08:00||;True|2024-04-15T22:22:04.3206022+08:00||;False|2024-04-15T22:20:23.0599879+08:00||;True|2024-04-15T22:00:29.5104284+08:00||;True|2024-04-15T21:53:25.7267288+08:00||;True|2024-04-15T21:42:09.2521190+08:00||;True|2024-04-15T21:31:47.3899009+08:00||;True|2024-04-15T20:58:03.7764632+08:00||;True|2024-04-15T20:55:21.6829319+08:00||;True|2024-04-15T20:49:30.2877847+08:00||;True|2024-04-15T20:42:12.3596487+08:00||;True|2024-04-15T19:47:39.7404312+08:00||;True|2024-04-15T19:33:38.3260240+08:00||;False|2024-04-15T19:32:18.8348207+08:00||;True|2024-04-15T19:21:24.0601683+08:00||;True|2024-04-15T19:10:18.1752640+08:00||;True|2024-04-15T18:40:17.6868410+08:00||;True|2024-04-15T18:27:18.2424105+08:00||; + True|2025-09-11T08:48:42.5563718Z||;True|2025-09-09T17:11:14.6930554+08:00||;True|2025-09-09T17:02:53.5991796+08:00||;True|2025-09-09T16:44:32.5603697+08:00||;True|2025-09-09T16:13:19.5399031+08:00||;True|2025-09-04T09:47:55.0421904+08:00||;True|2025-02-27T09:55:37.6053113+08:00||;True|2025-02-27T09:54:36.3234126+08:00||;True|2025-02-27T09:46:13.6707513+08:00||;True|2025-02-19T04:03:03.9495931+08:00||;True|2025-02-18T16:35:04.9817308+08:00||;True|2025-02-18T04:20:46.0300999+08:00||;True|2025-02-11T03:32:57.1178800+08:00||;True|2025-01-17T12:16:10.4181111+08:00||;True|2025-01-14T03:39:58.4571946+08:00||;True|2025-01-08T11:32:01.3278361+08:00||;True|2025-01-07T18:08:24.2389428+08:00||;True|2025-01-07T02:12:16.6304242+08:00||;True|2025-01-03T17:11:11.7211857+08:00||;True|2024-12-02T09:15:59.0398045+08:00||;True|2024-11-28T14:15:49.4012503+08:00||;True|2024-11-22T12:17:43.9000614+08:00||;True|2024-11-20T14:54:00.8449133+08:00||;True|2024-11-14T12:13:11.7632889+08:00||;True|2024-11-07T17:37:39.8002229+08:00||;True|2024-11-07T16:09:19.9460688+08:00||;True|2024-11-06T19:38:26.5807602+08:00||;True|2024-11-06T09:18:52.8613714+08:00||;True|2024-11-05T14:32:49.4354697+08:00||;True|2024-10-30T14:18:22.3060216+08:00||;True|2024-10-30T09:48:05.2100855+08:00||;True|2024-10-28T10:07:38.7905172+08:00||;True|2024-10-10T11:50:46.7475246+08:00||;True|2024-09-24T17:43:20.8118701+08:00||;True|2024-09-23T12:27:56.4866950+08:00||;True|2024-09-23T12:21:21.5453008+08:00||;True|2024-09-23T11:57:14.1104738+08:00||;True|2024-09-23T11:53:56.8882248+08:00||;True|2024-09-23T11:07:25.7167442+08:00||;True|2024-09-13T18:01:13.1392733+08:00||;True|2024-09-13T17:43:05.5110664+08:00||;True|2024-09-13T17:35:31.3780268+08:00||;True|2024-09-13T17:35:11.8269478+08:00||;True|2024-09-13T17:30:04.4393950+08:00||;True|2024-09-13T17:24:10.3277000+08:00||;True|2024-09-13T17:19:59.8454645+08:00||;True|2024-09-13T17:14:27.2909368+08:00||;True|2024-09-02T10:31:11.1328878+08:00||;True|2024-08-28T13:32:00.0559997+08:00||;True|2024-08-28T03:55:49.6629404+08:00||;True|2024-08-16T09:30:52.8350832+08:00||;True|2024-08-16T09:19:08.4371764+08:00||;True|2024-08-16T09:18:09.0822564+08:00||;True|2024-08-16T09:17:08.5917114+08:00||;True|2024-08-16T09:14:00.5120433+08:00||;True|2024-08-16T09:04:04.4070879+08:00||;True|2024-08-14T15:59:51.6340285+08:00||;True|2024-08-14T15:33:33.8035811+08:00||;True|2024-08-14T14:48:35.4839539+08:00||;True|2024-08-14T14:38:49.1667042+08:00||;True|2024-08-14T11:40:18.1001797+08:00||;True|2024-08-14T09:31:06.6573001+08:00||;True|2024-08-14T09:15:39.6767647+08:00||;True|2024-08-14T03:55:34.6362026+08:00||;True|2024-08-02T14:27:38.1839643+08:00||;True|2024-08-02T12:27:49.6827844+08:00||;True|2024-08-01T11:48:04.1874898+08:00||;True|2024-07-31T10:06:01.8814903+08:00||;True|2024-07-24T02:34:33.0834111+08:00||;True|2024-07-18T11:17:22.0084700+08:00||;True|2024-07-17T12:32:22.9494469+08:00||;True|2024-04-23T17:16:29.5550923+08:00||;True|2024-04-22T11:55:01.6220896+08:00||;True|2024-04-22T09:44:50.9013919+08:00||;True|2024-04-19T16:10:25.7858111+08:00||;True|2024-04-19T13:59:22.3160058+08:00||;True|2024-04-19T13:09:29.5375049+08:00||;True|2024-04-19T13:02:38.5967537+08:00||;True|2024-04-19T11:53:46.1034839+08:00||;True|2024-04-19T10:55:21.6291964+08:00||;True|2024-04-18T21:42:37.9005750+08:00||;True|2024-04-18T15:41:18.3824045+08:00||;True|2024-04-17T19:00:16.4084085+08:00||;True|2024-04-17T17:51:36.1340812+08:00||;True|2024-04-15T22:22:04.3206022+08:00||;False|2024-04-15T22:20:23.0599879+08:00||;True|2024-04-15T22:00:29.5104284+08:00||;True|2024-04-15T21:53:25.7267288+08:00||;True|2024-04-15T21:42:09.2521190+08:00||;True|2024-04-15T21:31:47.3899009+08:00||;True|2024-04-15T20:58:03.7764632+08:00||;True|2024-04-15T20:55:21.6829319+08:00||;True|2024-04-15T20:49:30.2877847+08:00||;True|2024-04-15T20:42:12.3596487+08:00||;True|2024-04-15T19:47:39.7404312+08:00||;True|2024-04-15T19:33:38.3260240+08:00||;False|2024-04-15T19:32:18.8348207+08:00||;True|2024-04-15T19:21:24.0601683+08:00||;True|2024-04-15T19:10:18.1752640+08:00||;True|2024-04-15T18:40:17.6868410+08:00||; \ No newline at end of file diff --git a/RB_MES_APICore.csproj.user b/RB_MES_APICore.csproj.user index 45bb916..5d84f1a 100644 --- a/RB_MES_APICore.csproj.user +++ b/RB_MES_APICore.csproj.user @@ -1,7 +1,7 @@  - D:\RBMESAPICore\RBMESAPICore\Properties\PublishProfiles\FolderProfile.pubxml + E:\Work\珠海格致软件有限公司\0.开发任务\2.珠海英搏尔电气股份有限公司\0.软件工程\RBMESAPICore\Properties\PublishProfiles\FolderProfile.pubxml RazorViewEmptyScaffolder root/Common/MVC/View