From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
index 4a42ec1..52cf203 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
@@ -1,19 +1,14 @@
-锘縰sing Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+锘縰sing Masuit.Tools;
+using Newtonsoft.Json;
+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 WIDESEAWCS_DTO.WMS;
-using WIDESEAWCS_Common;
-using Masuit.Tools;
namespace WIDESEAWCS_Tasks
{
@@ -71,6 +66,7 @@
ExecuteStationAction(stationManager, conveyorLine, command, childDeviceCode);
}
break;
+
case 1:
case 6:
case 10:
@@ -134,7 +130,6 @@
// }
//}
#endregion
-
}
private void ExecuteStationAction(Dt_StationManager stationManager, CommonConveyorLine_GW conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode)
@@ -144,21 +139,27 @@
case 8:
RequestInNextAddress(conveyorLine, command, childDeviceCode);
break;
+
case 9:
ConveyorLineInFinish(conveyorLine, command, childDeviceCode);
break;
+
case 10:
RequestOutbound(conveyorLine, command, childDeviceCode);
break;
+
case 11:
RequestOutNextAddress(conveyorLine, command, childDeviceCode);
break;
+
case 12:
ConveyorLineOutFinish(conveyorLine, command, childDeviceCode);
break;
+
case 6:
CreateAndSendEmptyTrayTask(conveyorLine, command, childDeviceCode);
break;
+
case 1:
//if (stationManager.stationArea.Contains("GW"))
@@ -346,4 +347,4 @@
//_taskRepository.QueryFirst()
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3