From b5625f1b0cbebed336918b5b34e83b2b1da16aeb Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期五, 18 四月 2025 16:41:47 +0800
Subject: [PATCH] 1
---
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs | 160 +++++++++++++++++++++++++++--------------------------
1 files changed, 82 insertions(+), 78 deletions(-)
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
index c70398c..e987315 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
@@ -285,59 +285,101 @@
/// </summary>
private async Task RequestWmsTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue, Dt_StationManager stationManager)
{
- string isTrue = string.Empty;
-
- ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
-
ResultTrayCellsStatus result = GetResultTrayCellsStatus(command, stationManager);
- if (result.SerialNos.Count == 0)
+ if (childDeviceCode == "1435")
{
- var Traycontent = await _taskService.RequestWMSTask(command.Barcode, childDeviceCode);
- if (Traycontent.Status)
- {
- ConsoleHelper.WriteSuccessLine("浜屽皝绌烘璇锋眰鍥炴祦");
- ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
- }
- }
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
- List<string> strings = stationManager.Roadway.Split(",").ToList();
- foreach (string item in strings)
- {
- isTrue = RequestInboundPlatform(item, result.ProductionLine, false);
- if (isTrue != null)
+ var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
+
+ if (serialNosError.Count > 0 || !result.Success || result.SerialNos.Count == 0)
{
- break;
+ WMSTaskDTO taskDTO = new WMSTaskDTO
+ {
+ TaskNum = _taskRepository.GetTaskNo().Result,
+ Grade = 1,
+ PalletCode = command.Barcode,
+ RoadWay = "CHSC4",
+ SourceAddress = childDeviceCode,
+ TargetAddress = "CHSC4",
+ TaskState = (int)TaskInStatusEnum.InNew,
+ Id = 2,
+ TaskType = (int)TaskInboundTypeEnum.InNG,
+ ProductionLine = result.ProductionLine,
+ };
+ var Taskcontent = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
+ if (Taskcontent.Status)
+ {
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+ }
+ ConsoleHelper.WriteSuccessLine($"銆恵stationManager.stationRemark}銆戙�恵stationManager.stationChildCode}銆憑result.MOMMessage}");
+ return;
}
- }
- if (isTrue != null && isTrue != string.Empty)
- {
- WMSTaskDTO taskDTO = new WMSTaskDTO
+ else
{
- TaskNum = _taskRepository.GetTaskNo().Result,
- Grade = 1,
- PalletCode = command.Barcode,
- RoadWay = childDeviceCode,
- SourceAddress = childDeviceCode,
- TargetAddress = isTrue,
- TaskState = (int)TaskOutStatusEnum.SC_OutFinish,
- Id = 2,
- TaskType = (int)TaskOutboundTypeEnum.OutTray,
- ProductionLine = result.ProductionLine,
- };
- var Taskcontent = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
- if (Taskcontent.Status)
- {
- ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+ var Taskcontent = await _taskService.RequestWMSTask(command.Barcode, childDeviceCode);
+ if (Taskcontent.Status)
+ {
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+ }
}
}
else
{
- var Taskcontent = await _taskService.RequestWMSTask(command.Barcode, childDeviceCode);
- if (Taskcontent.Status)
+ string isTrue = string.Empty;
+
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+
+ if (result.SerialNos.Count == 0)
{
- ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+ var Traycontent = await _taskService.RequestWMSTask(command.Barcode, childDeviceCode);
+ if (Traycontent.Status)
+ {
+ ConsoleHelper.WriteSuccessLine("浜屽皝绌烘璇锋眰鍥炴祦");
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+ }
+ }
+
+ List<string> strings = stationManager.Roadway.Split(",").ToList();
+ foreach (string item in strings)
+ {
+ isTrue = RequestInboundPlatform(item, result.ProductionLine, false);
+ if (isTrue != null)
+ {
+ break;
+ }
+ }
+ if (isTrue != null && isTrue != string.Empty)
+ {
+ WMSTaskDTO taskDTO = new WMSTaskDTO
+ {
+ TaskNum = _taskRepository.GetTaskNo().Result,
+ Grade = 1,
+ PalletCode = command.Barcode,
+ RoadWay = childDeviceCode,
+ SourceAddress = childDeviceCode,
+ TargetAddress = isTrue,
+ TaskState = (int)TaskOutStatusEnum.SC_OutFinish,
+ Id = 2,
+ TaskType = (int)TaskOutboundTypeEnum.OutTray,
+ ProductionLine = result.ProductionLine,
+ };
+ var Taskcontent = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
+ if (Taskcontent.Status)
+ {
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+ }
+
+ }
+ else
+ {
+ var Taskcontent = await _taskService.RequestWMSTask(command.Barcode, childDeviceCode);
+ if (Taskcontent.Status)
+ {
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+ }
}
}
}
@@ -419,44 +461,6 @@
{
ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
}
- #region
- //if (task != null && task.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting && task.CurrentAddress == "1537")
- //{
- // ConveyorLineTaskCommand command1 = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(stationManager.stationLocation);
-
- // if (command1.InteractiveSignal != 2)
- // {
- // ConsoleHelper.WriteSuccessLine("鍖栨垚瀹炴墭璇锋眰鍏ラ潤缃�");
- // if (StaticVariable.isStackerRun == true)
- // {
- // ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
- // }
- // return;
- // }
- // else
- // {
- // ConsoleHelper.WriteWarningLine("鍑哄簱浠诲姟鏈畬鎴�");
- // return;
- // }
- //}
- //else if (task != null && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
- //{
- // ConsoleHelper.WriteWarningLine("宸插瓨鍦ㄩ潤缃嚭搴撲换鍔�");
- // return;
- //}
- //else
- //{
- // var Task = await _taskService.RequestWMSTask(command.Barcode, childDeviceCode);
- // if (Task.Status)
- // {
- // if (StaticVariable.isStackerRun == true)
- // {
- // ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
- // }
- // }
- // return;
- //}
- #endregion
}
else
{
--
Gitblit v1.9.3