From 824853fe17b79ed253cd52db58459806bf0371ee Mon Sep 17 00:00:00 2001
From: xiaoyang <xiaoyang@hnkhzn.com>
Date: 星期五, 08 十一月 2024 17:27:50 +0800
Subject: [PATCH] 11.08
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 223 +++++++++++--------------------------------------------
1 files changed, 46 insertions(+), 177 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
index cb46e26..16dccc6 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -175,139 +175,25 @@
/// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
public void RequestInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
{
- // 鑾峰彇涓嬩竴涓换鍔�
- var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
- //var taskOut = _taskService.QueryNextConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
- //return;
- // 澶勭悊鍑哄簱浠诲姟
- HandleTaskOut(conveyorLine, command, childDeviceCode, ProtocalDetailValue, task);
-
- // 濡傛灉娌℃湁鍑哄簱浠诲姟锛屽鐞嗘柊浠诲姟
- if (task == null && command.Barcode != "NoRead")
+ try
{
- HandleNewTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
+ // 鑾峰彇涓嬩竴涓换鍔�
+ var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
+ //var taskOut = _taskService.QueryNextConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
+ //return;
+ // 澶勭悊鍑哄簱浠诲姟
+ HandleTaskOut(conveyorLine, command, childDeviceCode, ProtocalDetailValue, task);
+
+ // 濡傛灉娌℃湁鍑哄簱浠诲姟锛屽鐞嗘柊浠诲姟
+ if (task == null && command.Barcode != "NoRead")
+ {
+ HandleNewTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
+ }
}
-
- #region 鑰佺増鏈�
-
- //var taskNew = _taskService.QueryCraneConveyorLineTask(command.Barcode.ObjToInt(), childDeviceCode);
- //var Taskout = _taskService.QueryNextConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
- //if (Taskout != null)
- //{
- // // 绌烘墭鐩樹换鍔�
- // if (Taskout.TaskType == (int)TaskOutboundTypeEnum.OutTray)
- // {
- // ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout);
- // taskCommand.InteractiveSignal = command.InteractiveSignal;
- // if (command.Barcode == "")
- // {
- // var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == Taskout.TargetAddress).Capacity;
- // taskCommand.TargetAddress = NGAddress;
- // }
- // conveyorLine.SendCommand(taskCommand, childDeviceCode);
-
- // ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-
- // _taskService.UpdateTaskStatusToNext(Taskout);
- // }
- // else if (Taskout.TaskType == (int)TaskOutboundTypeEnum.Outbound)
- // {
- // ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout);
- // taskCommand.InteractiveSignal = command.InteractiveSignal;
- // if (Taskout.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
- // {
- // if (command.Barcode == "")
- // {
- // var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == Taskout.TargetAddress).Capacity;
- // taskCommand.TargetAddress = NGAddress;
- // }
- // conveyorLine.SendCommand(taskCommand, childDeviceCode);
-
- // ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-
- // _taskService.UpdateTaskStatusToNext(Taskout);
- // }
- // else if (Taskout.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
- // {
- // if (command.Barcode == "")
- // {
- // var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == Taskout.TargetAddress).Capacity;
- // taskCommand.TargetAddress = NGAddress;
-
- // conveyorLine.SendCommand(taskCommand, childDeviceCode);
-
- // ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- // _taskService.UpdateTaskStatusToNext(Taskout);
- // }
- // else
- // {
- // // todo 璋冪敤WMS浠诲姟瀹屾垚鎺ュ彛
- // var x = new { taskNum = Taskout.TaskNum };
- // var result = HttpHelper.GetAsync("http:127.0.0.1:8098/api/Task/CompleteTaskAsync", x.ToJsonString()).Result;
- // WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);
- // if (content.Status)
- // {
- // ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- // _taskService.UpdateTaskStatusToNext(Taskout);
- // }
- // }
- // }
- // }
- //}
- //if (taskNew == null)
- //{
- // // 鍖栨垚->闄堝寲绌烘墭鐩樺洖娴�
- // if (conveyorLine.DeviceCode == "1003" && childDeviceCode == "1016")
- // {
- // //TODO 璋冪敤WMS鍒涘缓鍖栨垚->闄堝寲绌烘墭鐩樺洖娴�
- // WMSTaskDTO taskDTO = new WMSTaskDTO()
- // {
- // TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
- // Grade = 1,
- // PalletCode = command.Barcode,
- // RoadWay = "CHSC01",
- // SourceAddress = childDeviceCode,
- // TargetAddress = "CHSC01",
- // TaskState = (int)TaskInStatusEnum.InNew,
- // Id = 0,
- // TaskType = (int)TaskInboundTypeEnum.InTray,
- // };
- // WebResponseContent content = CreateAndSendTask(taskDTO);
- // if (content.Status)
- // {
- // Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
- // if (task != null)
- // {
- // ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
- // taskCommand.InteractiveSignal = command.InteractiveSignal;
- // conveyorLine.SendCommand(taskCommand, childDeviceCode);
-
- // ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-
- // _taskService.UpdateTaskStatusToNext(task);
- // }
- // }
- // }
- // else
- // {
- // if (_taskService.RequestWMSTask(command.Barcode, childDeviceCode).Status)
- // {
- // Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
- // if (task != null)
- // {
- // ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
- // taskCommand.InteractiveSignal = command.InteractiveSignal;
- // conveyorLine.SendCommand(taskCommand, childDeviceCode);
-
- // ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-
- // _taskService.UpdateTaskStatusToNext(task);
- // }
- // }
- // }
- //}
-
- #endregion
+ catch (Exception ex)
+ {
+ return;
+ }
}
/// <summary>
@@ -418,18 +304,6 @@
taskCommand.TargetAddress = 0;
}
- #region 鍚慦MS涓婃姤浠诲姟瀹屾垚
-
- WMSTaskDTO wMSTaskDTO = new WMSTaskDTO();
- var result = HttpHelper.PostAsync("http:127.0.0.1:8098/api/Task/CompleteTaskAsync", (new { taskNum = command.TaskNum }).ToJsonString()).Result;
-
- content = JsonConvert.DeserializeObject<WebResponseContent>(result);
-
- // 妫�鏌ョ姸鎬佸苟杩斿洖
- if (!content.Status)
- return;
-
- #endregion 鍚慦MS璇锋眰绌烘墭鐩樹换鍔�
conveyorLine.SendCommand(taskCommand, childDeviceCode);
ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
@@ -437,18 +311,6 @@
}
}
- /// <summary>
- /// 鍒涘缓浠诲姟骞跺彂閫佽姹�
- /// </summary>
- public WebResponseContent CreateAndSendTask(WMSTaskDTO taskDTO)
- {
- var content = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
- if (content.Status)
- {
- Console.WriteLine($"{taskDTO.TaskType}鍛煎彨鎴愬姛");
- }
- return content;
- }
/// <summary>
/// 闄堝寲绌烘墭鐩樺嚭搴�
@@ -457,14 +319,21 @@
/// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
/// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
/// <param name="index">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
- public void EmptyTrayReturn(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int index, Platform platform)
+ public async void EmptyTrayReturn(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int index, Platform platform)
{
- TaskOutboundTypeEnum taskOutboundTypeEnum;
- if (platform.PlatformType.Contains("OutTray"))
- taskOutboundTypeEnum = TaskOutboundTypeEnum.OutTray;
- else
- taskOutboundTypeEnum = TaskOutboundTypeEnum.Outbound;
- CheckAndCreateTask(TaskOutboundTypeEnum.OutTray, childDeviceCode, index, platform.Stacker.Split(',')[0], platform.Stacker.Split(',').ToList());
+ try
+ {
+ TaskOutboundTypeEnum taskOutboundTypeEnum;
+ if (platform.PlatformType.Contains("OutTray"))
+ taskOutboundTypeEnum = TaskOutboundTypeEnum.OutTray;
+ else
+ taskOutboundTypeEnum = TaskOutboundTypeEnum.Outbound;
+ await CheckAndCreateTask(taskOutboundTypeEnum, childDeviceCode, index, platform.Stacker.Split(',')[0], platform.Stacker.Split(',').ToList());
+ }
+ catch (Exception)
+ {
+
+ }
}
#region
@@ -506,33 +375,21 @@
/// <summary>
/// 妫�鏌ヤ换鍔″苟鍒涘缓鏂颁换鍔�
/// </summary>
- private void CheckAndCreateTask(TaskOutboundTypeEnum taskType, string childDeviceCode, int index, string roadWay, List<string> roadways = null)
+ private async Task CheckAndCreateTask(TaskOutboundTypeEnum taskType, string childDeviceCode, int index, string roadWay, List<string> roadways = null)
{
var tasks = _taskRepository.QueryData(x => x.TaskType == (int)taskType && x.TargetAddress == childDeviceCode);
if (tasks.Count < index)
{
- //var taskDTO = new WMSTaskDTO()
- //{
- // TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
- // Grade = 1,
- // PalletCode = DateTime.Now.ToString("yyyyMMddHHmmss"),
- // RoadWay = roadWay,
- // SourceAddress = sourceAddress,
- // TargetAddress = childDeviceCode,
- // TaskState = (int)TaskOutStatusEnum.OutNew,
- // Id = 0,
- // TaskType = (int)taskType
- //};
#region 璋冪敤WMS鑾峰彇鍑哄簱浠诲姟
WMSTaskDTO taskDTO = new WMSTaskDTO();
- dynamic dynamic = new
+ object dynamic = new
{
position = childDeviceCode,
tag = (int)taskType,
areaCdoe = roadWay,
roadways = roadways
};
- var result = HttpHelper.PostAsync("http:127.0.0.1:8098/api/Task/RequestTaskAsync", dynamic.ToJsonString()).Result;
+ var result = await HttpHelper.PostAsync("http://localhost:5000/api/Task/RequestTrayOutTaskAsync", dynamic.ToJsonString());
WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);
@@ -548,6 +405,18 @@
}
/// <summary>
+ /// 鍒涘缓浠诲姟
+ /// </summary>
+ public WebResponseContent CreateAndSendTask(WMSTaskDTO taskDTO)
+ {
+ var content = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
+ if (content.Status)
+ {
+ Console.WriteLine($"{taskDTO.TaskType}鍛煎彨鎴愬姛");
+ }
+ return content;
+ }
+ /// <summary>
/// 杈撻�佺嚎浜や簰瀹屾垚
/// </summary>
/// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
--
Gitblit v1.9.3