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
edc17ee4
Commit
edc17ee4
authored
Jan 22, 2021
by
xin.yang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
45ae8c92
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
LocationController.cs
Server/Apis/Siger.ApiWMS/Controllers/LocationController.cs
+8
-0
AutomationFixtureToolsProductRepository.cs
...y/Repositories/AutomationFixtureToolsProductRepository.cs
+1
-1
FixtureToolsCategory.cs
...iddlelayer.AccRepository/Response/FixtureToolsCategory.cs
+1
-1
No files found.
Server/Apis/Siger.ApiWMS/Controllers/LocationController.cs
View file @
edc17ee4
...
@@ -937,6 +937,10 @@ namespace Siger.ApiWMS.Controllers
...
@@ -937,6 +937,10 @@ namespace Siger.ApiWMS.Controllers
foreach
(
var
Location
in
req
.
storeArr
)
foreach
(
var
Location
in
req
.
storeArr
)
{
{
if
(
req
.
storeArr
.
Count
(
q
=>
q
.
val
==
Location
.
val
)
>
1
)
{
throw
new
BadRequestException
(
RequestEnum
.
DataExist
);
}
var
loca
=
location
.
Get
(
q
=>
q
.
realname
==
Location
.
val
&&
q
.
projectid
==
ProjectId
);
var
loca
=
location
.
Get
(
q
=>
q
.
realname
==
Location
.
val
&&
q
.
projectid
==
ProjectId
);
if
(
loca
!=
null
)
if
(
loca
!=
null
)
{
{
...
@@ -1056,6 +1060,10 @@ namespace Siger.ApiWMS.Controllers
...
@@ -1056,6 +1060,10 @@ namespace Siger.ApiWMS.Controllers
foreach
(
var
Location
in
req
.
storeArr
)
foreach
(
var
Location
in
req
.
storeArr
)
{
{
if
(
req
.
storeArr
.
Count
(
q
=>
q
.
val
==
Location
.
val
)
>
1
)
{
throw
new
BadRequestException
(
RequestEnum
.
DataExist
);
}
var
loca
=
location
.
Get
(
q
=>
q
.
realname
==
Location
.
val
&&
q
.
projectid
==
ProjectId
&&
q
.
id
!=
Location
.
locationid
.
ToInt
());
var
loca
=
location
.
Get
(
q
=>
q
.
realname
==
Location
.
val
&&
q
.
projectid
==
ProjectId
&&
q
.
id
!=
Location
.
locationid
.
ToInt
());
if
(
loca
!=
null
)
if
(
loca
!=
null
)
{
{
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsProductRepository.cs
View file @
edc17ee4
...
@@ -39,7 +39,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
...
@@ -39,7 +39,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
productid
=
q
.
productid
,
productid
=
q
.
productid
,
productname
=
p
.
name
,
productname
=
p
.
name
,
remark
=
q
.
remark
,
remark
=
q
.
remark
,
updator
=
q
.
updator
,
updator
=
u
.
name
??
""
,
updatetime
=
q
.
updatetime
.
HasValue
&&
q
.
updatetime
>
DateTime
.
MinValue
?
q
.
updatetime
.
Value
.
ToString
(
ParameterConstant
.
DateTimeFormat
)
:
""
updatetime
=
q
.
updatetime
.
HasValue
&&
q
.
updatetime
>
DateTime
.
MinValue
?
q
.
updatetime
.
Value
.
ToString
(
ParameterConstant
.
DateTimeFormat
)
:
""
};
};
Expression
<
Func
<
ResponseAumationFixtureToolsProduct
,
bool
>>
categoryExpression
=
f
=>
true
;
Expression
<
Func
<
ResponseAumationFixtureToolsProduct
,
bool
>>
categoryExpression
=
f
=>
true
;
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Response/FixtureToolsCategory.cs
View file @
edc17ee4
...
@@ -103,7 +103,7 @@ namespace Siger.Middlelayer.AccRepository.Response
...
@@ -103,7 +103,7 @@ namespace Siger.Middlelayer.AccRepository.Response
/// </summary>
/// </summary>
public
string
remark
{
get
;
set
;
}
public
string
remark
{
get
;
set
;
}
public
int
updator
{
get
;
set
;
}
public
string
updator
{
get
;
set
;
}
public
string
updatetime
{
get
;
set
;
}
public
string
updatetime
{
get
;
set
;
}
}
}
...
...
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