diff --git a/Epost.BLL/OrderControlBLL.cs b/Epost.BLL/OrderControlBLL.cs index 4f36780..b2440f6 100644 --- a/Epost.BLL/OrderControlBLL.cs +++ b/Epost.BLL/OrderControlBLL.cs @@ -682,12 +682,13 @@ namespace Epost.BLL var d = false; if (scanStr == "Finish") { + dal.UpBkAddresss(data.Block, data.Area); DataTable Mdt = dal.GetOrderMatchidInfo(data.Block, data.Area); if (Mdt != null && Mdt.Rows.Count > 0) { LogHelper.WriteLogInfo("----开始强制结束----运单号:" + Mdt.Rows[0]["matchid"].ToString() + ""); dal.UpOrdersMatchid(data.Block, data.Area, Mdt.Rows[0]["matchid"].ToString()); - dal.UpBkAddresss(data.Block, data.Area); + dal.UpOrdersqueue(data.Block, data.Area, Mdt.Rows[0]["matchid"].ToString()); LabelParamModel model = new LabelParamModel(); model.Address = "9999"; diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user index 00fd366..5827539 100644 --- a/Epost.TestToolsWeb/Epost.DPS.csproj.user +++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user @@ -11,7 +11,7 @@ False 600 D:\驿传\Epost\T_DAS_PTL\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml - Release|Any CPU + Debug|Any CPU diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user index 13a29d8..27c94b0 100644 --- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user +++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user @@ -7,7 +7,7 @@ <_PublishTargetUrl>D:\驿传\SanYing_DAS-T后台 - True|2023-04-27T12:14:15.0331014Z;True|2023-04-21T16:37:45.9559800+08:00;True|2023-04-20T19:12:32.4520337+08:00;True|2023-04-20T18:51:17.9201241+08:00;True|2023-04-20T16:36:34.8353434+08:00;True|2023-04-19T11:42:01.7398184+08:00;True|2023-04-19T11:37:42.0024926+08:00;True|2023-04-18T15:36:56.8763198+08:00;True|2023-04-18T14:56:45.8672402+08:00;True|2023-04-17T10:51:00.4138485+08:00;True|2023-04-16T18:42:38.2510554+08:00;False|2023-04-16T18:42:10.5319125+08:00;True|2023-04-16T18:32:05.9038034+08:00;True|2023-04-16T17:11:22.6510841+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|2023-07-03T05:53:41.0701316Z;True|2023-04-27T20:14:15.0331014+08:00;True|2023-04-21T16:37:45.9559800+08:00;True|2023-04-20T19:12:32.4520337+08:00;True|2023-04-20T18:51:17.9201241+08:00;True|2023-04-20T16:36:34.8353434+08:00;True|2023-04-19T11:42:01.7398184+08:00;True|2023-04-19T11:37:42.0024926+08:00;True|2023-04-18T15:36:56.8763198+08:00;True|2023-04-18T14:56:45.8672402+08:00;True|2023-04-17T10:51:00.4138485+08:00;True|2023-04-16T18:42:38.2510554+08:00;False|2023-04-16T18:42:10.5319125+08:00;True|2023-04-16T18:32:05.9038034+08:00;True|2023-04-16T17:11:22.6510841+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/16/2023 15:06:26 - 04/27/2023 20:13:39 + 07/03/2023 13:53:15 - 04/27/2023 20:13:39 + 07/03/2023 13:53:15 02/24/2020 15:29:24 - 04/27/2023 20:13:07 + 07/03/2023 13:52:54 - 04/27/2023 20:13:07 + 07/03/2023 13:52:54 04/16/2023 15:06:26 @@ -63,25 +63,25 @@ 10/23/2017 13:15:20 - 04/27/2023 20:13:09 + 07/03/2023 13:52:56 - 04/27/2023 20:13:09 + 07/03/2023 13:52:56 08/26/2020 18:09:48 - 04/27/2023 20:13:08 + 07/03/2023 13:52:55 - 04/27/2023 20:13:08 + 07/03/2023 13:52:55 - 04/27/2023 20:13:16 + 07/03/2023 13:53:00 - 04/27/2023 20:13:16 + 07/03/2023 13:53:00 04/16/2023 17:10:57 @@ -5652,7 +5652,7 @@ 04/16/2023 15:06:27 - 04/27/2023 20:13:23 + 07/03/2023 13:53:05 04/04/2018 15:45:12