|
|
@@ -259,6 +259,8 @@ namespace WCS.WorkEngineering.Systems
|
|
|
|
|
|
case 2:
|
|
|
taskList = taskList.OrderBy(x => x.Item1.Depth).ToList();
|
|
|
+ var maxWmsTask = taskList.Max(x => x.Item1.WmsTask).ToShort();
|
|
|
+ var minWmsTask = taskList.Min(x => x.Item1.WmsTask).ToShort();
|
|
|
//一工位取深度较大的任务
|
|
|
var taskInfo = taskList[1];
|
|
|
task = taskInfo.Item1;
|
|
|
@@ -269,7 +271,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
obj.Data.SLayer1 = 0;
|
|
|
obj.Data.SDepth1 = 0;
|
|
|
obj.Data.ELine1 = task.AddrTo.ToShort();
|
|
|
- obj.Data.ECol1 = task.WmsTask.ToShort();
|
|
|
+ obj.Data.ECol1 = task.WarehouseCode.Contains("N") ? minWmsTask : maxWmsTask;
|
|
|
obj.Data.ELayer1 = 0;
|
|
|
obj.Data.EDepth1 = 0;
|
|
|
//二工位取深度较少的值
|
|
|
@@ -282,7 +284,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
obj.Data.SLayer2 = 0;
|
|
|
obj.Data.SDepth2 = 0;
|
|
|
obj.Data.ELine2 = task.AddrTo.ToShort();
|
|
|
- obj.Data.ECol2 = task.WmsTask.ToShort();
|
|
|
+ obj.Data.ECol2 = task.WarehouseCode.Contains("N") ? maxWmsTask : minWmsTask;
|
|
|
obj.Data.ELayer2 = 0;
|
|
|
obj.Data.EDepth2 = 0;
|
|
|
obj.Data.TaskSum = taskList.Count.ToShort();
|
|
|
@@ -441,8 +443,10 @@ namespace WCS.WorkEngineering.Systems
|
|
|
obj.Data.SCol1 = 0;
|
|
|
obj.Data.SLayer1 = 0;
|
|
|
obj.Data.SDepth1 = 0;
|
|
|
- obj.Data.ELine1 = task.AddrTo.ToShort();
|
|
|
- obj.Data.ECol1 = task.WarehouseCode.Contains("N") ? minWmsTask : maxWmsTask;
|
|
|
+ obj.Data.ELine1 = task.Line.ToShort();
|
|
|
+ obj.Data.ECol1 = task.Col.ToShort();
|
|
|
+ obj.Data.ELayer1 = task.Layer.ToShort();
|
|
|
+ obj.Data.EDepth1 = task.Depth.ToShort();
|
|
|
obj.Data.ELayer1 = 0;
|
|
|
obj.Data.EDepth1 = 0;
|
|
|
//二工位取深度较少的值
|
|
|
@@ -454,8 +458,10 @@ namespace WCS.WorkEngineering.Systems
|
|
|
obj.Data.SCol2 = 0;
|
|
|
obj.Data.SLayer2 = 0;
|
|
|
obj.Data.SDepth2 = 0;
|
|
|
- obj.Data.ELine2 = task.AddrTo.ToShort();
|
|
|
- obj.Data.ECol2 = task.WarehouseCode.Contains("N") ? maxWmsTask : minWmsTask;
|
|
|
+ obj.Data.ELine1 = task.Line.ToShort();
|
|
|
+ obj.Data.ECol1 = task.Col.ToShort();
|
|
|
+ obj.Data.ELayer1 = task.Layer.ToShort();
|
|
|
+ obj.Data.EDepth1 = task.Depth.ToShort();
|
|
|
obj.Data.ELayer2 = 0;
|
|
|
obj.Data.EDepth2 = 0;
|
|
|
obj.Data.TaskSum = taskList.Count.ToShort();
|
