Skip to content

L
Laisi_AutoMES2
Commit 103712a9 by jiawei.su
Options

fixedbug

parent af2ec884
Showing with 21 additions and 21 deletions
Server/Apis/Siger.ApiACC/Controllers/AutomationController.cs
...@@ -452,32 +452,32 @@ namespace Siger.ApiACC.Controllers ...@@ -452,32 +452,32 @@ namespace Siger.ApiACC.Controllers
if (location != null) if (location != null)
{ {
// * 更新下一个工序到储位 // * 更新下一个工序到储位
var locationObj = _automationLocation.Get(f => f.id == location.lid); //var locationObj = _automationLocation.Get(f => f.id == location.lid);
if (locationObj != null) //if (locationObj != null)
{ //{
var doneRoute = _productRoute.Get(f => f.id == location.route); //var doneRoute = _productRoute.Get(f => f.id == location.route);
if (doneRoute == null) //if (doneRoute == null)
return; // return;
var productRoutes = _productRoute.GetList(f => f.projectId == PID && f.productId == location.productId && f.status == (int)RowState.Valid && f.serialNumber > doneRoute.serialNumber); //var productRoutes = _productRoute.GetList(f => f.projectId == PID && f.productId == location.productId && f.status == (int)RowState.Valid && f.serialNumber > doneRoute.serialNumber);
if (!productRoutes.Any()) //if (!productRoutes.Any())
{ //{
locationObj.route = string.Empty; // locationObj.route = string.Empty;
} //}
else //else
{ //{
var nextRoute = productRoutes.OrderBy(d => d.serialNumber).FirstOrDefault(); // var nextRoute = productRoutes.OrderBy(d => d.serialNumber).FirstOrDefault();
locationObj.routeid = nextRoute != null ? nextRoute.id : 0; // locationObj.routeid = nextRoute != null ? nextRoute.id : 0;
locationObj.route = nextRoute != null ? nextRoute.name : ""; // locationObj.route = nextRoute != null ? nextRoute.name : "";
} //}
//工件已出立库 ////工件已出立库
locationObj.status = (int)LocationStatus.Out; //locationObj.status = (int)LocationStatus.Out;
_automationLocation.Update(locationObj); //_automationLocation.Update(locationObj);
CreateTask(location.section, TaskActionType.Load, TaskAction.Step_LK_JGZX, location.fixture, location.ordernumber, location.sn, location.pn, location.productId, location.productCode, location.location,location.route); CreateTask(location.section, TaskActionType.Load, TaskAction.Step_LK_JGZX, location.fixture, location.ordernumber, location.sn, location.pn, location.productId, location.productCode, location.location,location.route);
return; //完成当前任务 退出 return; //完成当前任务 退出
} //}
} }
} }
//优先级3：其他设备下料 (加工中心 ->清洗机) //优先级3：其他设备下料 (加工中心 ->清洗机)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment