yangxueqian/wcs_server_s7_baoying
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将原本写死的堆垛机编号修改成了读取

Browse Source
This commit is contained in:
杨学谦 2024-06-25 11:05:44 +08:00
parent 6e0e13f910
commit 2e182dfa35
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
WcsMain/Business/CirculationTask/Stacker/ExecuteWcsTask.cs
View File

@ -84,8 +84,7 @@ public class ExecuteWcsTask(StackerOperation stackerOperation, AppWcsTaskDao wcs
var wcsTask = wcsTasks[0]; // 取第一条任务 var wcsTask = wcsTasks[0]; // 取第一条任务
/* 校验入库站台是否可以取货 */ /* 校验入库站台是否可以取货 */
(bool isSuccess, uint value) = _stackerConveyOperation.ReadSenserStatus(wcsTask.Origin); (bool isSuccess, uint value) = _stackerConveyOperation.ReadSenserStatus(wcsTask.Origin);
if (!isSuccess) return false; //站台不允许取货 if (!isSuccess || value == 0) return false; //站台不允许取货
if (value == 0) return false; //站台不允许取货
// TODO // TODO
/* 检验并返回起点终点信息 */ /* 检验并返回起点终点信息 */
@ -105,8 +104,8 @@ public class ExecuteWcsTask(StackerOperation stackerOperation, AppWcsTaskDao wcs
PlcId = wcsTask.PlcId, PlcId = wcsTask.PlcId,
TaskType = Convert.ToInt16(wcsTask.TaskType), TaskType = Convert.ToInt16(wcsTask.TaskType),
GetStand = wcsTask.Origin == "111" ? (short)111 : (short)106, GetStand = wcsTask.Origin == "111" ? (short)111 : (short)106,
InTunnelId = 3, InTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
OutTunnelId = 3, OutTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
SetStand = 0, SetStand = 0,
GetQueue = 1, GetQueue = 1,
GetLine = 1, GetLine = 1,
@ -171,8 +170,8 @@ public class ExecuteWcsTask(StackerOperation stackerOperation, AppWcsTaskDao wcs
PlcId = wcsTask.PlcId, PlcId = wcsTask.PlcId,
TaskType = Convert.ToInt16(wcsTask.TaskType), TaskType = Convert.ToInt16(wcsTask.TaskType),
GetStand = 0, GetStand = 0,
InTunnelId = 3, InTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
OutTunnelId = 3, OutTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
SetStand = Convert.ToInt16(wcsTask.Destination), SetStand = Convert.ToInt16(wcsTask.Destination),
GetQueue = Convert.ToInt16(originLocationInfo.Queue), GetQueue = Convert.ToInt16(originLocationInfo.Queue),
GetLine = Convert.ToInt16(originLocationInfo.Line), GetLine = Convert.ToInt16(originLocationInfo.Line),
@ -237,8 +236,8 @@ public class ExecuteWcsTask(StackerOperation stackerOperation, AppWcsTaskDao wcs
PlcId = wcsTask.PlcId, PlcId = wcsTask.PlcId,
TaskType = Convert.ToInt16(wcsTask.TaskType), TaskType = Convert.ToInt16(wcsTask.TaskType),
GetStand = 0, GetStand = 0,
InTunnelId = 3, InTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
OutTunnelId = 3, OutTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
SetStand = 0, SetStand = 0,
GetQueue = Convert.ToInt16(originLocationInfo.Queue), GetQueue = Convert.ToInt16(originLocationInfo.Queue),
GetLine = Convert.ToInt16(originLocationInfo.Line), GetLine = Convert.ToInt16(originLocationInfo.Line),
@ -301,8 +300,8 @@ public class ExecuteWcsTask(StackerOperation stackerOperation, AppWcsTaskDao wcs
PlcId = wcsTask.PlcId, PlcId = wcsTask.PlcId,
TaskType = Convert.ToInt16(wcsTask.TaskType), TaskType = Convert.ToInt16(wcsTask.TaskType),
GetStand = 0, GetStand = 0,
InTunnelId = 3, InTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
OutTunnelId = 3, OutTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
SetStand = 0, SetStand = 0,
GetQueue = Convert.ToInt16(originLocationInfo.Queue), GetQueue = Convert.ToInt16(originLocationInfo.Queue),
GetLine = Convert.ToInt16(originLocationInfo.Line), GetLine = Convert.ToInt16(originLocationInfo.Line),