Skip to content

L
Laisi_AutoMES2
Commit 70a1d7ff by jiawei.su
Options

someupdate

parent 5fd3417b
Showing with 81 additions and 51 deletions
Server/Apis/Siger.ApiACC/Controllers/AutomationController.cs
......@@ -207,11 +207,10 @@ namespace Siger.ApiACC.Controllers
{
throw new BadRequestException(CommonEnum.RecordNotFound);
}
//if (taskObj.status==(int)TaskResultStatus.Complated)
//{
// throw new BadRequestException(AccEnum.AutoTaskDone);
//}
if (taskObj.status == (int)TaskResultStatus.Complated)
{
throw new BadRequestException(AccEnum.AutoTaskDone);
}
//更新Tasklist
PlCfeeback(taskObj, request.status);
......@@ -321,31 +320,54 @@ namespace Siger.ApiACC.Controllers
location.status = (int)LocationStatus.Out;
_automationLocation.Update(location);
}
if (taskObj.action== TaskAction.Step_CJT_SXLW)
{
}
}
//清洗机
if (sectionProperty.propertytype == 4)
{
if (taskObj.action == TaskAction.Step_QXJ_LK)
{
//上料 指定的第一道工序
var route = _productRoute.GetList(f => f.productId == taskObj.productid && f.status == (int)RowState.Valid, "serialNumber", true).FirstOrDefault();
if (route == null)
var currenRute = _productRoute.Get(f => f.id == taskObj.route);
if (currenRute==null)
{
throw new BadRequestException(AccEnum.ProductRouteMissing);
}
if (route.id == location.routeid)
var nextRoute = _productRoute.GetList(f => f.productId == taskObj.productid && f.serialNumber>currenRute.serialNumber && f.status == (int)RowState.Valid, "serialNumber", false).FirstOrDefault();
var route = 0;
if (nextRoute != null)
{
Logger.WriteLineInfo($"PlCfeeback 工装储位{taskObj.locationid} 工序{location.routeid}-{location.routenum}完成");
//最后一道工序
location.routeid = 0;
location.route = "0";
route = nextRoute.id;
}
//更新下一到工序
location.routeid = route;
location.route = route.ToString();
location.status = (int)LocationStatus.In;
_automationLocation.Update(location);
}
else
{
Logger.WriteLineInfo($"PlCfeeback 工装储位{taskObj.locationid} 工序{location.routeid}-{location.routenum}为完成");
}
Logger.WriteLineInfo($"PlCfeeback 工装储位{taskObj.locationid} 工序{location.routeid}-{location.routenum}完成");
Logger.WriteLineInfo($"PlCfeeback 工装储位{taskObj.locationid} 下一工序{route}更新完成");
//if (route.id == location.routeid)
//{
// Logger.WriteLineInfo($"PlCfeeback 工装储位{taskObj.locationid} 工序{location.routeid}-{location.routenum}完成");
// //最后一道工序
// location.routeid = 0;
// location.route = "0";
// location.status = (int)LocationStatus.In;
// _automationLocation.Update(location);
//}
//else
//{
// Logger.WriteLineInfo($"PlCfeeback 工装储位{taskObj.locationid} 工序{location.routeid}-{location.routenum}为完成");
//}
}
}
if (monitor == null)
......
Server/Apis/Siger.ApiACC/Controllers/AutomationOperateController.cs
......@@ -519,9 +519,17 @@ namespace Siger.ApiACC.Controllers
{
throw new BadRequestException(AccEnum.LineModeNotfound);
}
if (!_automationTaskList.CanTask(ProjectId, unloading.section))
var machineAttr = _sigerProjectMachineAttribution.Get(f => f.station == unloading.section && f.status == (int)RowState.Valid);
if (machineAttr == null)
{
throw new BadRequestException(AccEnum.TaskProcessing);
throw new BadRequestException(CommonEnum.RecordNotFound);
}
var machineStatus = _automationMachineStatus.Get(f => f.machineid == machineAttr.machine);
if (machineStatus.status != (int)Automation.MachineStatus.Complated)
{
throw new BadRequestException(AccEnum.MachineDisable);
}
var unixtime = UnixTimeHelper.GetNow();
......
Server/Apis/Siger.ApiACC/Controllers/QmsCheckController.cs
......@@ -329,20 +329,14 @@ namespace Siger.ApiACC.Controllers
private void CreateTaskList(int section, int productid, string productcode, string sn, int routeid)
{
var monitor = _fixtureMonitor.Get(f => f.section == section);
if (monitor==null)
var tasklist = _automationTaskList.GetList(f => f.extend1 == section.ToString() && f.action == Automation.TaskAction.Step_LK_CJT).LastOrDefault();
if (tasklist == null)
{
Logger.WriteLineInfo($"检验工站{section} monitor 为空");
throw new BadRequestException(CommonEnum.RecordNotFound);
throw new BadRequestException(CommonEnum.Fail);
}
//找到上下料位
var tasklst = _automationTaskList.Get(f => f.no == monitor.taskno);
if (tasklst==null)
{
Logger.WriteLineInfo($"检验工站{section} tasklst 为空");
throw new BadRequestException(CommonEnum.RecordNotFound);
}
var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
_automationTaskList.Insert(new siger_automation_task_list
{
......@@ -361,18 +355,18 @@ namespace Siger.ApiACC.Controllers
projectId = ProjectId,
productid = productid,
sn = sn,
ordercode = monitor.ordernumber,
fixturename=monitor.fixturename,
productname=monitor.productName,
fixtureguid = monitor.fixtureguid,
locationid = monitor.locationId,
ordercode = tasklist.ordercode,
fixturename= tasklist.fixturename,
productname= tasklist.productname,
fixtureguid = tasklist.fixtureguid,
locationid = tasklist.locationid,
productcode = productcode,
processid = routeid,
programnumber = "",
remark = "质量检验->上下料位置",
extend1=tasklst.sectionid.ToString(),//上下料位发起到检验的工站
extend1="",//上下料位发起到检验的工站
});
monitor.taskno = taskNo;
_unitOfWork.Commit();
}
......
Server/Apis/Siger.ApiACC/Controllers/SectionPropertyController.cs
......@@ -38,6 +38,7 @@ namespace Siger.ApiACC.Controllers
_fixtureMonitor = fixtureMonitor;
_routeRepository = routeRepository;
_productRepository = productRepository;
_taskListRepository = taskListRepository;
}
[HttpGet]
......@@ -67,16 +68,20 @@ namespace Siger.ApiACC.Controllers
[HttpGet]
public IActionResult GetMonitorSnProduct(int sectionid)
{
var res = new ResponseMonitorSnProduct();
var monitor = _fixtureMonitor.Get(q => q.section == sectionid);
if(monitor != null)
var tasklist = _taskListRepository.GetList(f => f.extend1 == sectionid.ToString() && f.action == Automation.TaskAction.Step_LK_CJT).LastOrDefault();
if (tasklist == null)
{
var product = _productRepository.Get(monitor.productId);
res.id = monitor.productId;
res.name = product?.name ?? "";
res.code = monitor.productCode;
res.sn = monitor.sn;
throw new BadRequestException(CommonEnum.Fail);
}
var res = new ResponseMonitorSnProduct();
//var monitor = _fixtureMonitor.Get(q => q.section == sectionid);
var product = _productRepository.Get(tasklist.productid);
res.id = tasklist.productid;
res.name = product?.name ?? "";
res.code = tasklist.productcode;
res.sn = tasklist.sn;
return new ObjectResult(res);
}
}
......
Server/Apis/Siger.ApiACC/Tasks/AutoMES.cs
......@@ -5,7 +5,7 @@ using Siger.Middlelayer.Common;
using Siger.Middlelayer.Common.Configuration;
using Siger.Middlelayer.Common.Extensions;
using Siger.Middlelayer.Common.Helpers;
using Siger.Middlelayer.Common.Log;
using Siger.Middlelayer.Log;
using Siger.Middlelayer.Share.Enum.ModuleEnum;
using System;
using System.Collections.Generic;
......@@ -34,12 +34,13 @@ namespace Siger.ApiACC.Tasks
var tasklist = dbhelper.GetTaskList(projectId);
if (!tasklist.Any())
{
return;
}
if (!dbhelper.CanTask(projectId))
{
return;
}
//if (!dbhelper.CanTask(projectId))
//{
// return;
//}
var tasks = tasklist.OrderBy(s => s.actiontype);
var task = tasks.FirstOrDefault();
......
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