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-28 09:40:33 +08:00
parent 3042ef9370
commit 722f16a77e
6 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Epost.BLL/Work_JobDownThread.cs
View File

@ -185,6 +185,7 @@ namespace Epost.BLL
LogHelper.WriteLogInfo(data.Address+"end拍下");
List<JobModel> offList = jobList.FindAll(m => m.Block == block && m.Area == area && m.Address == data.Address && m.ControlIP == data.IP && m.State == 3 );
if (offList.Any())
{
JobModel model = offList.FirstOrDefault();
@ -199,7 +200,7 @@ namespace Epost.BLL
qumodel.UserCode = model.UserCode;
queueBLL.UpdateQueueTaskArea_Car(qumodel);
#endregion
List<JobModel> AllList = jobList.FindAll(m => m.Block == block && m.Area == area && m.ControlIP == data.IP && m.State == 3&&m.UserCode== model.UserCode);
bool bo = orderbll.IsSkuFinishWork("", model.Matchid);
if (bo)
{
@ -209,7 +210,7 @@ namespace Epost.BLL
}
Thread.Sleep(30);
#region 清除当前区已做完的sku
JobCache.UpdateJobModelList(offList, EcommendType.Execute);
JobCache.UpdateJobModelList(AllList, EcommendType.Execute);
#endregion

2
Epost.DAL/AddressstorageDAL.cs
View File

@ -301,7 +301,7 @@ namespace Epost.DAL
{
strwhere += "and shelfid ='" + shelfid + "'";
}
string sql = string.Format("select area,block,way from Addressstorage where type=1 " + strwhere + " group by area,block,way");
string sql = string.Format("select distinct area,block,way from Addressstorage where type=1 " + strwhere + " group by area,block,way");
DataTable dt = db.GetsqlForDT(sql);
return ModelConvertHelper<AddressstorageModel>.ConvertToList(dt);

11
Epost.TestToolsWeb/Controllers/WebAPIController.cs
View File

@ -79,6 +79,17 @@ namespace Epost.TestToolsWeb.Controllers
JobCache.UpdateJobDownModelList(new List<ResultMessageModel>() { data }, EdownCommend.Create);
}
if (data.Command == "JOB_Fail")
{
LogHelper.WriteLogInfo("设备报错：" + JsonHelper.SerializeObject(data), Log_Type.ERROR);
ErrorLogModel errmodel = new ErrorLogModel();
errmodel.Address = data.Address;
errmodel.ControlIP = data.IP;
addrbll.UpdateErrorState(data.Address, data.IP);
}
}

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-26T09:43:01.0379434Z||;True|2025-06-26T17:35:14.4249922+08:00||;True|2025-06-26T16:52:50.3133122+08:00||;True|2025-06-26T14:43:53.4124674+08:00||;True|2025-06-26T14:36:49.8290629+08:00||;True|2025-06-26T14:32:48.0261661+08:00||;True|2025-06-26T14:25:41.0829044+08:00||;True|2025-06-26T11:51:25.0046611+08:00||;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>
<History>True|2025-06-27T09:35:33.5131523Z||;True|2025-06-26T17:43:01.0379434+08:00||;True|2025-06-26T17:35:14.4249922+08:00||;True|2025-06-26T16:52:50.3133122+08:00||;True|2025-06-26T14:43:53.4124674+08:00||;True|2025-06-26T14:36:49.8290629+08:00||;True|2025-06-26T14:32:48.0261661+08:00||;True|2025-06-26T14:25:41.0829044+08:00||;True|2025-06-26T11:51:25.0046611+08:00||;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/26/2025 17:42:57</publishTime>
<publishTime>06/27/2025 17:35:27</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>06/26/2025 17:42:57</publishTime>
<publishTime>06/27/2025 17:35:27</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>02/24/2020 15:29:24</publishTime>
</File>
<File Include="bin/Common.dll">
<publishTime>06/26/2025 16:52:33</publishTime>
<publishTime>06/27/2025 11:53:36</publishTime>
</File>
<File Include="bin/Common.pdb">
<publishTime>06/26/2025 16:52:33</publishTime>
<publishTime>06/27/2025 11:53:36</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/26/2025 17:42:44</publishTime>
<publishTime>06/27/2025 17:35:04</publishTime>
</File>
<File Include="bin/Epost.BLL.pdb">
<publishTime>06/26/2025 17:42:44</publishTime>
<publishTime>06/27/2025 17:35:04</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/26/2025 17:34:59</publishTime>
<publishTime>06/27/2025 11:53:37</publishTime>
</File>
<File Include="bin/Epost.DAL.pdb">
<publishTime>06/26/2025 17:34:59</publishTime>
<publishTime>06/27/2025 11:53:37</publishTime>
</File>
<File Include="bin/Epost.DPS.dll">
<publishTime>06/26/2025 17:42:48</publishTime>
<publishTime>06/27/2025 17:35:09</publishTime>
</File>
<File Include="bin/Epost.DPS.pdb">
<publishTime>06/26/2025 17:42:48</publishTime>
<publishTime>06/27/2025 17:35:09</publishTime>
</File>
<File Include="bin/Epost.Model.dll">
<publishTime>06/26/2025 16:52:33</publishTime>
<publishTime>06/27/2025 11:53:36</publishTime>
</File>
<File Include="bin/Epost.Model.pdb">
<publishTime>06/26/2025 16:52:33</publishTime>
<publishTime>06/27/2025 11:53:36</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/26/2025 16:33:42</publishTime>
<publishTime>06/27/2025 10:21:23</publishTime>
</File>
<File Include="bin/FastReport.dll">
<publishTime>06/26/2025 16:33:43</publishTime>
<publishTime>06/27/2025 10:21:23</publishTime>
</File>
<File Include="bin/FastReport.Editor.dll">
<publishTime>06/26/2025 16:33:42</publishTime>
<publishTime>06/27/2025 10:21:23</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/26/2025 17:42:49</publishTime>
<publishTime>06/27/2025 17:35:12</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/26/2025 16:52:38</publishTime>
<publishTime>06/27/2025 17:35:11</publishTime>
</File>
</ItemGroup>
</Project>

5
PrintBoxFormsApp/PrintList.cs
View File

@ -19,8 +19,9 @@ namespace PrintBoxFormsApp
public partial class PrintList : Form
{
Print_BoxBLL boxbll = new Print_BoxBLL();
AddressstorageBLL addrBLL = new AddressstorageBLL();
Print_BoxBLL boxbll = new Print_BoxBLL();
private Thread timerThreadDown;//创建线程11111111111111111111111111111
private Thread timerThreadUp;//创建线程
int SleepTime = 1;
@ -117,7 +118,7 @@ namespace PrintBoxFormsApp
DataTable dt = boxbll.GetPrintList(areaitem.way);
if (dt != null && dt.Rows.Count > 0)
{
string filePath = ConfigurationManager.AppSettings["Print_Box" + areaitem.area];
string filePath = ConfigurationManager.AppSettings["Print_Box" + areaitem.way];
LogHelper.WriteLogInfo("文件路径" + filePath + "\r\n");
foreach (DataRow item in dt.Rows)
{