|
@@ -236,25 +236,25 @@ namespace WCS.WorkEngineering.Systems
|
|
|
//计算下一个地址
|
|
|
var path1 = DevicePath.GetPath(task.AddrFrom, task.Device);
|
|
|
task.AddrNext = path1.Points[1].Code;
|
|
|
- var des1 = task.AddrNext;
|
|
|
- var des2 = "1";
|
|
|
- //分拣一
|
|
|
- if (task.AddrNext == "1604")
|
|
|
- {
|
|
|
- des2 = "1606";
|
|
|
- }
|
|
|
-
|
|
|
- //else if (task.AddrNext == "1614")
|
|
|
+ //var des1 = task.AddrNext;
|
|
|
+ //var des2 = "1";
|
|
|
+ ////分拣一
|
|
|
+ //if (task.AddrNext == "1604")
|
|
|
//{
|
|
|
- // des2 = "1616";
|
|
|
+ // des2 = "1606";
|
|
|
//}
|
|
|
- var num1 = db.Default.Queryable<WCS_TaskInfo>().RowLock().Where(t => t.WorkBench == des1 && t.Status < TaskStatus.Finish && t.Type == TaskType.EnterDepot).Count();
|
|
|
- var num2 = db.Default.Queryable<WCS_TaskInfo>().RowLock().Where(t => t.WorkBench == des2 && t.Status < TaskStatus.Finish && t.Type == TaskType.EnterDepot).Count();
|
|
|
- if (task.AddrNext == "1604")
|
|
|
- {
|
|
|
- task.AddrNext = num1 <= num2 ? des2 : des1;
|
|
|
- }
|
|
|
- task.WorkBench = task.AddrNext;
|
|
|
+
|
|
|
+ ////else if (task.AddrNext == "1614")
|
|
|
+ ////{
|
|
|
+ //// des2 = "1616";
|
|
|
+ ////}
|
|
|
+ //var num1 = db.Default.Queryable<WCS_TaskInfo>().RowLock().Where(t => t.WorkBench == des1 && t.Status < TaskStatus.Finish && t.Type == TaskType.EnterDepot).Count();
|
|
|
+ //var num2 = db.Default.Queryable<WCS_TaskInfo>().RowLock().Where(t => t.WorkBench == des2 && t.Status < TaskStatus.Finish && t.Type == TaskType.EnterDepot).Count();
|
|
|
+ //if (task.AddrNext == "1604")
|
|
|
+ //{
|
|
|
+ // task.AddrNext = num1 <= num2 ? des2 : des1;
|
|
|
+ //}
|
|
|
+ //task.WorkBench = task.AddrNext;
|
|
|
task.SrmStation = task.BarCode.Contains("TPA") || task.BarCode.Contains("TPB") ? task.AddrFrom : path1.Points[2].Code;
|
|
|
|
|
|
db.Default.UpdateableRowLock(task).UpdateColumns(x => new { x.Status, x.Device, x.AddrNext, x.SrmStation, x.WorkBench }).ExecuteCommand();
|