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 16:13:59 +08:00
parent 702da26811
commit de122526a2
4 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Epost.BLL/Work_DisplayJobThread.cs
View File

@ -135,49 +135,54 @@ namespace Epost.BLL
var nowmodel = nowJoblist.FirstOrDefault(); var nowmodel = nowJoblist.FirstOrDefault();
LogHelper.WriteLogInfo("进入任务点亮=====matchid=" + nowmodel.Matchid + "===orderid===" + nowmodel.OrderID + "=====sku==" + nowmodel.Sku + "========"); LogHelper.WriteLogInfo("进入任务点亮=====matchid=" + nowmodel.Matchid + "===orderid===" + nowmodel.OrderID + "=====sku==" + nowmodel.Sku + "========");
#region 点亮任务标签 #region 点亮任务标签
foreach (JobModel item in nowJoblist.ToArray()) foreach (JobModel item in nowJoblist.ToArray())
{
//#region 回显设备锁定
//if (queueDT.Rows[0]["lightcolor"].ToString() == EnumHelper.EMToDescriptionString(LightColor.Color.Blue))
//{
// LabelParamModel locklamodel = new LabelParamModel();
// locklamodel.Address = item.Address.ToString();
// locklamodel.ControlIP = item.ControlIP.ToString();
// locklamodel.Command = "LOCK";
// locklamodel.Parameter = "11111000";
// locklamodel.Type = "N";
// list.Add(locklamodel);
//}
//#endregion
// else
//{
//判断设备当前有没有被点亮
List<JobModel> isshowList = jobList.FindAll(p => p.Address == item.Address && p.ControlIP == item.ControlIP && p.State == 1);
if (!isshowList.Any())
{ {
List<JobModel> manyJoblist = nowJoblist.FindAll(m => m.Tolocation == item.Tolocation && m.Address == item.Address);
//#region 回显设备锁定
//if (queueDT.Rows[0]["lightcolor"].ToString() == EnumHelper.EMToDescriptionString(LightColor.Color.Blue))
//{
// LabelParamModel locklamodel = new LabelParamModel();
// locklamodel.Address = item.Address.ToString();
// locklamodel.ControlIP = item.ControlIP.ToString();
// locklamodel.Command = "LOCK";
// locklamodel.Parameter = "11111000";
// locklamodel.Type = "N";
// list.Add(locklamodel);
//}
//#endregion
// else
//{
List<JobModel> manyJoblist = nowJoblist.FindAll(m => m.Tolocation == item.Tolocation);
int quantity = item.Quantity; int quantity = item.Quantity;
LabelParamModel lamodel = new LabelParamModel(); LabelParamModel lamodel = new LabelParamModel();
lamodel.Address = item.Address.ToString(); lamodel.Address = item.Address.ToString();
lamodel.ControlIP = item.ControlIP.ToString(); lamodel.ControlIP = item.ControlIP.ToString();
lamodel.Command = "DISPLAY_JOB"; lamodel.Command = "DISPLAY_JOB";
#region 同一个货位的数据合并显示 #region 同一个货位的数据合并显示
if (manyJoblist.Count > 1) if (manyJoblist.Count > 1)
{
if (manyJoblist.FindAll(m => m.State == 0).Any())
{ {
foreach (JobModel mitem in manyJoblist) quantity = 0;
if (manyJoblist.FindAll(m => m.State == 0).Any())
{ {
quantity += mitem.Quantity; foreach (JobModel mitem in manyJoblist)
mitem.State = 1; {
mitem.ManyState = 1; quantity += mitem.Quantity;
} mitem.State = 1;
mitem.ManyState = 1;
}
}
} }
}
#endregion #endregion
lamodel.Type = "N"; lamodel.Type = "N";
lamodel.Quantity = quantity.ToString(); lamodel.Quantity = quantity.ToString();
lamodel.Uid = "U" + item.ID; lamodel.Uid = "U" + item.ID;
lamodel.Mode = queueDT.Rows[0]["lightcolor"].ToString() + "0"; lamodel.Mode = queueDT.Rows[0]["lightcolor"].ToString() + "0";
@ -187,6 +192,7 @@ namespace Epost.BLL
item.ColorCode = queueDT.Rows[0]["lightcolor"].ToString(); item.ColorCode = queueDT.Rows[0]["lightcolor"].ToString();
item.DisplayTime = DateTime.Now; item.DisplayTime = DateTime.Now;
} }
}
#endregion #endregion
#region 点亮通道灯 #region 点亮通道灯
comBLL.DISPLAY_LIGHT_BLOCK(model.Taskblock, model.Taskarea, "1"); comBLL.DISPLAY_LIGHT_BLOCK(model.Taskblock, model.Taskarea, "1");

