Commit 73e7b9f0 by jiawei.su

someupdate

parent 02048770
...@@ -157,7 +157,7 @@ namespace Siger.ApiACC.Controllers ...@@ -157,7 +157,7 @@ namespace Siger.ApiACC.Controllers
var state = (int)Automation.TaskResultStatus.Waiting; var state = (int)Automation.TaskResultStatus.Waiting;
if (monitor!=null) if (monitor!=null)
{ {
var taskobj = _automationTaskList.Get(f => f.extend1 == monitor.unixtime.ToStr()); var taskobj = _automationTaskList.Get(f => f.no == monitor.taskno);
state = taskobj != null ? taskobj.status : (int)Automation.TaskResultStatus.Waiting; state = taskobj != null ? taskobj.status : (int)Automation.TaskResultStatus.Waiting;
} }
var result = new ResponsePlanlFixtureInfo var result = new ResponsePlanlFixtureInfo
...@@ -413,7 +413,7 @@ namespace Siger.ApiACC.Controllers ...@@ -413,7 +413,7 @@ namespace Siger.ApiACC.Controllers
_automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor _automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor
{ {
fixtureguid = fixtureToolsObj.FixtureGuid, fixtureguid = fixtureToolsObj.FixtureGuid,
fixturename = fixtureToolsObj.FixtureName, fixturename = fixtureToolsObj.FixtureCode,
projectId = ProjectId, projectId = ProjectId,
section = loading.section, section = loading.section,
sn = sn, sn = sn,
......
...@@ -11,7 +11,7 @@ namespace Siger.Middlelayer.AccRepository.Entities ...@@ -11,7 +11,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
/// </summary> /// </summary>
public string fixtureguid { get; set; } public string fixtureguid { get; set; }
/// <summary> /// <summary>
/// 工装名称 /// 工装编号
/// </summary> /// </summary>
public string fixturename { get; set; } public string fixturename { get; set; }
/// <summary> /// <summary>
......
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