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
987f2924
Commit
987f2924
authored
Jan 24, 2021
by
xin.yang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
19e0b3ff
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
FixtureToolsAssemblyController.cs
...iger.ApiACC/Controllers/FixtureToolsAssemblyController.cs
+1
-1
AutomationFixtureToolsAssemblyRepository.cs
.../Repositories/AutomationFixtureToolsAssemblyRepository.cs
+2
-1
FixtureToolsCategory.cs
...iddlelayer.AccRepository/Response/FixtureToolsCategory.cs
+2
-1
No files found.
Server/Apis/Siger.ApiACC/Controllers/FixtureToolsAssemblyController.cs
View file @
987f2924
...
@@ -66,7 +66,7 @@ namespace Siger.ApiACC.Controllers
...
@@ -66,7 +66,7 @@ namespace Siger.ApiACC.Controllers
model
.
parentcategoryids
=
parentcateIds1
;
model
.
parentcategoryids
=
parentcateIds1
;
models
.
Add
(
model
);
models
.
Add
(
model
);
}
}
item
.
children
=
models
;
item
.
children
s
=
models
;
list
.
Add
(
item
);
list
.
Add
(
item
);
}
}
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsAssemblyRepository.cs
View file @
987f2924
...
@@ -54,7 +54,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
...
@@ -54,7 +54,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
parentcate_guid
=
t1
.
guid
,
parentcate_guid
=
t1
.
guid
,
parentguid
=
q
.
parent
,
parentguid
=
q
.
parent
,
fixtureguid
=
q
.
son
,
fixtureguid
=
q
.
son
,
remark
=
q
.
remark
remark
=
q
.
remark
,
parentcategoryid
=
c1
==
null
?
0
:
c1
.
id
};
};
Expression
<
Func
<
ResponseAumationFixtureToolsAssembly
,
bool
>>
categoryExpression
=
f
=>
true
;
Expression
<
Func
<
ResponseAumationFixtureToolsAssembly
,
bool
>>
categoryExpression
=
f
=>
true
;
if
(
category
>
0
)
if
(
category
>
0
)
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Response/FixtureToolsCategory.cs
View file @
987f2924
...
@@ -139,12 +139,13 @@ namespace Siger.Middlelayer.AccRepository.Response
...
@@ -139,12 +139,13 @@ namespace Siger.Middlelayer.AccRepository.Response
public
List
<
int
>
parentcategoryids
{
get
;
set
;
}
=
new
List
<
int
>();
public
List
<
int
>
parentcategoryids
{
get
;
set
;
}
=
new
List
<
int
>();
public
string
cate_guid
{
get
;
set
;
}
public
string
cate_guid
{
get
;
set
;
}
public
List
<
int
>
categoryids
{
get
;
set
;
}
=
new
List
<
int
>();
public
List
<
int
>
categoryids
{
get
;
set
;
}
=
new
List
<
int
>();
public
int
parentcategoryid
{
get
;
set
;
}
public
string
parentguid
{
get
;
set
;
}
public
string
parentguid
{
get
;
set
;
}
public
string
fixtureguid
{
get
;
set
;
}
public
string
fixtureguid
{
get
;
set
;
}
public
List
<
ResponseAumationFixtureToolsAssembly
>
children
{
get
;
set
;
}
public
List
<
ResponseAumationFixtureToolsAssembly
>
children
s
{
get
;
set
;
}
public
string
remark
{
get
;
set
;
}
public
string
remark
{
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