From af9c3ed5d036ad68faf7e18f566679b3da92d244 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期六, 22 三月 2025 11:36:06 +0800
Subject: [PATCH] 合并
---
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs | 74 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 37 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 4b2fcb7..ba5dfc1 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
@@ -148,12 +148,12 @@
{
string isTrue = string.Empty;
- //ResultTrayCellsStatus result = GetResultTrayCellsStatus(command, stationManager);
+ ResultTrayCellsStatus result = GetResultTrayCellsStatus(command, stationManager);
List<string> strings = stationManager.Roadway.Split(",").ToList();
foreach (string item in strings)
{
- isTrue = RequestInboundPlatform(item, "ZJ-11", true);
+ isTrue = RequestInboundPlatform(item, result.ProductionLine, true);
if (isTrue != null)
{
break;
@@ -174,7 +174,7 @@
TaskState = (int)TaskOutStatusEnum.OutNew,
Id = 0,
TaskType = (int)TaskOutboundTypeEnum.TrayInToOut,
- ProductionLine = "ZJ-11",
+ ProductionLine = result.ProductionLine,
};
}
else
@@ -283,47 +283,47 @@
{
string isTrue = string.Empty;
- //ResultTrayCellsStatus result = GetResultTrayCellsStatus(command, stationManager);
+ ResultTrayCellsStatus result = GetResultTrayCellsStatus(command, stationManager);
- //List<string> strings = stationManager.Roadway.Split(",").ToList();
- //foreach (string item in strings)
- //{
- // isTrue = RequestInboundPlatform(conveyorLine, 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.OutNew,
- // Id = 2,
- // TaskType = (int)TaskOutboundTypeEnum.InToOut,
- // ProductionLine = result.ProductionLine,
- // };
- // var Taskcontent = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
- // if (Taskcontent.Status)
- // {
- // 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.OutNew,
+ Id = 2,
+ TaskType = (int)TaskOutboundTypeEnum.InToOut,
+ ProductionLine = result.ProductionLine,
+ };
+ var Taskcontent = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
+ if (Taskcontent.Status)
+ {
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+ }
- //}
- //else
- //{
+ }
+ else
+ {
var Taskcontent = await _taskService.RequestWMSTask(command.Barcode, childDeviceCode);
if (Taskcontent.Status)
{
ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
}
- //}
+ }
#region
//if (Taskcontent.Status)
--
Gitblit v1.9.3