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-11-07 16:04:21 +08:00
parent 7d3f50c97b
commit a77604f299
6 changed files with 748 additions and 706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Epost.TestToolsWeb/Epost.DPS.csproj.user
View File

@ -10,7 +10,7 @@
<WebStackScaffolding_LayoutPageFile>~/Views/Shared/_EpostLayoutPage.cshtml</WebStackScaffolding_LayoutPageFile>
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
<NameOfLastUsedPublishProfile>E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\驿传\Epost\T_DAS_PTL\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />

1354
Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
View File

File diff suppressed because it is too large Load Diff

2
Epost.TestToolsWeb/Web.config
View File

@ -28,7 +28,7 @@
<add key="WebAPIUrl" value="http://localhost:63118/api/WebAPI/ProcessingResult"/>
<add key="ShowMode" value="1" />
<add key="SetupMode" value="\Epost_P\Epost.TestToolsWeb\App_Data\SetupMode.txt" />
<add key="CARID" value="HT01" />
<add key="CARID" value="" />
<add key="ServerAPIURL" value="http://localhost:63118/api/WebAPI" />
<add key="SleepTime" value="1" />
</appSettings>

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

@ -70,7 +70,15 @@ namespace Epost.DPS.WebService
//熄灭指定订单任务
if (item["Current"].ToString() == "Y")
{
List<JobModel> jobWaitList = JobCache.GetPlanJobList().FindAll(p => p.OrderID == item["transderMid"].ToString() && p.State != 1);
LogHelper.WriteLogInfo("熄灭指定订单亮灯任务---一对多标签---修改等待亮灯的状态---订单号：" + item["transderMid"].ToString() + "---条数：" + jobWaitList.Count + "");
JobCache.UpdateJobModelList(jobWaitList, EcommendType.Execute);
bll.UpOrdersWaitState(item["transderMid"].ToString());
List<JobModel> jobList = JobCache.GetPlanJobList().FindAll(p => p.OrderID == item["transderMid"].ToString());
LogHelper.WriteLogInfo("熄灭指定订单亮灯任务---订单号：" + item["transderMid"].ToString() + "---条数：" + jobList.Count + "");
if (jobList != null && jobList.Count > 0)
{
@ -142,37 +150,47 @@ 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<JobModel> jobList = JobCache.GetPlanJobList();
JobCache.UpdateJobModelList(jobList, EcommendType.CompleteAll);
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);
flag = false;
bool b = bll.UpOrdersState("");
//修改队列状态
queueBLL.updateOrderQueueState();
JobCache.UpdateJobModelList(jobList, EcommendType.CompleteAll);
flag = false;
}
else
{
msg.Status = "erro";
msg.Message = "标签熄灭失败：当前标签未亮灯！";
main.msg = msg;
resultxml = XmlHelper.ModelToXml(main);
LogHelper.WriteLogInfo("标签熄灭失败：当前标签未亮灯！");
return resultxml;
}
}
else
{