This commit is contained in:
jl
2025-06-30 10:14:05 +08:00
parent 722f16a77e
commit fb2aa4f239
10 changed files with 146 additions and 138 deletions

View File

@ -383,28 +383,27 @@ namespace Epost.BLL
#region
List<ResultMessageModel> hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888");
List<ResultMessageModel> hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888|Y01"|| m.Parameter == "888888|Y02" || m.Parameter == "888888|Y03" || m.Parameter == "888888|Y04"|| m.Parameter == "888888|Y05" || m.Parameter == "888888|Y06" || m.Parameter == "888888|Y07" || m.Parameter == "888888|Y08");
if (hangList.Any())
{
ResultMessageModel datapar= hangList.FirstOrDefault();
string[] str= datapar.Parameter.Split('|');
#region
LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------通道" + data.Block);
LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------工号" + str[1]);
// LabelParamModel FORMATEModel = new LabelParamModel();
// FORMATEModel.ControlIP = data.IP;
// comBLL.FORMATE_JOB_DATA(FORMATEModel);
DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1");
// comBLL.FORMATE_JOB_DATA(FORMATEModel);
DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1", str[1]);
if (qdt != null && qdt.Rows.Count > 0)
{
scanStr = qdt.Rows[0]["sku"].ToString();
ShowMessageModel_M show = new ShowMessageModel_M();
show.Block = data.Block;
show.Area = data.Area;
show.Type = 8;
//ShowMessageModel_M show = new ShowMessageModel_M();
//show.Block = data.Block;
//show.Area = data.Area;
//show.Type = 8;
comBLL.RemoveBoxMessage_M(show);
//comBLL.RemoveBoxMessage_M(show);
// data.Parameter = scanStr;
Hangup_SKU(scanStr, data.Block, data.Area,matchid);
//删除sku对应缓存
@ -498,8 +497,8 @@ namespace Epost.BLL
qmodel.Matchid = umodel.Matchid;
// qmodel.Location = location;
qmodel.Shopid = echoDt.Rows[0]["GoodsName"].ToString();
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
qmodel.State = 2;
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Pink);
queueBLL.insertQueueOrders(qmodel);
@ -562,7 +561,7 @@ namespace Epost.BLL
{
LabelParamModel lamodel = new LabelParamModel();
lamodel.Address = item["address"].ToString(); ;
lamodel.Address = item["address"].ToString();
lamodel.ControlIP = item["ControlIP"].ToString();
lamodel.Command = "REMOVE_JOB";
lamodel.Parameter = "";
@ -575,6 +574,7 @@ namespace Epost.BLL
Unlockmodel.Command = "UNLOCK";
Unlockmodel.Type = "N";
Unlockmodel.Parameter = "11111000";
Unlockmodel.Uid = "UN"+ item["address"].ToString();
list.Add(Unlockmodel);
if (item["oprationstate"].ToString() == "1")
{