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
73943217
Commit
73943217
authored
Mar 16, 2021
by
jiawei.su
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixedbug
parent
0562c6d2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
AutomationOperateController.cs
...s/Siger.ApiACC/Controllers/AutomationOperateController.cs
+13
-13
AutomationStateController.cs
...pis/Siger.ApiACC/Controllers/AutomationStateController.cs
+1
-1
No files found.
Server/Apis/Siger.ApiACC/Controllers/AutomationOperateController.cs
View file @
73943217
...
@@ -150,10 +150,10 @@ namespace Siger.ApiACC.Controllers
...
@@ -150,10 +150,10 @@ namespace Siger.ApiACC.Controllers
{
{
throw
new
BadRequestException
(
CommonEnum
.
RecordNotFound
);
throw
new
BadRequestException
(
CommonEnum
.
RecordNotFound
);
}
}
if
(
sectionProperty
.
upload
==
0
&&
sectionProperty
.
down
==
0
)
//
if (sectionProperty.upload==0 && sectionProperty.down==0)
{
//
{
throw
new
BadRequestException
(
CommonEnum
.
RecordNotFound
);
//
throw new BadRequestException(CommonEnum.RecordNotFound);
}
//
}
var
monitor
=
_automationFixtureMonitor
.
Get
(
f
=>
f
.
section
==
section
);
var
monitor
=
_automationFixtureMonitor
.
Get
(
f
=>
f
.
section
==
section
);
var
img
=
string
.
Empty
;
var
img
=
string
.
Empty
;
if
(
monitor
!=
null
)
if
(
monitor
!=
null
)
...
@@ -486,16 +486,16 @@ namespace Siger.ApiACC.Controllers
...
@@ -486,16 +486,16 @@ namespace Siger.ApiACC.Controllers
{
{
throw
new
BadRequestException
(
AccEnum
.
MonitorNotfound
);
throw
new
BadRequestException
(
AccEnum
.
MonitorNotfound
);
}
}
var
tasklist
=
_automationTaskList
.
Get
(
f
=>
f
.
projectId
==
ProjectId
&&
f
.
no
==
monitor
.
taskno
);
//
var tasklist = _automationTaskList.Get(f => f.projectId == ProjectId && f.no == monitor.taskno);
if
(
tasklist
==
null
)
//
if(tasklist==null)
{
//
{
throw
new
BadRequestException
(
AccEnum
.
MachineDisable
);
//
throw new BadRequestException(AccEnum.MachineDisable);
}
//
}
if
(
tasklist
.
status
!=(
int
)
Automation
.
TaskResultStatus
.
Complated
)
//
if (tasklist.status!=(int)Automation.TaskResultStatus.Complated)
{
//
{
throw
new
BadRequestException
(
AccEnum
.
TaskProcessing
);
//
throw new BadRequestException(AccEnum.TaskProcessing);
}
//
}
//检测工序是否配置正确
//检测工序是否配置正确
var
taskNo
=
_automationTaskList
.
CrateTaskNumber
(
Automation
.
TaskTrigerType
.
Manual
);
var
taskNo
=
_automationTaskList
.
CrateTaskNumber
(
Automation
.
TaskTrigerType
.
Manual
);
_automationTaskList
.
Insert
(
new
siger_automation_task_list
_automationTaskList
.
Insert
(
new
siger_automation_task_list
...
...
Server/Apis/Siger.ApiACC/Controllers/AutomationStateController.cs
View file @
73943217
...
@@ -241,7 +241,7 @@ namespace Siger.ApiACC.Controllers
...
@@ -241,7 +241,7 @@ namespace Siger.ApiACC.Controllers
if
(
_unitOfWork
.
Commit
()
>
0
)
if
(
_unitOfWork
.
Commit
()
>
0
)
{
{
Logger
.
WriteLineError
(
$"手动任务
创建
成功-
{
Siger
.
Middlelayer
.
Common
.
Helpers
.
EnumHelper
.
GetEnumDesc
(
Automation
.
TaskAction
.
Step_LK_SXLW
)}
"
);
Logger
.
WriteLineError
(
$"手动任务
删除
成功-
{
Siger
.
Middlelayer
.
Common
.
Helpers
.
EnumHelper
.
GetEnumDesc
(
Automation
.
TaskAction
.
Step_LK_SXLW
)}
"
);
return
new
ObjectResult
(
CommonEnum
.
Succefull
);
return
new
ObjectResult
(
CommonEnum
.
Succefull
);
}
}
else
else
...
...
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