|
|
@@ -253,12 +253,12 @@ namespace WCS.WorkEngineering.Systems
|
|
|
50 => 3,
|
|
|
_ => 0
|
|
|
};
|
|
|
- obj.Data.TaskType = 3;
|
|
|
+ obj.Data.TaskType = 6;
|
|
|
obj.Data.VoucherNo++;
|
|
|
break;
|
|
|
|
|
|
case 2:
|
|
|
- taskList = taskList.OrderBy(x => x.Item1.Depth).ToList();
|
|
|
+ taskList = taskList.OrderByDescending(x => x.Item2.Entity.Code.ToInt()).ToList();
|
|
|
var maxWmsTask = taskList.Max(x => x.Item1.WmsTask).ToShort();
|
|
|
var minWmsTask = taskList.Min(x => x.Item1.WmsTask).ToShort();
|
|
|
//一工位取深度较大的任务
|
|
|
@@ -295,7 +295,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
50 => 3,
|
|
|
_ => 0
|
|
|
};
|
|
|
- obj.Data.TaskType = 3;
|
|
|
+ obj.Data.TaskType = 6;
|
|
|
obj.Data.VoucherNo++;
|
|
|
break;
|
|
|
|
|
|
@@ -433,9 +433,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
|
|
|
case 2:
|
|
|
|
|
|
- taskList = taskList.OrderByDescending(x => x.Item2.Entity.Code.ToInt()).ToList();
|
|
|
- var maxWmsTask = taskList.Max(x => x.Item1.WmsTask).ToShort();
|
|
|
- var minWmsTask = taskList.Min(x => x.Item1.WmsTask).ToShort();
|
|
|
+ taskList = taskList = taskList.OrderBy(x => x.Item1.Depth).ToList();
|
|
|
//一工位取深度较大的任务
|
|
|
var taskInfo = taskList[1];
|
|
|
task = taskInfo.Item1;
|