From 702da268114b4e467c943332b61dd76ec520d0d7 Mon Sep 17 00:00:00 2001 From: jl Date: Thu, 26 Jun 2025 13:39:30 +0800 Subject: [PATCH] --- Epost.BLL/AddressstorageBLL.cs | 8 ++++- Epost.BLL/CommandBLL.cs | 18 +++++----- Epost.BLL/Work_DisplayJobThread.cs | 30 ++++++++-------- Epost.BLL/Work_JobDownThread.cs | 20 +++++------ .../Controllers/ServerController.cs | 4 +-- .../PublishProfiles/Toolsweb.pubxml.user | 36 +++++++++---------- 6 files changed, 61 insertions(+), 55 deletions(-) diff --git a/Epost.BLL/AddressstorageBLL.cs b/Epost.BLL/AddressstorageBLL.cs index bb6d952..c01cfcd 100644 --- a/Epost.BLL/AddressstorageBLL.cs +++ b/Epost.BLL/AddressstorageBLL.cs @@ -152,7 +152,13 @@ namespace Epost.BLL } #endregion - + #region 获取控制器列表 + public DataTable getLabelList(string controlid) + { + return dal.getLabelList(controlid); + } + + #endregion #region 获取所有地址 public DataTable getAddressList() { diff --git a/Epost.BLL/CommandBLL.cs b/Epost.BLL/CommandBLL.cs index aabf18c..e8cec56 100644 --- a/Epost.BLL/CommandBLL.cs +++ b/Epost.BLL/CommandBLL.cs @@ -104,7 +104,7 @@ namespace Epost.BLL { foreach (DataRow item in dt.Rows) { - DataTable lableDt = addrBLL.getLabelList(item["id"].ToString(), batchno); + DataTable lableDt = addrBLL.getLabelList(item["id"].ToString()); if (lableDt != null && lableDt.Rows.Count > 0) { foreach (DataRow labelItem in lableDt.Rows) @@ -124,14 +124,14 @@ namespace Epost.BLL } else { - if (!string.IsNullOrEmpty(labelItem["shopid"].ToString())) - { - shopid = labelItem["shopid"].ToString(); - if (shopid.Length > 4) - { - shopid = shopid.Substring(shopid.Length-4,4); - } - } + //if (!string.IsNullOrEmpty(labelItem["shopid"].ToString())) + //{ + // shopid = labelItem["shopid"].ToString(); + // if (shopid.Length > 4) + // { + // shopid = shopid.Substring(shopid.Length-4,4); + // } + //} LabelParamModel lablemodel = new LabelParamModel(); lablemodel.Address = labelItem["address"].ToString(); lablemodel.ControlIP = item["ControlIP"].ToString(); diff --git a/Epost.BLL/Work_DisplayJobThread.cs b/Epost.BLL/Work_DisplayJobThread.cs index aff86a5..1064e45 100644 --- a/Epost.BLL/Work_DisplayJobThread.cs +++ b/Epost.BLL/Work_DisplayJobThread.cs @@ -162,22 +162,22 @@ namespace Epost.BLL lamodel.Address = item.Address.ToString(); lamodel.ControlIP = item.ControlIP.ToString(); lamodel.Command = "DISPLAY_JOB"; - #region 同一个货位的数据合并显示 - //if (manyJoblist.Count > 1) - //{ - // if (manyJoblist.FindAll(m => m.State == 0).Any()) - // { - // foreach (JobModel mitem in manyJoblist) - // { - // quantity += mitem.Quantity; - // mitem.State = 1; - // mitem.ManyState = 1; - // } + #region 同一个货位的数据合并显示 + if (manyJoblist.Count > 1) + { + if (manyJoblist.FindAll(m => m.State == 0).Any()) + { + foreach (JobModel mitem in manyJoblist) + { + quantity += mitem.Quantity; + mitem.State = 1; + mitem.ManyState = 1; + } - // } - //} - #endregion - lamodel.Type = "N"; + } + } + #endregion + lamodel.Type = "N"; lamodel.Quantity = quantity.ToString(); lamodel.Uid = "U" + item.ID; lamodel.Mode = queueDT.Rows[0]["lightcolor"].ToString() + "0"; diff --git a/Epost.BLL/Work_JobDownThread.cs b/Epost.BLL/Work_JobDownThread.cs index 4d954d7..d6f287a 100644 --- a/Epost.BLL/Work_JobDownThread.cs +++ b/Epost.BLL/Work_JobDownThread.cs @@ -216,17 +216,17 @@ namespace Epost.BLL List downlist = new List(); JobModel model = job.FirstOrDefault(); - //List manyList = job.FindAll(m => m.ManyState == 1 && m.Tolocation == model.Tolocation); - //if (manyList.Any())//合并显示数据 - //{ + List manyList = job.FindAll(m => m.ManyState == 1 && m.Tolocation == model.Tolocation); + if (manyList.Any())//合并显示数据 + { - // downlist.AddRange(manyList); - // LogHelper.WriteLogInfo("合并显示数据=========="+ manyList .Count+ "=================="); - //} - //else - //{ - downlist.Add(model); - // } + downlist.AddRange(manyList); + LogHelper.WriteLogInfo("合并显示数据==========" + manyList.Count + "=================="); + } + else + { + downlist.Add(model); + } //修改订单状态 orderbll.UpdateOrderState_Car(downlist, model, truequantity, checkquantity); LogHelper.WriteLogInfo(data.Address + "=========------------------" + data.Parameter); diff --git a/Epost.TestToolsWeb/Controllers/ServerController.cs b/Epost.TestToolsWeb/Controllers/ServerController.cs index 0e11b79..dd9da96 100644 --- a/Epost.TestToolsWeb/Controllers/ServerController.cs +++ b/Epost.TestToolsWeb/Controllers/ServerController.cs @@ -104,14 +104,14 @@ namespace Epost.DPS.Controllers #region 设备检测 [Route("TestStart")] [HttpPost] - public ResultModel TestStart(BatchModel model) + public ResultModel TestStart() { lock (lockinit) { ResultModel res = new ResultModel(); try { - ResultModel result = contrbll.TestStart(model.batchno); + ResultModel result = contrbll.TestStart(""); return result; diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user index 98c9127..da4e20b 100644 --- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user +++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user @@ -7,7 +7,7 @@ <_PublishTargetUrl>D:\驿传\GuangzhouHuiFeng_DAS - True|2025-06-24T11:52:28.3640036Z||;True|2025-06-24T19:41:27.8431415+08:00||;True|2025-06-24T19:02:20.3384315+08:00||;True|2025-06-24T14:58:06.2128620+08:00||;False|2025-06-24T14:57:07.8710970+08:00||;True|2025-06-24T14:54:53.0047658+08:00||;True|2025-06-24T14:21:21.1147627+08:00||;False|2025-06-24T14:20:37.2040902+08:00||;True|2025-06-24T13:14:08.5696828+08:00||;True|2025-06-24T11:28:41.9414169+08:00||;False|2025-06-24T11:28:18.5427055+08:00||;True|2025-06-23T18:49:19.8150434+08:00||;False|2025-06-23T18:47:53.8200239+08:00||;True|2025-06-23T18:13:17.9954519+08:00||;True|2025-06-16T16:39:46.1896351+08:00||;True|2025-06-04T15:01:49.8008687+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-26T03:51:25.0046611Z||;True|2025-06-26T10:39:18.2677815+08:00||;True|2025-06-24T19:52:28.3640036+08:00||;True|2025-06-24T19:41:27.8431415+08:00||;True|2025-06-24T19:02:20.3384315+08:00||;True|2025-06-24T14:58:06.2128620+08:00||;False|2025-06-24T14:57:07.8710970+08:00||;True|2025-06-24T14:54:53.0047658+08:00||;True|2025-06-24T14:21:21.1147627+08:00||;False|2025-06-24T14:20:37.2040902+08:00||;True|2025-06-24T13:14:08.5696828+08:00||;True|2025-06-24T11:28:41.9414169+08:00||;False|2025-06-24T11:28:18.5427055+08:00||;True|2025-06-23T18:49:19.8150434+08:00||;False|2025-06-23T18:47:53.8200239+08:00||;True|2025-06-23T18:13:17.9954519+08:00||;True|2025-06-16T16:39:46.1896351+08:00||;True|2025-06-04T15:01:49.8008687+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 19:52:24 + 06/26/2025 11:51:21 - 06/24/2025 19:52:24 + 06/26/2025 11:51:21 02/24/2020 15:29:24 - 06/24/2025 19:02:01 + 06/26/2025 10:38:48 - 06/24/2025 19:02:01 + 06/26/2025 10:38:48 04/29/2020 16:50:14 @@ -63,31 +63,31 @@ 10/23/2017 13:15:20 - 06/24/2025 19:52:12 + 06/26/2025 11:50:55 - 06/24/2025 19:52:12 + 06/26/2025 11:50:55 08/26/2020 18:09:48 - 06/24/2025 19:02:02 + 06/26/2025 10:38:51 - 06/24/2025 19:02:02 + 06/26/2025 10:38:51 - 06/24/2025 19:52:15 + 06/26/2025 11:51:03 - 06/24/2025 19:52:15 + 06/26/2025 11:51:03 - 06/24/2025 15:55:11 + 06/26/2025 10:38:48 - 06/24/2025 15:55:11 + 06/26/2025 10:38:48 09/06/2018 11:57:11 @@ -105,13 +105,13 @@ 04/29/2020 16:50:14 - 06/24/2025 15:50:35 + 06/26/2025 10:21:36 - 06/24/2025 15:50:35 + 06/26/2025 10:21:36 - 06/24/2025 15:50:35 + 06/26/2025 10:21:36 08/10/2018 18:51:54 @@ -5661,7 +5661,7 @@ 05/30/2022 16:58:47 - 06/24/2025 19:52:17 + 06/26/2025 11:51:05 04/04/2018 15:45:12 @@ -7581,7 +7581,7 @@ 07/04/2022 14:22:38 - 06/24/2025 19:02:07 + 06/26/2025 10:38:57 \ No newline at end of file