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
c30773e8
Commit
c30773e8
authored
Jan 25, 2021
by
xin.yang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some update
parent
0932ae55
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
5 deletions
+15
-5
en-US.js
Html/src/locale/lang/en-US.js
+1
-0
zh-CN.js
Html/src/locale/lang/zh-CN.js
+1
-0
FixtureToolsController.cs
...r/Apis/Siger.ApiACC/Controllers/FixtureToolsController.cs
+10
-5
RequestEnum.cs
Server/Common/Siger.Middlelayer.Share/Enum/RequestEnum.cs
+3
-0
No files found.
Html/src/locale/lang/en-US.js
View file @
c30773e8
...
...
@@ -720,6 +720,7 @@ export default {
'9000495'
:
'未找到工装信息'
,
'9000496'
:
'ID重复'
,
'9000497'
:
'父级和子级不能相同'
,
'9000498'
:
'该类型绑定了工装,不能删除'
,
'9100000'
:
'Departments cannot be empty'
,
'9100001'
:
'Position cannot be empty'
,
...
...
Html/src/locale/lang/zh-CN.js
View file @
c30773e8
...
...
@@ -747,6 +747,7 @@ export default {
'9000495'
:
'未找到工装信息'
,
'9000496'
:
'ID重复'
,
'9000497'
:
'父级和子级不能相同'
,
'9000498'
:
'该类型绑定了工装,不能删除'
,
'9100000'
:
'部门不能为空'
,
...
...
Server/Apis/Siger.ApiACC/Controllers/FixtureToolsController.cs
View file @
c30773e8
...
...
@@ -401,18 +401,23 @@ namespace Siger.ApiACC.Controllers
{
throw
new
BadRequestException
(
CommonEnum
.
RecordNotFound
);
}
var
details
=
GetSonCategoryList
(
entity
.
guid
,
categorys
);
var
detailIds
=
details
.
Select
(
q
=>
q
.
id
).
Distinct
().
ToList
();
var
details
=
GetSonCategoryList
(
entity
.
guid
,
categorys
).
ToList
();
details
.
Add
(
entity
);
var
detailGuids
=
details
.
Select
(
q
=>
q
.
guid
).
Distinct
().
ToList
();
if
(
_toolsRepository
.
GetList
(
q
=>
q
.
projectId
==
ProjectId
&&
detailGuids
.
Contains
(
q
.
category
)).
Any
())
{
throw
new
BadRequestException
(
RequestEnum
.
CategoryBindFixtureToolData
);
}
var
delDetails
=
_toolsCategoryRepository
.
GetList
(
q
=>
q
.
projectId
==
ProjectId
&&
q
.
status
==
(
int
)
RowState
.
Valid
&&
detailIds
.
Contains
(
q
.
id
)).
ToList
();
detailGuids
.
Contains
(
q
.
guid
)).
ToList
();
foreach
(
var
detail
in
delDetails
)
{
detail
.
status
=
(
int
)
RowState
.
Invalid
;
_toolsCategoryRepository
.
Update
(
detail
);
}
entity
.
status
=
(
int
)
RowState
.
Invalid
;
_toolsCategoryRepository
.
Update
(
entity
);
if
(
_unitOfWork
.
Commit
()
>
0
)
{
return
new
ObjectResult
(
CommonEnum
.
Succefull
);
...
...
Server/Common/Siger.Middlelayer.Share/Enum/RequestEnum.cs
View file @
c30773e8
...
...
@@ -1476,5 +1476,8 @@ namespace Siger.Middlelayer.Common
[
Description
(
"父级和子级不能相同"
)]
ParentSonSame
,
[
Description
(
"该类型绑定了工装,不能删除"
)]
CategoryBindFixtureToolData
,
}
}
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