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
a7550574
Commit
a7550574
authored
Feb 20, 2021
by
jiawei.su
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
someupdate
parent
c1175f5e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
AutomationOperateController.cs
...s/Siger.ApiACC/Controllers/AutomationOperateController.cs
+9
-1
AccEnum.cs
...Common/Siger.Middlelayer.Share/Enum/ModuleEnum/AccEnum.cs
+3
-1
No files found.
Server/Apis/Siger.ApiACC/Controllers/AutomationOperateController.cs
View file @
a7550574
...
@@ -320,7 +320,15 @@ namespace Siger.ApiACC.Controllers
...
@@ -320,7 +320,15 @@ namespace Siger.ApiACC.Controllers
{
{
throw
new
BadRequestException
(
AccEnum
.
TaskProcessing
);
throw
new
BadRequestException
(
AccEnum
.
TaskProcessing
);
}
}
var
location
=
_automationLocation
.
Get
(
f
=>
f
.
locationid
==
loading
.
locationid
);
if
(
location
==
null
)
{
throw
new
BadRequestException
(
AccEnum
.
LocationNoExits
);
}
if
(
string
.
IsNullOrEmpty
(
location
.
sn
))
{
throw
new
BadRequestException
(
AccEnum
.
LocationSnExits
);
}
var
plandts
=
_planDetails
.
Get
(
f
=>
f
.
projectId
==
ProjectId
&&
f
.
OrderNumber
==
loading
.
code
);
var
plandts
=
_planDetails
.
Get
(
f
=>
f
.
projectId
==
ProjectId
&&
f
.
OrderNumber
==
loading
.
code
);
if
(
plandts
==
null
)
if
(
plandts
==
null
)
{
{
...
...
Server/Common/Siger.Middlelayer.Share/Enum/ModuleEnum/AccEnum.cs
View file @
a7550574
...
@@ -351,7 +351,9 @@ namespace Siger.Middlelayer.Common.ModuleEnum
...
@@ -351,7 +351,9 @@ namespace Siger.Middlelayer.Common.ModuleEnum
[
Description
(
"该工站正在上料中"
)]
[
Description
(
"该工站正在上料中"
)]
Uploading
,
Uploading
,
[
Description
(
"该工站正在下料中"
)]
[
Description
(
"该工站正在下料中"
)]
Downloading
Downloading
,
[
Description
(
"储位不存在"
)]
LocationNoExits
}
}
public
enum
SeriNumCfg
public
enum
SeriNumCfg
...
...
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