8
Epost.BLL/Work_JobDownThread.cs
View File

@ -216,12 +216,16 @@ namespace Epost.BLL
List<JobModel> downlist = new List<JobModel>(); List<JobModel> downlist = new List<JobModel>();
JobModel model = job.FirstOrDefault(); JobModel model = job.FirstOrDefault();
List<JobModel> manyList = job.FindAll(m => m.ManyState == 1 && m.Tolocation == model.Tolocation); List<JobModel> manyList = job.FindAll(m => m.ManyState == 1 && m.Tolocation == model.Tolocation && m.Address == model.Address);
if (manyList.Any())//合并显示数据 if (manyList.Any())//合并显示数据
{ {
downlist.AddRange(manyList); downlist.AddRange(manyList);
LogHelper.WriteLogInfo("合并显示数据==========" + manyList.Count + "=================="); LogHelper.WriteLogInfo("合并显示数据==========" + manyList.Count + "==================");
foreach (JobModel many in manyList)
{
many.State = 3;
}
} }
else else
{ {
@ -240,7 +244,7 @@ namespace Epost.BLL
List<ResultMessageModel> scanlist = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == model.Sku && p.Command == "QUERY_SPECIAL_STATUS" && p.Area == area); List<ResultMessageModel> scanlist = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == model.Sku && p.Command == "QUERY_SPECIAL_STATUS" && p.Area == area);
downCacheDAL.UpdateJobDownModelList(scanlist, EdownCommend.Execute); downCacheDAL.UpdateJobDownModelList(scanlist, EdownCommend.Execute);
//熄灭通道灯 //熄灭通道灯
comBLL.DISPLAY_LIGHT_BLOCK(block, area, "0"); // comBLL.DISPLAY_LIGHT_BLOCK(block, area, "0");
#region 熄灭当前区显示屏 #region 熄灭当前区显示屏
List<JobModel> offList = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 3 && m.Sku == model.Sku); List<JobModel> offList = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 3 && m.Sku == model.Sku);

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

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

2
PrintBoxFormsApp/PrintList.cs
View File

@ -127,7 +127,7 @@ namespace PrintBoxFormsApp
// totalcount = "共" + item["totalcount"].ToString() + "箱"; // totalcount = "共" + item["totalcount"].ToString() + "箱";
//} //}
//string boxno = "第" + item["boxno"].ToString() + "箱"; //string boxno = "第" + item["boxno"].ToString() + "箱";
FastReportHelper.Report_Box(@filePath, "", item["shopid"].ToString(), item["shopname"].ToString(), item["boxcode"].ToString(), item["matchid"].ToString(), "", item["orderway"].ToString(), totalcount, item["printstate"].ToString(), item["senddate"].ToString(), item["loc"].ToString(), out Report rep); FastReportHelper.Report_Box(@filePath, "", item["shopid"].ToString(), item["shopname"].ToString(), item["boxcode"].ToString(), item["matchid"].ToString(), item["city"].ToString(), item["orderway"].ToString(), totalcount, item["printstate"].ToString(), item["senddate"].ToString(), item["loc"].ToString(), out Report rep);
boxbll.UpPrintList(item["id"].ToString()); boxbll.UpPrintList(item["id"].ToString());