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
04c17349
Commit
04c17349
authored
Feb 16, 2021
by
jiawei.su
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixedbug RepeatTasklist
parent
6ee6b282
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
AutomationController.cs
Server/Apis/Siger.ApiACC/Controllers/AutomationController.cs
+6
-1
No files found.
Server/Apis/Siger.ApiACC/Controllers/AutomationController.cs
View file @
04c17349
...
@@ -514,6 +514,11 @@ namespace Siger.ApiACC.Controllers
...
@@ -514,6 +514,11 @@ namespace Siger.ApiACC.Controllers
var
lastTask
=
_automationTaskList
.
GetList
(
f
=>
f
.
sectionid
==
cleanMachine
.
section
,
"id"
,
true
).
FirstOrDefault
();
var
lastTask
=
_automationTaskList
.
GetList
(
f
=>
f
.
sectionid
==
cleanMachine
.
section
,
"id"
,
true
).
FirstOrDefault
();
if
(
lastTask
!=
null
)
if
(
lastTask
!=
null
)
{
{
if
(
lastTask
.
action
==
TaskAction
.
Step_QXJ_LK
)
{
Logger
.
WriteLineError
(
$"AutoProcess 清洗机完成,上一个任务与本次任务指令重复"
);
return
;
//任务重复
}
if
(
lastTask
.
status
==
(
int
)
TaskResultStatus
.
Complated
)
if
(
lastTask
.
status
==
(
int
)
TaskResultStatus
.
Complated
)
{
{
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
}
"
);
...
@@ -531,7 +536,7 @@ namespace Siger.ApiACC.Controllers
...
@@ -531,7 +536,7 @@ namespace Siger.ApiACC.Controllers
var
location
=
SelectLocation
(
freeMachine
.
Select
(
s
=>
s
.
machineid
).
ToList
());
var
location
=
SelectLocation
(
freeMachine
.
Select
(
s
=>
s
.
machineid
).
ToList
());
if
(
location
!=
null
)
if
(
location
!=
null
)
{
{
if
(
RepeatTaskCheck
(
location
.
section
,
TaskAction
.
Step_LK_JGZX
))
if
(
!
RepeatTaskCheck
(
location
.
section
,
TaskAction
.
Step_LK_JGZX
))
{
{
Logger
.
WriteLineError
(
$"AutoProcess CNC加工中心空闲,上一个任务与本次任务指令重复"
);
Logger
.
WriteLineError
(
$"AutoProcess CNC加工中心空闲,上一个任务与本次任务指令重复"
);
return
;
//任务已经创建
return
;
//任务已经创建
...
...
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