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
d7f0f4c9
Commit
d7f0f4c9
authored
May 15, 2020
by
朱天博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
车间看板接口修改
parent
c57b3af1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
+18
-3
FactoryBoardController.cs
...d/FTT.Board.Api/Controllers/API/FactoryBoardController.cs
+2
-2
FactoryBoard.cs
FTT.Board/FTT.Board.Api/Models/FactoryBoard.cs
+16
-1
No files found.
FTT.Board/FTT.Board.Api/Controllers/API/FactoryBoardController.cs
View file @
d7f0f4c9
...
...
@@ -38,7 +38,7 @@ namespace FTT.Board.Controllers.API
public
string
GetCX
(
int
FactoryWorkShopTeamID
)
{
FactoryBoardCXResponse
model
=
new
FactoryBoardCXResponse
();
DataSet
dataSet
=
Dbo
.
Create
(
ModuleName
).
GetDataSet
(
"[SP_MES_FactoryWageBoard
ZC
]"
,
new
DataSet
dataSet
=
Dbo
.
Create
(
ModuleName
).
GetDataSet
(
"[SP_MES_FactoryWageBoard
CX
]"
,
new
{
WorkTeamID
=
FactoryWorkShopTeamID
},
true
);
...
...
@@ -74,7 +74,7 @@ namespace FTT.Board.Controllers.API
public
string
PostCX
(
FactoryBoardRepuest
value
)
{
FactoryBoardCXResponse
model
=
new
FactoryBoardCXResponse
();
DataSet
dataSet
=
Dbo
.
Create
(
ModuleName
).
GetDataSet
(
"[SP_MES_FactoryWageBoard
ZC
]"
,
new
DataSet
dataSet
=
Dbo
.
Create
(
ModuleName
).
GetDataSet
(
"[SP_MES_FactoryWageBoard
CX
]"
,
new
{
WorkTeamID
=
value
.
FactoryWorkShopTeamID
,
PageIndex
=
value
.
PageIndex
,
...
...
FTT.Board/FTT.Board.Api/Models/FactoryBoard.cs
View file @
d7f0f4c9
...
...
@@ -209,6 +209,11 @@ namespace FTT.Board.Models
/// </summary>
public
class
ZCFactoryWageInfo
{
/// <summary>
/// 车间名称
/// </summary>
public
string
FactoryWorkShopTeamName
{
get
;
set
;
}
/// <summary>
/// 在职员工数量
/// </summary>
...
...
@@ -265,6 +270,11 @@ namespace FTT.Board.Models
/// </summary>
public
class
CXFactoryWageInfo
{
/// <summary>
/// 车间名称
/// </summary>
public
string
FactoryWorkShopTeamName
{
get
;
set
;
}
/// <summary>
/// 在职员工数量
/// </summary>
...
...
@@ -321,6 +331,11 @@ namespace FTT.Board.Models
/// </summary>
public
class
MonthStar
{
/// <summary>
/// 照片
/// </summary>
public
string
Photo
{
get
;
set
;
}
/// <summary>
/// 员工编号
/// </summary>
...
...
@@ -345,6 +360,6 @@ namespace FTT.Board.Models
/// <summary>
/// 占比
/// </summary>
public
string
IENamePercent
{
get
;
set
;
}
public
double
IENameSubMoney
{
get
;
set
;
}
}
}
\ No newline at end of file
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