Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
Laisi_AutoMES2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jiawei.su
Laisi_AutoMES2
Commits
73e7b9f0
Commit
73e7b9f0
authored
Feb 04, 2021
by
jiawei.su
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
someupdate
parent
02048770
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
AutomationOperateController.cs
...s/Siger.ApiACC/Controllers/AutomationOperateController.cs
+2
-2
siger_automation_fixture_tools_monitor.cs
...sitory/Entities/siger_automation_fixture_tools_monitor.cs
+1
-1
No files found.
Server/Apis/Siger.ApiACC/Controllers/AutomationOperateController.cs
View file @
73e7b9f0
...
...
@@ -157,7 +157,7 @@ namespace Siger.ApiACC.Controllers
var
state
=
(
int
)
Automation
.
TaskResultStatus
.
Waiting
;
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
;
}
var
result
=
new
ResponsePlanlFixtureInfo
...
...
@@ -413,7 +413,7 @@ namespace Siger.ApiACC.Controllers
_automationFixtureMonitor
.
Insert
(
new
siger_automation_fixture_tools_monitor
{
fixtureguid
=
fixtureToolsObj
.
FixtureGuid
,
fixturename
=
fixtureToolsObj
.
Fixture
Nam
e
,
fixturename
=
fixtureToolsObj
.
Fixture
Cod
e
,
projectId
=
ProjectId
,
section
=
loading
.
section
,
sn
=
sn
,
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Entities/siger_automation_fixture_tools_monitor.cs
View file @
73e7b9f0
...
...
@@ -11,7 +11,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
/// </summary>
public
string
fixtureguid
{
get
;
set
;
}
/// <summary>
/// 工装
名称
/// 工装
编号
/// </summary>
public
string
fixturename
{
get
;
set
;
}
/// <summary>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment