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
ec6ca0ab
Commit
ec6ca0ab
authored
Jan 23, 2021
by
xin.yang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some update
parent
0c7bd868
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
FixtureToolsController.cs
...r/Apis/Siger.ApiACC/Controllers/FixtureToolsController.cs
+2
-2
AutomationFixtureToolsRepository.cs
...pository/Repositories/AutomationFixtureToolsRepository.cs
+5
-1
IAutomationFixtureToolsRepository.cs
...positories/Interface/IAutomationFixtureToolsRepository.cs
+1
-1
No files found.
Server/Apis/Siger.ApiACC/Controllers/FixtureToolsController.cs
View file @
ec6ca0ab
...
@@ -356,9 +356,9 @@ namespace Siger.ApiACC.Controllers
...
@@ -356,9 +356,9 @@ namespace Siger.ApiACC.Controllers
[
HttpGet
]
[
HttpGet
]
public
IActionResult
GetFixtureToolList
()
public
IActionResult
GetFixtureToolList
(
string
categoryid
)
{
{
var
list
=
_toolsRepository
.
GetDataList
(
ProjectId
);
var
list
=
_toolsRepository
.
GetDataList
(
categoryid
.
ToInt
(),
ProjectId
);
return
new
ObjectResult
(
list
);
return
new
ObjectResult
(
list
);
}
}
}
}
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsRepository.cs
View file @
ec6ca0ab
...
@@ -76,7 +76,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
...
@@ -76,7 +76,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
}
}
public
IEnumerable
<
ResponseFixtureTools
>
GetDataList
(
int
projectid
)
public
IEnumerable
<
ResponseFixtureTools
>
GetDataList
(
int
categoryid
,
int
projectid
)
{
{
var
query
=
from
q
in
_context
.
siger_automation_fixture_tools
var
query
=
from
q
in
_context
.
siger_automation_fixture_tools
join
p
in
_context
.
siger_automation_fixture_tools_category
on
q
.
category
equals
p
.
guid
join
p
in
_context
.
siger_automation_fixture_tools_category
on
q
.
category
equals
p
.
guid
...
@@ -98,6 +98,10 @@ namespace Siger.Middlelayer.AccRepository.Repositories
...
@@ -98,6 +98,10 @@ namespace Siger.Middlelayer.AccRepository.Repositories
status
=
q
.
status
,
status
=
q
.
status
,
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
)
:
""
};
};
if
(
categoryid
>
0
)
{
query
=
query
.
Where
(
q
=>
q
.
categoryid
==
categoryid
);
}
var
entities
=
query
.
OrderByDescending
(
q
=>
q
.
id
).
AsNoTracking
().
ToList
();
var
entities
=
query
.
OrderByDescending
(
q
=>
q
.
id
).
AsNoTracking
().
ToList
();
return
entities
;
return
entities
;
}
}
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/Interface/IAutomationFixtureToolsRepository.cs
View file @
ec6ca0ab
...
@@ -11,7 +11,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories.Interface
...
@@ -11,7 +11,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories.Interface
IPagedCollectionResult
<
ResponseFixtureTools
>
GetPagedList
(
int
category
,
string
code
,
string
name
,
int
state
,
IPagedCollectionResult
<
ResponseFixtureTools
>
GetPagedList
(
int
category
,
string
code
,
string
name
,
int
state
,
int
projectid
,
int
page
,
int
pagesize
);
int
projectid
,
int
page
,
int
pagesize
);
IEnumerable
<
ResponseFixtureTools
>
GetDataList
(
int
projectid
);
IEnumerable
<
ResponseFixtureTools
>
GetDataList
(
int
categoryid
,
int
projectid
);
ResponseProductFixtureInfo
GetProductFixtureLocation
(
int
projectId
,
string
guid
);
ResponseProductFixtureInfo
GetProductFixtureLocation
(
int
projectId
,
string
guid
);
}
}
...
...
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