Skip to content

L
Laisi_AutoMES2
Commit aa1df8d2 by jiawei.su
Options

fixedubug 添加起始工站

parent ec42324c
Showing with 87 additions and 67 deletions
Server/Apis/Siger.ApiACC/Controllers/AutomationController.cs
...@@ -248,7 +248,7 @@ namespace Siger.ApiACC.Controllers ...@@ -248,7 +248,7 @@ namespace Siger.ApiACC.Controllers
var monitor = _automationFixtureMonitor.Get(f => f.section == taskObj.sectionid); var monitor = _automationFixtureMonitor.Get(f => f.section == taskObj.sectionid);
var sectionProperty = _automationSectionProperty.Get(f => f.sectionid == taskObj.sectionid); var sectionProperty = _automationSectionProperty.Get(f => f.sectionid == taskObj.extend1.ToInt());
if (sectionProperty == null) if (sectionProperty == null)
{ {
Logger.WriteLineInfo($"PlCfeeback 设备属性为维护"); Logger.WriteLineInfo($"PlCfeeback 设备属性为维护");
...@@ -264,8 +264,7 @@ namespace Siger.ApiACC.Controllers ...@@ -264,8 +264,7 @@ namespace Siger.ApiACC.Controllers
throw new BadRequestException(AccEnum.MachineDisable); throw new BadRequestException(AccEnum.MachineDisable);
} }
// 业务入口： 上料位-》 入库 如果是上料工装 安装完成 ,绑定 储位与装配 // 业务入口： 上料位-》 入库 如果是上料工装 安装完成 ,绑定 储位与装配
if (sectionProperty.propertytype == 1)
{
var download = false; var download = false;
if (sectionProperty.down > 2) if (sectionProperty.down > 2)
{ {
...@@ -323,10 +322,9 @@ namespace Siger.ApiACC.Controllers ...@@ -323,10 +322,9 @@ namespace Siger.ApiACC.Controllers
_automationSectionProperty.Update(sectionProperty); _automationSectionProperty.Update(sectionProperty);
} }
}
// CNC 设备 // CNC 设备
if (sectionProperty.propertytype == 2)
{
if (taskObj.action == TaskAction.Step_LK_JGZX) if (taskObj.action == TaskAction.Step_LK_JGZX)
{ {
var route = _productRoute.GetList(f => f.productId == taskObj.productid && f.id != taskObj.route && f.status == (int)RowState.Valid, "serialNumber", false).FirstOrDefault(); var route = _productRoute.GetList(f => f.productId == taskObj.productid && f.id != taskObj.route && f.status == (int)RowState.Valid, "serialNumber", false).FirstOrDefault();
...@@ -347,10 +345,9 @@ namespace Siger.ApiACC.Controllers ...@@ -347,10 +345,9 @@ namespace Siger.ApiACC.Controllers
} }
} }
}
//抽检台 //抽检台
if (sectionProperty.propertytype == 3)
{
if (taskObj.action == TaskAction.Step_LK_CJT) if (taskObj.action == TaskAction.Step_LK_CJT)
{ {
location.status = (int)LocationStatus.Out; location.status = (int)LocationStatus.Out;
...@@ -360,11 +357,10 @@ namespace Siger.ApiACC.Controllers ...@@ -360,11 +357,10 @@ namespace Siger.ApiACC.Controllers
{ {
} }
}
//清洗机 //清洗机
if (sectionProperty.propertytype == 4)
{
if (taskObj.action == TaskAction.Step_QXJ_LK) if (taskObj.action == TaskAction.Step_QXJ_LK)
{ {
...@@ -405,7 +401,8 @@ namespace Siger.ApiACC.Controllers ...@@ -405,7 +401,8 @@ namespace Siger.ApiACC.Controllers
//} //}
} }
}
if (monitor == null) if (monitor == null)
{ {
_automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor _automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor
...@@ -451,17 +448,17 @@ namespace Siger.ApiACC.Controllers ...@@ -451,17 +448,17 @@ namespace Siger.ApiACC.Controllers
//添加SN记录 //添加SN记录
_automationProduceHistory.Insert(new siger_automation_produce_history _automationProduceHistory.Insert(new siger_automation_produce_history
{ {
section=taskObj.sectionid, section = taskObj.sectionid,
sn=taskObj.sn, sn = taskObj.sn,
locationid=taskObj.locationid, locationid = taskObj.locationid,
productcode=taskObj.productcode, productcode = taskObj.productcode,
productname=taskObj.productname, productname = taskObj.productname,
productid=taskObj.productid, productid = taskObj.productid,
projectId=taskObj.projectId, projectId = taskObj.projectId,
route=taskObj.route.ToString(), route = taskObj.route.ToString(),
status=1, status = 1,
locationname=location.location_cid.ToString(), locationname = location.location_cid.ToString(),
updatetime=DateTime.Now, updatetime = DateTime.Now,
}); });
...@@ -502,6 +499,7 @@ namespace Siger.ApiACC.Controllers ...@@ -502,6 +499,7 @@ namespace Siger.ApiACC.Controllers
Logger.WriteLineInfo($"AutoProcess 设备属性未配置"); Logger.WriteLineInfo($"AutoProcess 设备属性未配置");
return; return;
} }
//立库工位
var invenSection = _automationSectionProperty.Get(f => f.propertytype == 5); var invenSection = _automationSectionProperty.Get(f => f.propertytype == 5);
if (invenSection == null) if (invenSection == null)
{ {
...@@ -545,7 +543,7 @@ namespace Siger.ApiACC.Controllers ...@@ -545,7 +543,7 @@ namespace Siger.ApiACC.Controllers
lastTask.extend1 = string.Empty; lastTask.extend1 = string.Empty;
_automationTaskList.Update(lastTask); _automationTaskList.Update(lastTask);
Logger.WriteLineInfo($"自动化业务流转--AutoProcess section{cleanMachine.section} task:{TaskAction.Step_QXJ_LK.ToStr()} sn {lastTask.sn}"); Logger.WriteLineInfo($"自动化业务流转--AutoProcess section{cleanMachine.section} task:{TaskAction.Step_QXJ_LK.ToStr()} sn {lastTask.sn}");
CreateTask(invenSection.sectionid, TaskActionType.Unload, TaskAction.Step_QXJ_LK, lastTask.fixtureguid, lastTask.fixturename, lastTask.ordercode, lastTask.sn, "无程序", lastTask.productid, lastTask.productcode, lastTask.productname, lastTask.locationid, lastTask.route); CreateTask(invenSection.sectionid,cleanMachine.section, TaskActionType.Unload, TaskAction.Step_QXJ_LK, lastTask.fixtureguid, lastTask.fixturename, lastTask.ordercode, lastTask.sn, "无程序", lastTask.productid, lastTask.productcode, lastTask.productname, lastTask.locationid, lastTask.route);
return; //完成当前任务 退出 return; //完成当前任务 退出
} }
} }
...@@ -560,7 +558,7 @@ namespace Siger.ApiACC.Controllers ...@@ -560,7 +558,7 @@ namespace Siger.ApiACC.Controllers
if (location != null) if (location != null)
{ {
Logger.WriteLineInfo($"自动化业务流转--AutoProcess section{location.section} task:{TaskAction.Step_LK_JGZX.ToStr()} sn {location.sn}"); Logger.WriteLineInfo($"自动化业务流转--AutoProcess section{location.section} task:{TaskAction.Step_LK_JGZX.ToStr()} sn {location.sn}");
CreateTask(location.section, TaskActionType.Load, TaskAction.Step_LK_JGZX, location.fixture, location.fixturename, location.ordernumber, location.sn, location.pn, location.productId, location.productCode,location.productName, location.location, location.route); CreateTask(location.section, location.section, TaskActionType.Load, TaskAction.Step_LK_JGZX, location.fixture, location.fixturename, location.ordernumber, location.sn, location.pn, location.productId, location.productCode,location.productName, location.location, location.route);
} }
} }
...@@ -585,7 +583,7 @@ namespace Siger.ApiACC.Controllers ...@@ -585,7 +583,7 @@ namespace Siger.ApiACC.Controllers
return; return;
} }
//创建CNC 下料到清洗机 //创建CNC 下料到清洗机
CreateTask(cleanMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, tasklist.fixtureguid,tasklist.fixturename, tasklist.ordercode, tasklist.sn, tasklist.programnumber, tasklist.productid, tasklist.productcode,tasklist.productname, tasklist.locationid, tasklist.route); CreateTask(cleanMachine.section, fullMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, tasklist.fixtureguid,tasklist.fixturename, tasklist.ordercode, tasklist.sn, tasklist.programnumber, tasklist.productid, tasklist.productcode,tasklist.productname, tasklist.locationid, tasklist.route);
return; //完成当前任务 退出 return; //完成当前任务 退出
} }
else else
...@@ -598,7 +596,7 @@ namespace Siger.ApiACC.Controllers ...@@ -598,7 +596,7 @@ namespace Siger.ApiACC.Controllers
if (lastTask != null) if (lastTask != null)
{ {
Logger.WriteLineInfo($"自动化业务流转--AutoProcess section{fullMachine.section} task:{TaskAction.Step_JGZX_QXJ.ToStr()} sn {lastTask.sn}"); Logger.WriteLineInfo($"自动化业务流转--AutoProcess section{fullMachine.section} task:{TaskAction.Step_JGZX_QXJ.ToStr()} sn {lastTask.sn}");
CreateTask(cleanMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, lastTask.fixtureguid,lastTask.fixturename, lastTask.ordercode, lastTask.sn, lastTask.programnumber, lastTask.productid, lastTask.productcode,lastTask.productname,lastTask.locationid, lastTask.route); CreateTask(cleanMachine.section,fullMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, lastTask.fixtureguid,lastTask.fixturename, lastTask.ordercode, lastTask.sn, lastTask.programnumber, lastTask.productid, lastTask.productcode,lastTask.productname,lastTask.locationid, lastTask.route);
} }
} }
} }
...@@ -610,15 +608,21 @@ namespace Siger.ApiACC.Controllers ...@@ -610,15 +608,21 @@ namespace Siger.ApiACC.Controllers
/// <summary> /// <summary>
/// 创建自动任务 /// 创建自动任务
/// </summary> /// </summary>
/// <param name="section"></param> /// <param name="toSection"></param>
/// <param name="fromSection"></param>
/// <param name="actionType"></param> /// <param name="actionType"></param>
/// <param name="taskAction"></param> /// <param name="taskAction"></param>
/// <param name="guid">工装GUID</param> /// <param name="guid">工装GUID</param>
/// <param name="fixtruename"></param>
/// <param name="orderno">订单</param> /// <param name="orderno">订单</param>
/// <param name="sn">工件</param> /// <param name="sn">工件</param>
/// <param name="program"></param>
/// <param name="productId"></param>
/// <param name="productCode">产品CODE</param> /// <param name="productCode">产品CODE</param>
/// <param name="productName"></param>
/// <param name="locationid">储位ID</param> /// <param name="locationid">储位ID</param>
void CreateTask(int section, TaskActionType actionType, TaskAction taskAction, string guid,string fixtruename, string orderno, string sn, string program, int productId, string productCode,string productName, int locationid, int route) /// <param name="route"></param>
void CreateTask(int toSection,int fromSection, TaskActionType actionType, TaskAction taskAction, string guid,string fixtruename, string orderno, string sn, string program, int productId, string productCode,string productName, int locationid, int route)
{ {
var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Auto); var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Auto);
...@@ -626,7 +630,7 @@ namespace Siger.ApiACC.Controllers ...@@ -626,7 +630,7 @@ namespace Siger.ApiACC.Controllers
{ {
no = taskNo, no = taskNo,
projectId = PID, projectId = PID,
sectionid = section, sectionid = toSection,
trigger = TaskTrigerType.Auto, trigger = TaskTrigerType.Auto,
action = taskAction, action = taskAction,
actiontype = ExcueType.None, actiontype = ExcueType.None,
...@@ -648,11 +652,12 @@ namespace Siger.ApiACC.Controllers ...@@ -648,11 +652,12 @@ namespace Siger.ApiACC.Controllers
sn = sn, sn = sn,
remark = EnumHelper.GetEnumDesc(taskAction), remark = EnumHelper.GetEnumDesc(taskAction),
route = route, route = route,
extend1= fromSection.ToString()
}); });
if (_unitOfWork.Commit() > 0) if (_unitOfWork.Commit() > 0)
Logger.WriteLineInfo($"CreateTask sectionId:{section}工站 {EnumHelper.GetEnumDesc(taskAction)} 完成"); Logger.WriteLineInfo($"CreateTask sectionId:{fromSection}工站->{toSection}工站 {EnumHelper.GetEnumDesc(taskAction)} 完成");
else else
Logger.WriteLineInfo($"CreateTask sectionId:{section}工站 {EnumHelper.GetEnumDesc(taskAction)}失败"); Logger.WriteLineInfo($"CreateTask sectionId:{fromSection}工站->{toSection}工站 {EnumHelper.GetEnumDesc(taskAction)}失败");
} }
/// <summary> /// <summary>
/// 自动匹配储位 储位 ->CNC /// 自动匹配储位 储位 ->CNC
......
Server/Apis/Siger.ApiACC/Controllers/AutomationOperateController.cs
...@@ -185,11 +185,11 @@ namespace Siger.ApiACC.Controllers ...@@ -185,11 +185,11 @@ namespace Siger.ApiACC.Controllers
{ {
throw new BadRequestException(AccEnum.LineIsAutoMode); throw new BadRequestException(AccEnum.LineIsAutoMode);
} }
var section = taskobj.sectionid; var section = taskobj.extend1.ToInt();
//抽检台-》上料位特殊逻辑 //抽检台-》上料位特殊逻辑
if (taskobj.action == Automation.TaskAction.Step_CJT_SXLW) if (taskobj.action == Automation.TaskAction.Step_CJT_SXLW)
{ {
section = taskobj.extend1.ToInt(); section = taskobj.sectionid;
} }
var attr = _sigerProjectMachineAttribution.Get(f => f.station == section && f.status == 1); var attr = _sigerProjectMachineAttribution.Get(f => f.station == section && f.status == 1);
...@@ -354,6 +354,11 @@ namespace Siger.ApiACC.Controllers ...@@ -354,6 +354,11 @@ namespace Siger.ApiACC.Controllers
{ {
throw new BadRequestException(AccEnum.ProductRouteMissing); throw new BadRequestException(AccEnum.ProductRouteMissing);
} }
var invenProperty = _sectionPropertyRepository.Get(f => f.propertytype == 5);
if (invenProperty==null)
{
throw new BadRequestException(AccEnum.SectionPropertyNull);
}
var unixtime = UnixTimeHelper.GetNow(); var unixtime = UnixTimeHelper.GetNow();
_automationTaskList.Insert(new siger_automation_task_list _automationTaskList.Insert(new siger_automation_task_list
{ {
...@@ -381,7 +386,7 @@ namespace Siger.ApiACC.Controllers ...@@ -381,7 +386,7 @@ namespace Siger.ApiACC.Controllers
programnumber="", programnumber="",
remark ="手动任务-准备上料", remark ="手动任务-准备上料",
route=route.id, route=route.id,
extend1="" extend1= loading.section.ToStr(),
}); });
...@@ -405,6 +410,11 @@ namespace Siger.ApiACC.Controllers ...@@ -405,6 +410,11 @@ namespace Siger.ApiACC.Controllers
public IActionResult CompalateAssemble([FromBody]requestAutoCompalateAssemble assemble) public IActionResult CompalateAssemble([FromBody]requestAutoCompalateAssemble assemble)
{ {
var invenProperty = _sectionPropertyRepository.Get(f => f.propertytype == 5);
if (invenProperty == null)
{
throw new BadRequestException(AccEnum.SectionPropertyNull);
}
var upload = _sectionPropertyRepository.Get(f => f.sectionid == assemble.section); var upload = _sectionPropertyRepository.Get(f => f.sectionid == assemble.section);
if (upload == null) if (upload == null)
{ {
...@@ -447,7 +457,7 @@ namespace Siger.ApiACC.Controllers ...@@ -447,7 +457,7 @@ namespace Siger.ApiACC.Controllers
tasktype = Automation.TaskActionType.Load, tasktype = Automation.TaskActionType.Load,
operater = UserId, operater = UserId,
operatetime = DateTime.Now, operatetime = DateTime.Now,
sectionid = assemble.section, sectionid = invenProperty.sectionid,
send = 0, send = 0,
status = 1, status = 1,
completetime = DateTime.MinValue, completetime = DateTime.MinValue,
...@@ -464,7 +474,8 @@ namespace Siger.ApiACC.Controllers ...@@ -464,7 +474,8 @@ namespace Siger.ApiACC.Controllers
processid = 0, processid = 0,
programnumber = "", programnumber = "",
remark = "手动任务-安装完成", remark = "手动任务-安装完成",
route=monitor.route route=monitor.route,
extend1=assemble.section.ToStr()
}); });
monitor.taskno = taskNo; monitor.taskno = taskNo;
...@@ -489,7 +500,11 @@ namespace Siger.ApiACC.Controllers ...@@ -489,7 +500,11 @@ namespace Siger.ApiACC.Controllers
[HttpPost] [HttpPost]
public IActionResult Unloading([FromBody]requestAutomationUnloading unloading) public IActionResult Unloading([FromBody]requestAutomationUnloading unloading)
{ {
var invenProperty = _sectionPropertyRepository.Get(f => f.propertytype == 5);
if (invenProperty == null)
{
throw new BadRequestException(AccEnum.SectionPropertyNull);
}
var upload = _sectionPropertyRepository.Get(f => f.sectionid == unloading.section); var upload = _sectionPropertyRepository.Get(f => f.sectionid == unloading.section);
if (upload == null) if (upload == null)
{ {
...@@ -541,6 +556,8 @@ namespace Siger.ApiACC.Controllers ...@@ -541,6 +556,8 @@ namespace Siger.ApiACC.Controllers
var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual); var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
var action = lineMode.inspect == 1 ? Automation.TaskAction.Step_LK_CJT : Automation.TaskAction.Step_LK_SXLW; var action = lineMode.inspect == 1 ? Automation.TaskAction.Step_LK_CJT : Automation.TaskAction.Step_LK_SXLW;
var section = unloading.section; var section = unloading.section;
var fromSection = unloading.section ;
if (lineMode.inspect==1) if (lineMode.inspect==1)
{ {
var sectionProperty = _sectionPropertyRepository.Get(f => f.propertytype == 3); var sectionProperty = _sectionPropertyRepository.Get(f => f.propertytype == 3);
...@@ -549,6 +566,7 @@ namespace Siger.ApiACC.Controllers ...@@ -549,6 +566,7 @@ namespace Siger.ApiACC.Controllers
throw new BadRequestException(AccEnum.SectionPropertyNull); throw new BadRequestException(AccEnum.SectionPropertyNull);
} }
section = sectionProperty.sectionid; section = sectionProperty.sectionid;
fromSection= sectionProperty.sectionid;
} }
var tasklst = _automationTaskList.GetList(f => f.sectionid == unloading.section && f.action == action && f.status!=(int)TaskResultStatus.Complated); var tasklst = _automationTaskList.GetList(f => f.sectionid == unloading.section && f.action == action && f.status!=(int)TaskResultStatus.Complated);
if (tasklst.Any()) if (tasklst.Any())
...@@ -565,7 +583,7 @@ namespace Siger.ApiACC.Controllers ...@@ -565,7 +583,7 @@ namespace Siger.ApiACC.Controllers
tasktype = Automation.TaskActionType.Load, tasktype = Automation.TaskActionType.Load,
operater = UserId, operater = UserId,
operatetime = DateTime.MinValue, operatetime = DateTime.MinValue,
sectionid = unloading.section, sectionid = section,
send = 0, send = 0,
status = 1, status = 1,
completetime = DateTime.MinValue, completetime = DateTime.MinValue,
...@@ -580,7 +598,7 @@ namespace Siger.ApiACC.Controllers ...@@ -580,7 +598,7 @@ namespace Siger.ApiACC.Controllers
processid = 0, processid = 0,
programnumber = "", programnumber = "",
remark =lineMode.inspect==1? "准备下料-》抽检台":"准备下料", remark =lineMode.inspect==1? "准备下料-》抽检台":"准备下料",
extend1= section.ToStr() extend1= fromSection.ToString()
}); });
...@@ -604,8 +622,6 @@ namespace Siger.ApiACC.Controllers ...@@ -604,8 +622,6 @@ namespace Siger.ApiACC.Controllers
public IActionResult Disassemble([FromBody]Requestdisassemble disassemble) public IActionResult Disassemble([FromBody]Requestdisassemble disassemble)
{ {
var upload = _sectionPropertyRepository.Get(f => f.sectionid == disassemble.section); var upload = _sectionPropertyRepository.Get(f => f.sectionid == disassemble.section);
if (upload == null) if (upload == null)
{ {
...@@ -644,7 +660,7 @@ namespace Siger.ApiACC.Controllers ...@@ -644,7 +660,7 @@ namespace Siger.ApiACC.Controllers
tasktype = Automation.TaskActionType.Load, tasktype = Automation.TaskActionType.Load,
operater = UserId, operater = UserId,
operatetime = DateTime.Now, operatetime = DateTime.Now,
sectionid = unloadSection, sectionid = sectionProperty.sectionid,
send = 0, send = 0,
status = 1, status = 1,
completetime = DateTime.MinValue, completetime = DateTime.MinValue,
...@@ -659,10 +675,9 @@ namespace Siger.ApiACC.Controllers ...@@ -659,10 +675,9 @@ namespace Siger.ApiACC.Controllers
processid = 0, processid = 0,
programnumber = "", programnumber = "",
remark = "手动任务-拆卸完成", remark = "手动任务-拆卸完成",
extend1= disassemble.section.ToStr()
}); });
//移出 上料位
if (_unitOfWork.Commit() > 0) if (_unitOfWork.Commit() > 0)
{ {
Logger.WriteLineError($"拆卸完成任务{taskNo}创建成功-{EnumHelper.GetEnumDesc(Automation.TaskAction.Step_SXLW_LK)}"); Logger.WriteLineError($"拆卸完成任务{taskNo}创建成功-{EnumHelper.GetEnumDesc(Automation.TaskAction.Step_SXLW_LK)}");
......
Server/Apis/Siger.ApiACC/Controllers/QmsCheckController.cs
...@@ -329,7 +329,7 @@ namespace Siger.ApiACC.Controllers ...@@ -329,7 +329,7 @@ namespace Siger.ApiACC.Controllers
private void CreateTaskList(int section, int productid, string productcode, string sn, int routeid) private void CreateTaskList(int section, int productid, string productcode, string sn, int routeid)
{ {
var tasklist = _automationTaskList.GetList(f => f.extend1 == section.ToString() && f.action == Automation.TaskAction.Step_LK_CJT).LastOrDefault(); var tasklist = _automationTaskList.GetList(f => f.sectionid == section && f.action == Automation.TaskAction.Step_LK_CJT).LastOrDefault();
if (tasklist == null) if (tasklist == null)
{ {
throw new BadRequestException(CommonEnum.Fail); throw new BadRequestException(CommonEnum.Fail);
...@@ -347,7 +347,7 @@ namespace Siger.ApiACC.Controllers ...@@ -347,7 +347,7 @@ namespace Siger.ApiACC.Controllers
tasktype = Automation.TaskActionType.Unload, tasktype = Automation.TaskActionType.Unload,
operater = UserId, operater = UserId,
operatetime = DateTime.Now, operatetime = DateTime.Now,
sectionid = section, sectionid = tasklist.extend1.ToInt(),
send = 0, send = 0,
status = 1, status = 1,
completetime = DateTime.MinValue, completetime = DateTime.MinValue,
...@@ -365,7 +365,7 @@ namespace Siger.ApiACC.Controllers ...@@ -365,7 +365,7 @@ namespace Siger.ApiACC.Controllers
processid = routeid, processid = routeid,
programnumber = "", programnumber = "",
remark = "质量检验->上下料位置", remark = "质量检验->上下料位置",
extend1="",//上下料位发起到检验的工站 extend1=section.ToStr(),//上下料位发起到检验的工站
}); });
......
Server/Apis/Siger.ApiACC/Controllers/SectionPropertyController.cs
...@@ -68,7 +68,7 @@ namespace Siger.ApiACC.Controllers ...@@ -68,7 +68,7 @@ namespace Siger.ApiACC.Controllers
[HttpGet] [HttpGet]
public IActionResult GetMonitorSnProduct(int sectionid) public IActionResult GetMonitorSnProduct(int sectionid)
{ {
var tasklist = _taskListRepository.GetList(f => f.extend1 == sectionid.ToString() && f.action == Automation.TaskAction.Step_LK_CJT).LastOrDefault(); var tasklist = _taskListRepository.GetList(f => f.sectionid == sectionid && f.action == Automation.TaskAction.Step_LK_CJT).LastOrDefault();
if (tasklist == null) if (tasklist == null)
{ {
throw new BadRequestException(CommonEnum.Fail); throw new BadRequestException(CommonEnum.Fail);
......
Server/Apis/Siger.ApiACC/Tasks/AutoMES.cs
...@@ -46,11 +46,11 @@ namespace Siger.ApiACC.Tasks ...@@ -46,11 +46,11 @@ namespace Siger.ApiACC.Tasks
if (task.send == 1) if (task.send == 1)
return; return;
var section = task.sectionid; var section = task.extend1.ToInt();
//抽检台-》上料位特殊逻辑 //抽检台-》上料位特殊逻辑
if (task.action== Automation.TaskAction.Step_CJT_SXLW) if (task.action== Automation.TaskAction.Step_CJT_SXLW )
{ {
section = dbhelper.GetPreStation(task); section = task.sectionid;
} }
var levelsction = dbhelper.GetLevelsection(section); var levelsction = dbhelper.GetLevelsection(section);
if (levelsction == null) if (levelsction == null)
......
Server/Apis/Siger.ApiACC/Tasks/DBhelper.cs
...@@ -70,15 +70,15 @@ namespace Siger.ApiACC.Tasks ...@@ -70,15 +70,15 @@ namespace Siger.ApiACC.Tasks
{ {
return AccDbContext.siger_project_machine_attribution.FirstOrDefault(f => f.station==section && f.status==1); return AccDbContext.siger_project_machine_attribution.FirstOrDefault(f => f.station==section && f.status==1);
} }
public int GetPreStation(siger_automation_task_list task ) //public int GetPreStation(siger_automation_task_list task )
{ //{
//取抽检工位发起的上料位ID // //取抽检工位发起的上料位ID
var preTask = AccDbContext.siger_automation_task_list.Where(f => f.sn == task.sn && f.extend1 == task.sectionid.ToString() && f.action == TaskAction.Step_LK_CJT).OrderByDescending(d => d.id).FirstOrDefault(); // var preTask = AccDbContext.siger_automation_task_list.Where(f => f.sn == task.sn && f.extend1 == task.sectionid.ToString() && f.action == TaskAction.Step_LK_CJT).OrderByDescending(d => d.id).FirstOrDefault();
if (preTask != null) // if (preTask != null)
return preTask.sectionid; // return preTask.sectionid;
else // else
return 0; // return 0;
} //}
public siger_automation_fixture_tools GetFixture(string guid) public siger_automation_fixture_tools GetFixture(string guid)
{ {
return AccDbContext.siger_automation_fixture_tools.FirstOrDefault(f => f.guid==guid && f.status == 1); return AccDbContext.siger_automation_fixture_tools.FirstOrDefault(f => f.guid==guid && f.status == 1);
......
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Entities/siger_automation_task_list.cs
...@@ -24,7 +24,7 @@ namespace Siger.Middlelayer.AccRepository.Entities ...@@ -24,7 +24,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
/// </summary> /// </summary>
public string fixturename { get; set; } public string fixturename { get; set; }
/// <summary> /// <summary>
/// 工位ID /// 工位ID 目的
/// </summary> /// </summary>
public int sectionid { get; set; } public int sectionid { get; set; }
/// <summary> /// <summary>
...@@ -103,7 +103,7 @@ namespace Siger.Middlelayer.AccRepository.Entities ...@@ -103,7 +103,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
public string remark { get; set; } public string remark { get; set; }
/// <summary> /// <summary>
/// 准备前往下一个工站ID /// 发起工站ID
/// </summary> /// </summary>
public string extend1 { get; set; } public string extend1 { get; set; }
......
Server/PC/Siger.Middlelayer.License/obj/Debug/Siger.Middlelayer.License_MarkupCompile.cache
...@@ -4,15 +4,15 @@ ...@@ -4,15 +4,15 @@
winexe winexe
C# C#
.cs .cs
E:\gitlabcode\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\obj\Debug\ D:\Code\20210208\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\obj\Debug\
Siger.Middlelayer.License Siger.Middlelayer.License
none none
false false
DEBUG;TRACE DEBUG;TRACE
E:\gitlabcode\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\App.xaml D:\Code\20210208\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\App.xaml
11151548125 11151548125
13876510470 13-917883170
121654848548 121654848548
MainWindow.xaml; MainWindow.xaml;
......
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