diff --git a/Epost.BLL/CommandBLL.cs b/Epost.BLL/CommandBLL.cs
index 2f75756..773dbcc 100644
--- a/Epost.BLL/CommandBLL.cs
+++ b/Epost.BLL/CommandBLL.cs
@@ -90,7 +90,7 @@ namespace Epost.BLL
#endregion
#region 设备检测 查询所有标签
- public ResultModel GetAllLabelList_M()
+ public ResultModel GetAllLabelList_M(string batchno)
{
ResultModel model = new ResultModel();
try
@@ -102,8 +102,8 @@ namespace Epost.BLL
{
foreach (DataRow item in dt.Rows)
{
- // DataTable lableDt = addrBLL.getLabelList(item["id"].ToString(), batchno);
- DataTable lableDt = addrBLL.getLabelList(item["id"].ToString());
+ 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)
@@ -123,28 +123,34 @@ 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 (shopid.Length > 4)
+ LabelParamModel lablemodel = new LabelParamModel();
+ if (!string.IsNullOrEmpty(labelItem["shopid"].ToString()))
{
- shopid = shopid.Substring(shopid.Length - 4, 4);
+ shopid = labelItem["shopid"].ToString();
+ if (shopid.Length > 3)
+ {
+ shopid = shopid.Substring(shopid.Length - 3, 3);
+ lablemodel.Quantity = shopid;
+ lablemodel.Mode = "50";
+ }
+ }
+ else {
+
+ lablemodel.Quantity = shopid;
+ lablemodel.Mode = "10";
+
}
- LabelParamModel lablemodel = new LabelParamModel();
+
+
+
lablemodel.Address = labelItem["address"].ToString();
lablemodel.ControlIP = item["ControlIP"].ToString();
lablemodel.Command = "DISPLAY_JOB";
lablemodel.Type = "N";
- lablemodel.Quantity = shopid;
+
lablemodel.Uid = labelItem["address"].ToString();
- lablemodel.Mode = "10";
+
list.Add(lablemodel);
}
diff --git a/Epost.BLL/OrderControlBLL.cs b/Epost.BLL/OrderControlBLL.cs
index d028f93..70ef0ab 100644
--- a/Epost.BLL/OrderControlBLL.cs
+++ b/Epost.BLL/OrderControlBLL.cs
@@ -119,10 +119,10 @@ namespace Epost.BLL
#region 设备检测
- public ResultModel TestStart()
+ public ResultModel TestStart(string batchno)
{
- ResultModel result = comBLL.GetAllLabelList_M();
+ ResultModel result = comBLL.GetAllLabelList_M(batchno);
return result;
}
diff --git a/Epost.DAL/AddressstorageDAL.cs b/Epost.DAL/AddressstorageDAL.cs
index 11dc56e..4c848fb 100644
--- a/Epost.DAL/AddressstorageDAL.cs
+++ b/Epost.DAL/AddressstorageDAL.cs
@@ -142,7 +142,7 @@ namespace Epost.DAL
DataTable dt = db.GetsqlForDT(sql);
return dt;
}
- #endregion
+ #endregion
#region 根据区域 查询显示箱号地址
public DataTable getAddressByBlock(string block)
{
diff --git a/Epost.TestToolsWeb/Controllers/ServerController.cs b/Epost.TestToolsWeb/Controllers/ServerController.cs
index 1834c6d..0e11b79 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()
+ public ResultModel TestStart(BatchModel model)
{
lock (lockinit)
{
ResultModel res = new ResultModel();
try
{
- ResultModel result = contrbll.TestStart();
+ ResultModel result = contrbll.TestStart(model.batchno);
return result;
diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
index 72b73ce..0bf74ac 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-10T05:21:34.1684919Z||;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-15T03:14:12.6170562Z||;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/10/2025 13:32:17
+ 06/15/2025 11:14:09
- 06/10/2025 13:32:17
+ 06/15/2025 11:14:09
02/24/2020 15:29:24
- 06/10/2025 13:21:07
+ 06/15/2025 10:42:00
- 06/10/2025 13:21:07
+ 06/15/2025 10:42:00
04/29/2020 16:50:14
@@ -63,25 +63,25 @@
10/23/2017 13:15:20
- 06/10/2025 13:32:07
+ 06/15/2025 11:13:45
- 06/10/2025 13:32:07
+ 06/15/2025 11:13:45
08/26/2020 18:09:48
- 06/10/2025 13:21:08
+ 06/15/2025 10:42:00
- 06/10/2025 13:21:08
+ 06/15/2025 10:42:00
- 06/10/2025 13:32:09
+ 06/15/2025 11:13:53
- 06/10/2025 13:32:09
+ 06/15/2025 11:13:53
06/08/2025 16:20:17
@@ -5652,7 +5652,7 @@
05/30/2022 16:58:47
- 06/10/2025 13:32:11
+ 06/15/2025 11:13:55
04/04/2018 15:45:12