hanlihui520/T-DAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
帅凯 贾
2023-09-14 13:27:34 +08:00
parent 29bfe4c6aa
commit 7d3f50c97b
1 changed files with 35 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Epost.TestToolsWeb/WebService/WebService.asmx.cs
View File

@ -54,7 +54,7 @@ namespace Epost.DPS.WebService
bool flag = true; bool flag = true;
string mms = string.Empty; string mms = string.Empty;
LogHelper.WriteLogInfo("======开始处理数据======"); 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) if (set != null && set.Tables.Count > 0 && set.Tables[0].Rows.Count > 0)
{ {
var ReturnDt = set.Tables["pick"]; var ReturnDt = set.Tables["pick"];
@ -92,7 +92,7 @@ namespace Epost.DPS.WebService
bll.UpdateOrderState_Car(downlist, itemlist, itemlist.Quantity, 0); bll.UpdateOrderState_Car(downlist, itemlist, itemlist.Quantity, 0);
List<JobModel> ExjobList = JobCache.GetPlanJobList().FindAll(p => p.Block == itemlist.Block && p.Area == itemlist.Area&&p.State!=3); List<JobModel> ExjobList = JobCache.GetPlanJobList().FindAll(p => p.Block == itemlist.Block && p.Area == itemlist.Area && p.State != 3);
if (!ExjobList.Any()) if (!ExjobList.Any())
{ {
LogHelper.WriteLogInfo("熄灭指定订单任务-熄灭通道灯：" + itemlist.Block + "++++" + itemlist.Area + ""); LogHelper.WriteLogInfo("熄灭指定订单任务-熄灭通道灯：" + itemlist.Block + "++++" + itemlist.Area + "");
@ -118,13 +118,9 @@ namespace Epost.DPS.WebService
{ {
combll.DISPLAY_LIGHT_BLOCK_Out("", itemlist.Area, "0"); combll.DISPLAY_LIGHT_BLOCK_Out("", itemlist.Area, "0");
} }
} }
} }
} }
} }
dal.SendALL(list); dal.SendALL(list);
bool b = bll.UpOrdersState(item["transderMid"].ToString()); bool b = bll.UpOrdersState(item["transderMid"].ToString());
@ -146,10 +142,7 @@ namespace Epost.DPS.WebService
//熄灭全部 //熄灭全部
else if (item["Current"].ToString() == "N") else if (item["Current"].ToString() == "N")
{ {
List<JobModel> jobList = JobCache.GetPlanJobList();
if (jobList != null && jobList.Count > 0)
{
DataTable dt = addbll.GetForcedendAddress(); DataTable dt = addbll.GetForcedendAddress();
foreach (DataRow additem in dt.Rows) foreach (DataRow additem in dt.Rows)
{ {
@ -174,19 +167,12 @@ namespace Epost.DPS.WebService
bool b = bll.UpOrdersState(""); bool b = bll.UpOrdersState("");
//修改队列状态 //修改队列状态
queueBLL.updateOrderQueueState(); queueBLL.updateOrderQueueState();
List<JobModel> jobList = JobCache.GetPlanJobList();
JobCache.UpdateJobModelList(jobList, EcommendType.CompleteAll); 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 else
{ {