This commit is contained in:
jl
2024-09-02 16:42:28 +08:00
parent 406c7a9733
commit d5e45f63b4
11 changed files with 663 additions and 55 deletions

View File

@ -37,10 +37,12 @@ namespace Epost.BLL
#region
private void BackWorkList(object block)
{
lock (lockJobDown)
{
string cm = "";
cm = "lockJobDown" + block;
object c = (Object)cm;
lock (c)
{
while (OrisShow)
{
try
@ -75,13 +77,13 @@ namespace Epost.BLL
{
try
{
string[] nlist = tblock.Split('-');
string[] nlist = tblock.Split('|');
string nblock = nlist[0];
string shelfid = nlist[1];
List<AddressstorageModel> Arealist = addrBLL.GetAreaList(nblock, shelfid);
foreach (AddressstorageModel item in Arealist)
{
List<ResultMessageModel> downList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Status == "0" && m.Block == nblock && m.Area == item.area);
List<ResultMessageModel> downList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Status == "0" && m.Block == nblock && m.Area == item.area&&m.Command== "JOB_DONE");
List<JobModel> jobList = JobCache.GetPlanJobList().FindAll(p => p.Block == nblock && p.Area == item.area);
if (downList != null && downList.Count > 0)
@ -115,9 +117,7 @@ namespace Epost.BLL
switch (data.Command)
{
case "QUERY_SPECIAL_STATUS":
BindJobList(data);
break;
case "JOB_DONE":
JobDown_M(data, jobList);
break;
@ -262,6 +262,16 @@ namespace Epost.BLL
{
comBLL.LED_OFF_CLEAR(offList);
}
ShowMessageModel_M show = new ShowMessageModel_M();
show.Title = "分播完成";
show.Contents = "请扫描继续作业";
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
show.Type = 8;
show.Block = block;
show.Islock = false;
show.IsTwinkle = 1;
comBLL.ShowBoxMessage_M(show);
#endregion
#region
@ -285,7 +295,7 @@ namespace Epost.BLL
if (blockfinish)
{
#region
ShowMessageModel_M show = new ShowMessageModel_M();
show.Title = "当前波次分播完成";
show.Contents = "拍下熄灭所有设备\r请扫描继续作业";
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
@ -294,7 +304,7 @@ namespace Epost.BLL
show.Block = block;
show.Islock = false;
show.IsTwinkle = 1;
show.No = "01";
comBLL.ShowBoxMessage_M(show);
#endregion
@ -971,7 +981,7 @@ namespace Epost.BLL
lamodel.Command = "REMOVE_JOB";
lamodel.Parameter = "01";
list.Add(lamodel);
orderbll.UpOrderStateBybat(item["batchid"].ToString());
orderbll.UpOrderStateBybat(item["id"].ToString());
}
}
if (list != null && list.Count > 0)