From 7ef2bbeb19480bd8e4441bd51622bbb4a5c97e9e Mon Sep 17 00:00:00 2001 From: jl Date: Tue, 24 Jun 2025 15:46:02 +0800 Subject: [PATCH] --- Epost.DAL/CommandDAL.cs | 14 +++++++-- .../Controllers/WebAPIController.cs | 1 + .../PublishProfiles/Toolsweb.pubxml.user | 30 +++++++++---------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/Epost.DAL/CommandDAL.cs b/Epost.DAL/CommandDAL.cs index 343f9ee..a2a054e 100644 --- a/Epost.DAL/CommandDAL.cs +++ b/Epost.DAL/CommandDAL.cs @@ -95,7 +95,7 @@ namespace Epost.DAL public bool FORMAT_DEVICE(LabelParamModel model) { - model.Address = "9999"; + model.Address = model.Address; model.Command = "FORMAT_DEVICE"; model.Parameter = ""; model.Timeout = "0.5"; @@ -590,7 +590,17 @@ namespace Epost.DAL sendModel.Address = model.Address; sendModel.Command = model.Command; sendModel.Parameter = model.Parameter; - sendModel.Timeout = model.Timeout; + sendModel.Uid = model.Uid; + sendModel.Quantity = model.Quantity; + sendModel.Title = model.Title; + sendModel.Content = model.Content; + sendModel.Type = model.Type; + sendModel.Mode = model.Mode; + sendModel.Order = model.Order; + sendModel.Unit = model.Unit; + sendModel.W_unit = model.W_unit; + sendModel.W_quantity = model.W_quantity; + sendModel.Loc = model.Loc; try { string postStr = JsonHelper.SerializeObject(sendModel); diff --git a/Epost.TestToolsWeb/Controllers/WebAPIController.cs b/Epost.TestToolsWeb/Controllers/WebAPIController.cs index 84242e6..ede582b 100644 --- a/Epost.TestToolsWeb/Controllers/WebAPIController.cs +++ b/Epost.TestToolsWeb/Controllers/WebAPIController.cs @@ -85,6 +85,7 @@ namespace Epost.TestToolsWeb.Controllers lbmodel.Address = data.Address; lbmodel.Uid = data.Address; lbmodel.Type = data.Type; + lbmodel.ControlIP = data.IP; combll.FORMAT_DEVICE(lbmodel); LogHelper.WriteLogInfo("设备报错："+JsonHelper.SerializeObject(data), Log_Type.ERROR); } diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user index 32b53c4..f8c4ef1 100644 --- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user +++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user @@ -7,7 +7,7 @@ <_PublishTargetUrl>D:\驿传\Wuxidingshi_DAS - True|2025-06-24T02:20:08.6997539Z||;True|2025-06-23T16:45:32.2447039+08:00||;True|2025-06-19T17:51:13.7383312+08:00||;True|2025-06-19T16:33:25.6789576+08:00||;True|2025-06-19T16:31:35.8668377+08:00||;True|2025-06-17T17:16:38.1010406+08:00||;True|2025-06-15T11:14:12.6170562+08:00||;True|2025-06-15T10:42:25.1172247+08:00||;True|2025-06-14T13:26:43.2442778+08:00||;True|2025-06-10T13:21:34.1684919+08:00||;True|2025-06-09T11:40:40.2739751+08:00||;True|2025-06-08T16:20:45.8519262+08:00||;True|2025-01-16T15:37:40.8814043+08:00||;True|2024-12-19T15:11:44.2536385+08:00||;True|2024-12-10T19:10:26.6514077+08:00||;True|2024-12-10T18:30:34.7211512+08:00||;True|2024-12-09T14:06:46.4112259+08:00||;True|2024-12-03T14:23:26.2134334+08:00||;True|2024-11-27T18:53:48.7373661+08:00||;True|2024-11-27T14:27:33.0840789+08:00||;True|2024-11-27T14:08:15.6442660+08:00||;True|2024-11-27T12:10:03.9412549+08:00||;True|2024-11-27T11:45:31.3775097+08:00||;True|2024-11-27T11:32:00.8297320+08:00||;True|2024-11-23T20:50:04.5476409+08:00||;False|2024-11-04T17:48:25.2781696+08:00||;True|2024-11-01T16:04:56.3535724+08:00||;True|2024-09-01T10:13:37.1598955+08:00||;True|2024-08-31T17:27:57.5375469+08:00||;True|2022-07-15T16:41:13.9750291+08:00||;True|2022-07-14T14:02:20.7983427+08:00||;True|2022-07-13T17:40:22.7531000+08:00||;True|2022-07-13T17:34:22.9908701+08:00||;True|2022-07-13T17:30:06.3588502+08:00||;True|2022-07-11T10:32:06.9053981+08:00||;True|2021-04-26T10:07:37.4889549+08:00||;True|2021-04-09T10:32:51.9130162+08:00||;True|2021-04-09T10:31:50.4974012+08:00||; + True|2025-06-24T07:40:47.6769336Z||;True|2025-06-24T10:20:08.6997539+08:00||;True|2025-06-23T16:45:32.2447039+08:00||;True|2025-06-19T17:51:13.7383312+08:00||;True|2025-06-19T16:33:25.6789576+08:00||;True|2025-06-19T16:31:35.8668377+08:00||;True|2025-06-17T17:16:38.1010406+08:00||;True|2025-06-15T11:14:12.6170562+08:00||;True|2025-06-15T10:42:25.1172247+08:00||;True|2025-06-14T13:26:43.2442778+08:00||;True|2025-06-10T13:21:34.1684919+08:00||;True|2025-06-09T11:40:40.2739751+08:00||;True|2025-06-08T16:20:45.8519262+08:00||;True|2025-01-16T15:37:40.8814043+08:00||;True|2024-12-19T15:11:44.2536385+08:00||;True|2024-12-10T19:10:26.6514077+08:00||;True|2024-12-10T18:30:34.7211512+08:00||;True|2024-12-09T14:06:46.4112259+08:00||;True|2024-12-03T14:23:26.2134334+08:00||;True|2024-11-27T18:53:48.7373661+08:00||;True|2024-11-27T14:27:33.0840789+08:00||;True|2024-11-27T14:08:15.6442660+08:00||;True|2024-11-27T12:10:03.9412549+08:00||;True|2024-11-27T11:45:31.3775097+08:00||;True|2024-11-27T11:32:00.8297320+08:00||;True|2024-11-23T20:50:04.5476409+08:00||;False|2024-11-04T17:48:25.2781696+08:00||;True|2024-11-01T16:04:56.3535724+08:00||;True|2024-09-01T10:13:37.1598955+08:00||;True|2024-08-31T17:27:57.5375469+08:00||;True|2022-07-15T16:41:13.9750291+08:00||;True|2022-07-14T14:02:20.7983427+08:00||;True|2022-07-13T17:40:22.7531000+08:00||;True|2022-07-13T17:34:22.9908701+08:00||;True|2022-07-13T17:30:06.3588502+08:00||;True|2022-07-11T10:32:06.9053981+08:00||;True|2021-04-26T10:07:37.4889549+08:00||;True|2021-04-09T10:32:51.9130162+08:00||;True|2021-04-09T10:31:50.4974012+08:00||; @@ -33,19 +33,19 @@ 04/04/2018 15:45:12 - 06/24/2025 10:20:05 + 06/24/2025 15:40:44 - 06/24/2025 10:20:05 + 06/24/2025 15:40:44 02/24/2020 15:29:24 - 06/24/2025 10:19:42 + 06/24/2025 15:40:27 - 06/24/2025 10:19:42 + 06/24/2025 15:40:27 04/29/2020 16:50:14 @@ -63,31 +63,31 @@ 10/23/2017 13:15:20 - 06/24/2025 10:19:45 + 06/24/2025 15:40:31 - 06/24/2025 10:19:45 + 06/24/2025 15:40:31 08/26/2020 18:09:48 - 06/24/2025 10:19:44 + 06/24/2025 15:40:30 - 06/24/2025 10:19:44 + 06/24/2025 15:40:30 - 06/24/2025 10:19:49 + 06/24/2025 15:40:35 - 06/24/2025 10:19:49 + 06/24/2025 15:40:35 - 06/24/2025 10:19:41 + 06/24/2025 15:40:27 - 06/24/2025 10:19:41 + 06/24/2025 15:40:27 09/06/2018 11:57:11 @@ -5652,7 +5652,7 @@ 05/30/2022 16:58:47 - 06/24/2025 10:19:51 + 06/24/2025 15:40:36 04/04/2018 15:45:12 @@ -7572,7 +7572,7 @@ 07/04/2022 14:22:38 - 06/24/2025 10:19:50 + 06/24/2025 15:40:35 \ No newline at end of file