diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user
index 5827539..00fd366 100644
--- a/Epost.TestToolsWeb/Epost.DPS.csproj.user
+++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user
@@ -11,7 +11,7 @@
False
600
D:\驿传\Epost\T_DAS_PTL\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml
- Debug|Any CPU
+ Release|Any CPU
diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
index 05640e8..5dd0de5 100644
--- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
+++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
@@ -7,7 +7,7 @@
<_PublishTargetUrl>D:\驿传\抚远
- True|2023-09-14T07:16:49.3254427Z;True|2023-09-14T15:15:13.5226711+08:00;True|2023-09-14T13:29:32.8021478+08:00;True|2023-09-13T10:41:55.1565224+08:00;True|2023-09-11T11:07:13.1727541+08:00;True|2023-09-04T13:33:29.7459963+08:00;True|2023-09-01T16:56:41.0563400+08:00;False|2023-09-01T16:55:48.4344805+08:00;True|2023-09-01T13:48:48.7619456+08:00;False|2023-09-01T13:47:55.1222255+08:00;True|2023-08-31T12:12:45.4579572+08:00;False|2023-08-31T12:03:58.6171819+08:00;False|2023-08-31T12:03:32.2416438+08:00;True|2023-08-29T14:40:55.7436382+08:00;True|2023-08-29T13:53:07.9540335+08:00;True|2023-08-28T18:11:01.9231397+08:00;True|2023-08-28T14:56:19.8843265+08:00;True|2023-08-23T11:17:33.7204155+08:00;True|2023-08-11T10:59:03.8399200+08:00;True|2023-08-10T10:43:16.0729140+08:00;True|2023-08-08T15:22:08.0127989+08:00;True|2023-08-08T13:59:07.6838749+08:00;True|2023-08-08T13:57:15.7160673+08:00;True|2023-08-03T15:39:49.2488696+08:00;True|2023-08-03T13:13:24.0839734+08:00;True|2023-08-02T14:19:21.5188473+08:00;True|2023-08-02T10:44:46.7436910+08:00;True|2023-08-01T10:42:26.5280618+08:00;True|2023-07-28T15:54:24.3172356+08:00;True|2023-07-25T17:25:54.2443213+08:00;True|2023-07-25T17:24:33.4620388+08:00;True|2023-07-19T16:26:31.8476193+08:00;True|2023-07-19T16:04:27.8753884+08:00;True|2023-07-19T15:38:50.9706808+08:00;True|2023-07-03T13:53:41.0701316+08:00;True|2023-04-27T20:14:15.0331014+08:00;True|2023-04-21T16:37:45.9559800+08:00;True|2023-04-20T19:12:32.4520337+08:00;True|2023-04-20T18:51:17.9201241+08:00;True|2023-04-20T16:36:34.8353434+08:00;True|2023-04-19T11:42:01.7398184+08:00;True|2023-04-19T11:37:42.0024926+08:00;True|2023-04-18T15:36:56.8763198+08:00;True|2023-04-18T14:56:45.8672402+08:00;True|2023-04-17T10:51:00.4138485+08:00;True|2023-04-16T18:42:38.2510554+08:00;False|2023-04-16T18:42:10.5319125+08:00;True|2023-04-16T18:32:05.9038034+08:00;True|2023-04-16T17:11:22.6510841+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;
+ True|2023-12-15T03:52:56.4144409Z;True|2023-09-14T15:16:49.3254427+08:00;True|2023-09-14T15:15:13.5226711+08:00;True|2023-09-14T13:29:32.8021478+08:00;True|2023-09-13T10:41:55.1565224+08:00;True|2023-09-11T11:07:13.1727541+08:00;True|2023-09-04T13:33:29.7459963+08:00;True|2023-09-01T16:56:41.0563400+08:00;False|2023-09-01T16:55:48.4344805+08:00;True|2023-09-01T13:48:48.7619456+08:00;False|2023-09-01T13:47:55.1222255+08:00;True|2023-08-31T12:12:45.4579572+08:00;False|2023-08-31T12:03:58.6171819+08:00;False|2023-08-31T12:03:32.2416438+08:00;True|2023-08-29T14:40:55.7436382+08:00;True|2023-08-29T13:53:07.9540335+08:00;True|2023-08-28T18:11:01.9231397+08:00;True|2023-08-28T14:56:19.8843265+08:00;True|2023-08-23T11:17:33.7204155+08:00;True|2023-08-11T10:59:03.8399200+08:00;True|2023-08-10T10:43:16.0729140+08:00;True|2023-08-08T15:22:08.0127989+08:00;True|2023-08-08T13:59:07.6838749+08:00;True|2023-08-08T13:57:15.7160673+08:00;True|2023-08-03T15:39:49.2488696+08:00;True|2023-08-03T13:13:24.0839734+08:00;True|2023-08-02T14:19:21.5188473+08:00;True|2023-08-02T10:44:46.7436910+08:00;True|2023-08-01T10:42:26.5280618+08:00;True|2023-07-28T15:54:24.3172356+08:00;True|2023-07-25T17:25:54.2443213+08:00;True|2023-07-25T17:24:33.4620388+08:00;True|2023-07-19T16:26:31.8476193+08:00;True|2023-07-19T16:04:27.8753884+08:00;True|2023-07-19T15:38:50.9706808+08:00;True|2023-07-03T13:53:41.0701316+08:00;True|2023-04-27T20:14:15.0331014+08:00;True|2023-04-21T16:37:45.9559800+08:00;True|2023-04-20T19:12:32.4520337+08:00;True|2023-04-20T18:51:17.9201241+08:00;True|2023-04-20T16:36:34.8353434+08:00;True|2023-04-19T11:42:01.7398184+08:00;True|2023-04-19T11:37:42.0024926+08:00;True|2023-04-18T15:36:56.8763198+08:00;True|2023-04-18T14:56:45.8672402+08:00;True|2023-04-17T10:51:00.4138485+08:00;True|2023-04-16T18:42:38.2510554+08:00;False|2023-04-16T18:42:10.5319125+08:00;True|2023-04-16T18:32:05.9038034+08:00;True|2023-04-16T17:11:22.6510841+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;
@@ -33,19 +33,19 @@
04/16/2023 15:06:26
- 09/14/2023 15:14:45
+ 12/15/2023 11:52:28
- 09/14/2023 15:14:45
+ 12/15/2023 11:52:28
02/24/2020 15:29:24
- 09/01/2023 16:55:14
+ 12/15/2023 11:52:01
- 09/01/2023 16:55:14
+ 12/15/2023 11:52:01
04/16/2023 15:06:26
@@ -63,31 +63,31 @@
10/23/2017 13:15:20
- 09/14/2023 15:14:25
+ 12/15/2023 11:52:05
- 09/14/2023 15:14:25
+ 12/15/2023 11:52:05
08/26/2020 18:09:48
- 09/14/2023 15:14:24
+ 12/15/2023 11:52:03
- 09/14/2023 15:14:24
+ 12/15/2023 11:52:03
- 09/14/2023 15:14:32
+ 12/15/2023 11:52:12
- 09/14/2023 15:14:32
+ 12/15/2023 11:52:12
- 07/19/2023 15:37:56
+ 12/01/2023 12:58:20
- 07/19/2023 15:37:56
+ 12/01/2023 12:58:20
09/06/2018 11:57:11
@@ -5652,7 +5652,7 @@
04/16/2023 15:06:27
- 09/14/2023 15:14:36
+ 12/15/2023 11:52:17
04/04/2018 15:45:12
@@ -7572,10 +7572,10 @@
04/16/2023 15:06:27
- 08/31/2023 12:02:52
+ 12/01/2023 12:58:30
- 07/19/2023 15:30:16
+ 12/01/2023 12:54:48
\ No newline at end of file
diff --git a/Epost.TestToolsWeb/WebService/WebService.asmx.cs b/Epost.TestToolsWeb/WebService/WebService.asmx.cs
index 61f37e8..9eb07bb 100644
--- a/Epost.TestToolsWeb/WebService/WebService.asmx.cs
+++ b/Epost.TestToolsWeb/WebService/WebService.asmx.cs
@@ -62,197 +62,47 @@ namespace Epost.DPS.WebService
foreach (DataRow item in ReturnDt.Rows)
{
- #region 判断 亮灯/熄灭
- //灭灯
- if (item["TaskType"].ToString() == "Y")
+
+ DataTable dt = bll.GetDataIfRepeat(item["transderMid"].ToString(), item["transderDid"].ToString());
+ if (dt == null || dt.Rows.Count <= 0)
{
- List list = new List();
- //熄灭指定订单任务
- if (item["Current"].ToString() == "Y")
+ DataTable locdt = bll.GetlocationInfo(item["areaId"].ToString());
+ if (locdt != null && locdt.Rows.Count > 0)
{
- List 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);
+ DataRow dataRow = dtResult.NewRow();
+ dataRow["transderMid"] = item["transderMid"].ToString();
+ dataRow["transderDid"] = item["transderDid"].ToString();
+ dataRow["drugCode"] = item["drugCode"].ToString();
+ dataRow["drugCommName"] = item["drugCommName"].ToString();
+ dataRow["drugName"] = item["drugName"].ToString();
+ dataRow["drugSpec"] = item["drugSpec"].ToString();
+ dataRow["Unit"] = item["Unit"].ToString();
+ dataRow["manufactName"] = item["manufactName"].ToString();
+ dataRow["batchNo"] = item["batchNo"].ToString();
+ dataRow["expire"] = item["expire"].ToString();
+ dataRow["areaId"] = item["areaId"].ToString();
+ dataRow["pickQty"] = item["pickQty"].ToString();
+ dataRow["stock"] = item["stock"].ToString();
+ dataRow["drugStoreName"] = item["drugStoreName"].ToString();
+ dataRow["labelColor"] = item["labelColor"].ToString();
+ dataRow["lookListen"] = item["lookListen"].ToString();
+ dataRow["labelIP"] = item["labelIP"].ToString();
+ dataRow["labelNo"] = item["labelNo"].ToString();
- bll.UpOrdersWaitState(item["transderMid"].ToString());
-
- List jobList = JobCache.GetPlanJobList().FindAll(p => p.OrderID == item["transderMid"].ToString());
-
- LogHelper.WriteLogInfo("熄灭指定订单亮灯任务---订单号：" + item["transderMid"].ToString() + "---条数：" + jobList.Count + "");
- if (jobList != null && jobList.Count > 0)
- {
- foreach (var itemlist in jobList)
- {
- LabelParamModel model = new LabelParamModel();
- model.ControlIP = itemlist.ControlIP.ToString();
- model.Address = itemlist.Address.ToString();
- model.Command = "REMOVE_JOB";
- model.Uid = itemlist.ID.ToString();
- model.Type = "C";
- 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);
- if (!ExjobList.Any())
- {
- LogHelper.WriteLogInfo("熄灭指定订单任务-熄灭通道灯：" + itemlist.Block + "++++" + itemlist.Area + "");
- combll.DISPLAY_LIGHT_BLOCK(itemlist.Block, itemlist.Area, "0");
-
- bool skuInish = bll.IsFinishWork(1, itemlist.Block, "", itemlist.Area, "", "", "");
- if (skuInish)
- {
- LogHelper.WriteLogInfo("通道拣货完成--------------");
-
- #region 修改任务队列状态
- OrdersQueueModel qumodel = new OrdersQueueModel();
- qumodel.State = 3;
- qumodel.Taskblock = itemlist.Block;
- qumodel.Taskarea = itemlist.Area;
- queueBLL.UpdateQueueTaskArea_Car(qumodel);
- #endregion
- bool WorkArea = bll.IsFinishWorkArea("", "", "99", "", "", "");
- if (WorkArea)
- {
- LogHelper.WriteLogInfo("阴凉区完成--------------");
- if (WorkArea)
- {
- combll.DISPLAY_LIGHT_BLOCK_Out("", itemlist.Area, "0");
- }
- }
- }
- }
- }
- dal.SendALL(list);
- bool b = bll.UpOrdersState(item["transderMid"].ToString());
-
- JobCache.UpdateJobModelList(jobList, EcommendType.Execute);
-
- flag = false;
- }
- else
- {
- msg.Status = "erro";
- msg.Message = "标签熄灭失败：当前标签未亮灯！";
- main.msg = msg;
- resultxml = XmlHelper.ModelToXml(main);
- LogHelper.WriteLogInfo("标签熄灭失败：当前标签未亮灯！");
- return resultxml;
- }
- }
- //熄灭全部
- else if (item["Current"].ToString() == "N")
- {
- 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);
-
- 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;
- }
+ dtResult.Rows.Add(dataRow);
}
else
{
- msg.Status = "erro";
- msg.Message = "数据异常：Current参数为空或参数不正确！";
- main.msg = msg;
- resultxml = XmlHelper.ModelToXml(main);
- LogHelper.WriteLogInfo("数据异常：Current参数为空或参数不正确！");
- return resultxml;
- }
- }
- else if (item["TaskType"].ToString() == "N")
- {
- DataTable dt = bll.GetDataIfRepeat(item["transderMid"].ToString(), item["transderDid"].ToString());
- if (dt == null || dt.Rows.Count <= 0)
- {
- DataTable locdt = bll.GetlocationInfo(item["areaId"].ToString());
- if (locdt != null && locdt.Rows.Count > 0)
- {
- DataRow dataRow = dtResult.NewRow();
- dataRow["transderMid"] = item["transderMid"].ToString();
- dataRow["transderDid"] = item["transderDid"].ToString();
- dataRow["drugCode"] = item["drugCode"].ToString();
- dataRow["drugCommName"] = item["drugCommName"].ToString();
- dataRow["drugName"] = item["drugName"].ToString();
- dataRow["drugSpec"] = item["drugSpec"].ToString();
- dataRow["Unit"] = item["Unit"].ToString();
- dataRow["manufactName"] = item["manufactName"].ToString();
- dataRow["batchNo"] = item["batchNo"].ToString();
- dataRow["expire"] = item["expire"].ToString();
- dataRow["areaId"] = item["areaId"].ToString();
- dataRow["pickQty"] = item["pickQty"].ToString();
- dataRow["stock"] = item["stock"].ToString();
- dataRow["drugStoreName"] = item["drugStoreName"].ToString();
- dataRow["labelColor"] = item["labelColor"].ToString();
- dataRow["lookListen"] = item["lookListen"].ToString();
- dataRow["labelIP"] = item["labelIP"].ToString();
- dataRow["labelNo"] = item["labelNo"].ToString();
-
- dtResult.Rows.Add(dataRow);
- }
- else
- {
- LogHelper.WriteLogInfo("" + item["areaId"].ToString() + "，该货位不存在");
- }
- }
- else
- {
- mms += "主键重复 (" + item["transderMid"].ToString() + "-" + item["transderDid"].ToString() + ")，";
+ LogHelper.WriteLogInfo("" + item["areaId"].ToString() + "，该货位不存在");
}
}
else
{
- msg.Status = "erro";
- msg.Message = "数据异常：TaskType参数为空或参数不正确！";
- main.msg = msg;
- resultxml = XmlHelper.ModelToXml(main);
- LogHelper.WriteLogInfo("数据异常：TaskType参数为空或参数不正确！");
+ mms += "主键重复 (" + item["transderMid"].ToString() + "-" + item["transderDid"].ToString() + ")，";
}
- #endregion
}
+
#region 添加
if (!string.IsNullOrEmpty(mms))
{