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

View File

@ -216,12 +216,16 @@ 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);
List<JobModel> manyList = job.FindAll(m => m.ManyState == 1 && m.Tolocation == model.Tolocation && m.Address == model.Address);
if (manyList.Any())//合并显示数据
{
downlist.AddRange(manyList);
LogHelper.WriteLogInfo("合并显示数据==========" + manyList.Count + "==================");
foreach (JobModel many in manyList)
{
many.State = 3;
}
}
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);
downCacheDAL.UpdateJobDownModelList(scanlist, EdownCommend.Execute);
//熄灭通道灯
comBLL.DISPLAY_LIGHT_BLOCK(block, area, "0");
// comBLL.DISPLAY_LIGHT_BLOCK(block, area, "0");
#region
List<JobModel> offList = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 3 && m.Sku == model.Sku);