hanlihui520/T-DAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
jl
2025-06-26 13:39:30 +08:00
parent cc38437359
commit 702da26811
6 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Epost.BLL/AddressstorageBLL.cs
View File

@ -152,7 +152,13 @@ namespace Epost.BLL
}
#endregion
#region 获取控制器列表
public DataTable getLabelList(string controlid)
{
return dal.getLabelList(controlid);
}
#endregion
#region 获取所有地址
public DataTable getAddressList()
{

18
Epost.BLL/CommandBLL.cs
View File

@ -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();

24
Epost.BLL/Work_DisplayJobThread.cs
View File

@ -163,19 +163,19 @@ namespace Epost.BLL
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;
// }
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";
lamodel.Quantity = quantity.ToString();

18
Epost.BLL/Work_JobDownThread.cs
View File

@ -216,17 +216,17 @@ namespace Epost.BLL
List<JobModel> downlist = new List<JobModel>();
JobModel model = job.FirstOrDefault();
//List<JobModel> manyList = job.FindAll(m => m.ManyState == 1 && m.Tolocation == model.Tolocation);
//if (manyList.Any())//合并显示数据
//{
List<JobModel> manyList = job.FindAll(m => m.ManyState == 1 && m.Tolocation == model.Tolocation);
if (manyList.Any())//合并显示数据
{
// downlist.AddRange(manyList);
// LogHelper.WriteLogInfo("合并显示数据=========="+ manyList .Count+ "==================");
//}
//else
//{
downlist.AddRange(manyList);
LogHelper.WriteLogInfo("合并显示数据==========" + manyList.Count + "==================");
}
else
{
downlist.Add(model);
// }
}
//修改订单状态
orderbll.UpdateOrderState_Car(downlist, model, truequantity, checkquantity);
LogHelper.WriteLogInfo(data.Address + "=========------------------" + data.Parameter);

4
Epost.TestToolsWeb/Controllers/ServerController.cs
View File

@ -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;

36
Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
View File

@ -7,7 +7,7 @@
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\驿传\GuangzhouHuiFeng_DAS</_PublishTargetUrl>
<History>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||;</History>
<History>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||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -33,19 +33,19 @@
<publishTime>04/04/2018 15:45:12</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>06/24/2025 19:52:24</publishTime>
<publishTime>06/26/2025 11:51:21</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>06/24/2025 19:52:24</publishTime>
<publishTime>06/26/2025 11:51:21</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>02/24/2020 15:29:24</publishTime>
</File>
<File Include="bin/Common.dll">
<publishTime>06/24/2025 19:02:01</publishTime>
<publishTime>06/26/2025 10:38:48</publishTime>
</File>
<File Include="bin/Common.pdb">
<publishTime>06/24/2025 19:02:01</publishTime>
<publishTime>06/26/2025 10:38:48</publishTime>
</File>
<File Include="bin/ComposerSDK.dll">
<publishTime>04/29/2020 16:50:14</publishTime>
@ -63,31 +63,31 @@
<publishTime>10/23/2017 13:15:20</publishTime>
</File>
<File Include="bin/Epost.BLL.dll">
<publishTime>06/24/2025 19:52:12</publishTime>
<publishTime>06/26/2025 11:50:55</publishTime>
</File>
<File Include="bin/Epost.BLL.pdb">
<publishTime>06/24/2025 19:52:12</publishTime>
<publishTime>06/26/2025 11:50:55</publishTime>
</File>
<File Include="bin/Epost.BLL.XmlSerializers.dll">
<publishTime>08/26/2020 18:09:48</publishTime>
</File>
<File Include="bin/Epost.DAL.dll">
<publishTime>06/24/2025 19:02:02</publishTime>
<publishTime>06/26/2025 10:38:51</publishTime>
</File>
<File Include="bin/Epost.DAL.pdb">
<publishTime>06/24/2025 19:02:02</publishTime>
<publishTime>06/26/2025 10:38:51</publishTime>
</File>
<File Include="bin/Epost.DPS.dll">
<publishTime>06/24/2025 19:52:15</publishTime>
<publishTime>06/26/2025 11:51:03</publishTime>
</File>
<File Include="bin/Epost.DPS.pdb">
<publishTime>06/24/2025 19:52:15</publishTime>
<publishTime>06/26/2025 11:51:03</publishTime>
</File>
<File Include="bin/Epost.Model.dll">
<publishTime>06/24/2025 15:55:11</publishTime>
<publishTime>06/26/2025 10:38:48</publishTime>
</File>
<File Include="bin/Epost.Model.pdb">
<publishTime>06/24/2025 15:55:11</publishTime>
<publishTime>06/26/2025 10:38:48</publishTime>
</File>
<File Include="bin/Epost.TestToolsWeb.dll">
<publishTime>09/06/2018 11:57:11</publishTime>
@ -105,13 +105,13 @@
<publishTime>04/29/2020 16:50:14</publishTime>
</File>
<File Include="bin/FastReport.Bars.dll">
<publishTime>06/24/2025 15:50:35</publishTime>
<publishTime>06/26/2025 10:21:36</publishTime>
</File>
<File Include="bin/FastReport.dll">
<publishTime>06/24/2025 15:50:35</publishTime>
<publishTime>06/26/2025 10:21:36</publishTime>
</File>
<File Include="bin/FastReport.Editor.dll">
<publishTime>06/24/2025 15:50:35</publishTime>
<publishTime>06/26/2025 10:21:36</publishTime>
</File>
<File Include="bin/Google.Protobuf.dll">
<publishTime>08/10/2018 18:51:54</publishTime>
@ -5661,7 +5661,7 @@
<publishTime>05/30/2022 16:58:47</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>06/24/2025 19:52:17</publishTime>
<publishTime>06/26/2025 11:51:05</publishTime>
</File>
<File Include="Scripts/ai.0.22.9-build00167.js">
<publishTime>04/04/2018 15:45:12</publishTime>
@ -7581,7 +7581,7 @@
<publishTime>07/04/2022 14:22:38</publishTime>
</File>
<File Include="Web.config">
<publishTime>06/24/2025 19:02:07</publishTime>
<publishTime>06/26/2025 10:38:57</publishTime>
</File>
</ItemGroup>
</Project>