From 58a8a8843f101b2a1ba25622e2ef8ade605e0c49 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@WIN-16OJST5SSCB>
Date: 星期一, 02 十二月 2024 16:28:23 +0800
Subject: [PATCH] OCV2-包装代码
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
index c1493f6..394f630 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
@@ -47,20 +47,40 @@
/// <summary>
/// 澶勭悊鏂颁换鍔�
/// </summary>
- private void HandleNewTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
+ private async void HandleNewTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
{
- if ((conveyorLine.DeviceCode == "1003" && childDeviceCode == "1016") || (conveyorLine.DeviceCode == "1005" && childDeviceCode == "1048"))
+ var stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == childDeviceCode && x.stationPLC == conveyorLine.DeviceCode);
+
+ switch (stationManager.stationType)
{
- CreateAndSendEmptyTrayTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
+ case 1:
+ await RequestWmsTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
+ break;
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ await CreateAndSendEmptyTrayTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
+ break;
+ case 7:
+ default:
+ ConveyorLineOutFinish(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
+ break;
}
- else if ((conveyorLine.DeviceCode == "1001" && childDeviceCode == "1088") || (conveyorLine.DeviceCode == "1004" && childDeviceCode == "1339"))
- {
- RequestWmsTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
- }
- else if ((conveyorLine.DeviceCode == "1001" && childDeviceCode == "1068"))
- {
- ConveyorLineOutFinish(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
- }
+
+ //if ((conveyorLine.DeviceCode == "1003" && childDeviceCode == "1016") || (conveyorLine.DeviceCode == "1005" && childDeviceCode == "1048"))
+ //{
+ // await CreateAndSendEmptyTrayTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
+ //}
+ //else if ((conveyorLine.DeviceCode == "1001" && childDeviceCode == "1088") || (conveyorLine.DeviceCode == "1004" && childDeviceCode == "1339"))
+ //{
+ // await RequestWmsTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
+ //}
+ //else if ((conveyorLine.DeviceCode == "1001" && childDeviceCode == "1068"))
+ //{
+ // ConveyorLineOutFinish(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
+ //}
}
/// <summary>
@@ -109,7 +129,7 @@
/// <summary>
/// 鍒涘缓骞跺彂閫佺┖鎵樼洏浠诲姟
/// </summary>
- public void CreateAndSendEmptyTrayTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
+ public Task CreateAndSendEmptyTrayTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
{
if (command.Barcode != "NoRead")
{
@@ -118,7 +138,6 @@
if (_taskRepository.QueryFirst(x => x.PalletCode == taskDTO.PalletCode) != null)
{
WriteInfo(conveyorLine.DeviceName, "褰撳墠鎵樼洏瀛樺湪浠诲姟");
- return;
}
var content = CreateAndSendTask(taskDTO);
@@ -134,6 +153,8 @@
}
}
}
+
+ return Task.CompletedTask;
}
/// <summary>
@@ -169,7 +190,7 @@
/// <summary>
/// 璇锋眰WMS浠诲姟
/// </summary>
- private async void RequestWmsTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
+ private async Task RequestWmsTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
{
var content = await _taskService.RequestWMSTask(command.Barcode, childDeviceCode);
if (content.Status)
@@ -188,4 +209,3 @@
}
}
}
-
\ No newline at end of file
--
Gitblit v1.9.3