From 7d3f50c97bf7cc2087b26e674f2ae3bd50fd03fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=85=E5=87=AF=20=E8=B4=BE?= <807404298@qq.com> Date: Thu, 14 Sep 2023 13:27:34 +0800 Subject: [PATCH] --- .../WebService/WebService.asmx.cs | 84 ++++++++----------- 1 file changed, 35 insertions(+), 49 deletions(-) diff --git a/Epost.TestToolsWeb/WebService/WebService.asmx.cs b/Epost.TestToolsWeb/WebService/WebService.asmx.cs index c7735e5..8175b3c 100644 --- a/Epost.TestToolsWeb/WebService/WebService.asmx.cs +++ b/Epost.TestToolsWeb/WebService/WebService.asmx.cs @@ -54,7 +54,7 @@ namespace Epost.DPS.WebService bool flag = true; string mms = string.Empty; LogHelper.WriteLogInfo("======开始处理数据======"); - DataSet set = XmlHelper.GetDataSetStrXml(messages.Replace("&", "").Replace("#", "").Replace("△", "").Replace("☆", "").Replace("=", "").Replace("】", "").Replace("【", "").Replace(" ", "").Replace("\"", "").Replace("：", ":").Replace("（", "(").Replace("）", ")").Replace("×", "x").Replace("ω", "w")); + DataSet set = XmlHelper.GetDataSetStrXml(messages.Replace("&", "").Replace("#", "").Replace("△", "").Replace("☆", "").Replace("=", "").Replace("】", "").Replace("【", "").Replace(" ", "").Replace("\"", "").Replace("：", ":").Replace("（", "(").Replace("）", ")").Replace("×", "x").Replace("ω", "w").Replace("α", "a")); if (set != null && set.Tables.Count > 0 && set.Tables[0].Rows.Count > 0) { var ReturnDt = set.Tables["pick"]; @@ -85,14 +85,14 @@ namespace Epost.DPS.WebService list.Add(model); itemlist.State = 3; List downlist = new List(); - + downlist.Add(itemlist); - - + + bll.UpdateOrderState_Car(downlist, itemlist, itemlist.Quantity, 0); - List ExjobList = JobCache.GetPlanJobList().FindAll(p => p.Block == itemlist.Block && p.Area == itemlist.Area&&p.State!=3); + List ExjobList = JobCache.GetPlanJobList().FindAll(p => p.Block == itemlist.Block && p.Area == itemlist.Area && p.State != 3); if (!ExjobList.Any()) { LogHelper.WriteLogInfo("熄灭指定订单任务-熄灭通道灯：" + itemlist.Block + "++++" + itemlist.Area + ""); @@ -107,7 +107,7 @@ namespace Epost.DPS.WebService OrdersQueueModel qumodel = new OrdersQueueModel(); qumodel.State = 3; qumodel.Taskblock = itemlist.Block; - qumodel.Taskarea = itemlist.Area; + qumodel.Taskarea = itemlist.Area; queueBLL.UpdateQueueTaskArea_Car(qumodel); #endregion bool WorkArea = bll.IsFinishWorkArea("", "", "99", "", "", ""); @@ -118,16 +118,12 @@ namespace Epost.DPS.WebService { combll.DISPLAY_LIGHT_BLOCK_Out("", itemlist.Area, "0"); } - } } - } - - - } + } dal.SendALL(list); - bool b = bll.UpOrdersState(item["transderMid"].ToString()); + bool b = bll.UpOrdersState(item["transderMid"].ToString()); JobCache.UpdateJobModelList(jobList, EcommendType.Execute); @@ -146,47 +142,37 @@ namespace Epost.DPS.WebService //熄灭全部 else if (item["Current"].ToString() == "N") { + + DataTable dt = addbll.GetForcedendAddress(); + foreach (DataRow additem in dt.Rows) + { + LabelParamModel model = new LabelParamModel(); + model.ControlIP = additem["ControlIP"].ToString(); + model.Address = "9999"; + model.Command = "FORMAT_JOB_DATA"; + model.Parameter = "50"; + model.Timeout = "0.5"; + list.Add(model); + model = new LabelParamModel(); + model.ControlIP = additem["ControlIP"].ToString(); + model.Address = "9999"; + model.Parameter = "11111000"; + model.Command = "UNLOCK"; + model.Timeout = "0.5"; + list.Add(model); + combll.LED_OFF_CLEAR(additem["ControlIP"].ToString()); + } + dal.SendALL(list); + + bool b = bll.UpOrdersState(""); + //修改队列状态 + queueBLL.updateOrderQueueState(); List jobList = JobCache.GetPlanJobList(); - if (jobList != null && jobList.Count > 0) - { - DataTable dt = addbll.GetForcedendAddress(); - foreach (DataRow additem in dt.Rows) - { - LabelParamModel model = new LabelParamModel(); - model.ControlIP = additem["ControlIP"].ToString(); - model.Address = "9999"; - model.Command = "FORMAT_JOB_DATA"; - model.Parameter = "50"; - model.Timeout = "0.5"; - list.Add(model); - model = new LabelParamModel(); - model.ControlIP = additem["ControlIP"].ToString(); - model.Address = "9999"; - model.Parameter = "11111000"; - model.Command = "UNLOCK"; - model.Timeout = "0.5"; - list.Add(model); - combll.LED_OFF_CLEAR(additem["ControlIP"].ToString()); - } - dal.SendALL(list); + JobCache.UpdateJobModelList(jobList, EcommendType.CompleteAll); - bool b = bll.UpOrdersState(""); - //修改队列状态 - queueBLL.updateOrderQueueState(); - JobCache.UpdateJobModelList(jobList, EcommendType.CompleteAll); + flag = false; - flag = false; - } - else - { - msg.Status = "erro"; - msg.Message = "标签熄灭失败：当前标签未亮灯！"; - main.msg = msg; - resultxml = XmlHelper.ModelToXml(main); - LogHelper.WriteLogInfo("标签熄灭失败：当前标签未亮灯！"); - return resultxml; - } } else {