Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
FTT_Board
Project
Project
Details
Activity
Releases
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
Administrator
FTT_Board
Commits
80c28192
Commit
80c28192
authored
May 21, 2020
by
朱天博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.车间看板接口优化
parent
3ce33ce1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
FactoryBoardController.cs
...d/FTT.Board.Api/Controllers/API/FactoryBoardController.cs
+17
-2
FactoryBoard.cs
FTT.Board/FTT.Board.Api/Models/FactoryBoard.cs
+0
-6
No files found.
FTT.Board/FTT.Board.Api/Controllers/API/FactoryBoardController.cs
View file @
80c28192
...
@@ -78,8 +78,7 @@ namespace FTT.Board.Controllers.API
...
@@ -78,8 +78,7 @@ namespace FTT.Board.Controllers.API
{
{
WorkTeamID
=
value
.
FactoryWorkShopTeamID
,
WorkTeamID
=
value
.
FactoryWorkShopTeamID
,
PageIndex
=
value
.
PageIndex
,
PageIndex
=
value
.
PageIndex
,
PageSize
=
value
.
PageSize
,
PageSize
=
value
.
PageSize
PageIndexInspection
=
value
.
PageIndexInspection
},
true
);
},
true
);
model
.
UserWageRanking
=
Table2Model
.
ToModelList
<
UserWageRanking
>(
dataSet
.
Tables
[
0
]);
model
.
UserWageRanking
=
Table2Model
.
ToModelList
<
UserWageRanking
>(
dataSet
.
Tables
[
0
]);
...
@@ -90,5 +89,21 @@ namespace FTT.Board.Controllers.API
...
@@ -90,5 +89,21 @@ namespace FTT.Board.Controllers.API
model
.
DayYield
=
(
int
)
dataSet
.
Tables
[
5
].
Rows
[
0
][
0
];
model
.
DayYield
=
(
int
)
dataSet
.
Tables
[
5
].
Rows
[
0
][
0
];
return
model
.
ToString
();
return
model
.
ToString
();
}
}
public
string
PostCXInspection
(
FactoryBoardRepuest
value
)
{
List
<
ConstantlyInspection
>
model
=
new
List
<
ConstantlyInspection
>();
DataSet
dataSet
=
Dbo
.
Create
(
ModuleName
).
GetDataSet
(
"[SP_MES_FactoryWageBoardCX]"
,
new
{
WorkTeamID
=
value
.
FactoryWorkShopTeamID
,
PageIndex
=
value
.
PageIndex
,
PageSize
=
value
.
PageSize
},
true
);
model
=
Table2Model
.
ToModelList
<
ConstantlyInspection
>(
dataSet
.
Tables
[
1
]);
JsonSerializerSettings
jsSettings
=
new
JsonSerializerSettings
();
jsSettings
.
ReferenceLoopHandling
=
ReferenceLoopHandling
.
Ignore
;
return
JsonConvert
.
SerializeObject
(
model
,
jsSettings
).
ToString
();
}
}
}
}
}
\ No newline at end of file
FTT.Board/FTT.Board.Api/Models/FactoryBoard.cs
View file @
80c28192
...
@@ -21,12 +21,6 @@ namespace FTT.Board.Models
...
@@ -21,12 +21,6 @@ namespace FTT.Board.Models
/// </summary>
/// </summary>
public
int
PageIndex
{
get
;
set
;
}
public
int
PageIndex
{
get
;
set
;
}
/// <summary>
/// 页码品检用
/// </summary>
public
int
PageIndexInspection
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 条数
/// 条数
/// </summary>
/// </summary>
...
...
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