From 5431646d7fc6bd18e3fe9484b875084e620d6dc6 Mon Sep 17 00:00:00 2001 From: 肖洋 <cathay_xy@163.com> Date: 星期日, 15 十二月 2024 09:28:05 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu --- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 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 e621d92..422f58b 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 @@ -1,20 +1,15 @@ -锘縰sing Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +锘縰sing HslCommunication; +using Newtonsoft.Json; +using System.Text.RegularExpressions; +using WIDESEAWCS_Common; using WIDESEAWCS_Common.TaskEnum; -using WIDESEAWCS_Core.Helper; using WIDESEAWCS_Core; +using WIDESEAWCS_Core.Helper; using WIDESEAWCS_DTO.TaskInfo; +using WIDESEAWCS_DTO.WMS; using WIDESEAWCS_Model.Models; using WIDESEAWCS_QuartzJob; using WIDESEAWCS_Tasks.ConveyorLineJob; -using HslCommunication; -using WIDESEAWCS_DTO.WMS; -using WIDESEAWCS_Common; -using System.Text.RegularExpressions; namespace WIDESEAWCS_Tasks { @@ -60,22 +55,26 @@ switch (stationManager.stationType) { + case 5: 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: RequestOutNextAddress(conveyorLine, command, childDeviceCode, ProtocalDetailValue); break; + case 10: ConveyorLineOutFinish(conveyorLine, command, childDeviceCode, ProtocalDetailValue); break; + default: break; } @@ -233,4 +232,4 @@ WriteInfo(conveyorLine.DeviceName, content.Message); } } -} +} \ No newline at end of file -- Gitblit v1.9.3