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
b40b2a40
Commit
b40b2a40
authored
Jul 10, 2020
by
朱天博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1,鑫源看板
parent
80c28192
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
167 additions
and
0 deletions
+167
-0
FactoryBoardXYController.cs
...FTT.Board.Api/Controllers/API/FactoryBoardXYController.cs
+56
-0
FTT.Board.csproj
FTT.Board/FTT.Board.Api/FTT.Board.csproj
+2
-0
FactoryBoardXY.cs
FTT.Board/FTT.Board.Api/Models/FactoryBoardXY.cs
+109
-0
No files found.
FTT.Board/FTT.Board.Api/Controllers/API/FactoryBoardXYController.cs
0 → 100644
View file @
b40b2a40
using
FTT.Board.Common
;
using
FTT.Board.Models
;
using
FttCloud.Public.Database
;
using
Newtonsoft.Json
;
using
System
;
using
System.Collections.Generic
;
using
System.Data
;
using
System.Linq
;
using
System.Net
;
using
System.Net.Http
;
using
System.Web.Http
;
namespace
FTT.Board.Controllers.API
{
public
class
FactoryBoardXYController
:
ApiController
{
public
ModuleModel
ModuleName
=>
ModuleModel
.
MES
;
public
string
PostCX
(
FactoryBoardRepuest
value
)
{
FactoryBoardResponse
model
=
new
FactoryBoardResponse
();
DataSet
dataSet
=
Dbo
.
Create
(
ModuleName
).
GetDataSet
(
"[SP_MES_FactoryWageBoard_XY]"
,
new
{
WorkTeamID
=
value
.
FactoryWorkShopTeamID
,
PageIndex
=
value
.
PageIndex
,
PageSize
=
value
.
PageSize
},
true
);
model
.
UserWageRanking
=
Table2Model
.
ToModelList
<
UserWageRanking
>(
dataSet
.
Tables
[
0
]);
model
.
ConstantlyWage
=
Table2Model
.
ToModelList
<
ConstantlyWage
>(
dataSet
.
Tables
[
1
]);
model
.
YieldInfo
=
Table2Model
.
ToModelList
<
YieldInfo
>(
dataSet
.
Tables
[
2
]);
model
.
LineChart
=
Table2Model
.
ToModelList
<
LineChart
>(
dataSet
.
Tables
[
3
]);
model
.
DayYield
=
(
int
)
dataSet
.
Tables
[
4
].
Rows
[
0
][
0
];
model
.
Title
=
dataSet
.
Tables
[
5
].
Rows
[
0
][
0
].
ToString
();
return
model
.
ToString
();
}
public
string
PostCXInspection
(
FactoryBoardRepuest
value
)
{
List
<
ConstantlyWage
>
model
=
new
List
<
ConstantlyWage
>();
DataSet
dataSet
=
Dbo
.
Create
(
ModuleName
).
GetDataSet
(
"[SP_MES_FactoryWageBoard_XY]"
,
new
{
WorkTeamID
=
value
.
FactoryWorkShopTeamID
,
PageIndex
=
value
.
PageIndex
,
PageSize
=
value
.
PageSize
},
true
);
model
=
Table2Model
.
ToModelList
<
ConstantlyWage
>(
dataSet
.
Tables
[
1
]);
JsonSerializerSettings
jsSettings
=
new
JsonSerializerSettings
();
jsSettings
.
ReferenceLoopHandling
=
ReferenceLoopHandling
.
Ignore
;
return
JsonConvert
.
SerializeObject
(
model
,
jsSettings
).
ToString
();
}
}
}
FTT.Board/FTT.Board.Api/FTT.Board.csproj
View file @
b40b2a40
...
@@ -165,6 +165,7 @@
...
@@ -165,6 +165,7 @@
<Compile
Include=
"Areas\HelpPage\XmlDocumentationProvider.cs"
/>
<Compile
Include=
"Areas\HelpPage\XmlDocumentationProvider.cs"
/>
<Compile
Include=
"Controllers\API\CFG\CFG_BoardController.cs"
/>
<Compile
Include=
"Controllers\API\CFG\CFG_BoardController.cs"
/>
<Compile
Include=
"Controllers\API\FactoryBoardController.cs"
/>
<Compile
Include=
"Controllers\API\FactoryBoardController.cs"
/>
<Compile
Include=
"Controllers\API\FactoryBoardXYController.cs"
/>
<Compile
Include=
"Controllers\ChartController.cs"
/>
<Compile
Include=
"Controllers\ChartController.cs"
/>
<Compile
Include=
"Controllers\API\CFG\CFG_BoardDetailController.cs"
/>
<Compile
Include=
"Controllers\API\CFG\CFG_BoardDetailController.cs"
/>
<Compile
Include=
"Controllers\HomeController.cs"
/>
<Compile
Include=
"Controllers\HomeController.cs"
/>
...
@@ -177,6 +178,7 @@
...
@@ -177,6 +178,7 @@
<Compile
Include=
"Models\Database\Dbo.cs"
/>
<Compile
Include=
"Models\Database\Dbo.cs"
/>
<Compile
Include=
"Models\Database\ModuleAttribute.cs"
/>
<Compile
Include=
"Models\Database\ModuleAttribute.cs"
/>
<Compile
Include=
"Models\FactoryBoard.cs"
/>
<Compile
Include=
"Models\FactoryBoard.cs"
/>
<Compile
Include=
"Models\FactoryBoardXY.cs"
/>
<Compile
Include=
"Models\MsSqlDbContextWraper.cs"
/>
<Compile
Include=
"Models\MsSqlDbContextWraper.cs"
/>
<Compile
Include=
"Models\Table2Model.cs"
/>
<Compile
Include=
"Models\Table2Model.cs"
/>
<Compile
Include=
"Properties\AssemblyInfo.cs"
/>
<Compile
Include=
"Properties\AssemblyInfo.cs"
/>
...
...
FTT.Board/FTT.Board.Api/Models/FactoryBoardXY.cs
0 → 100644
View file @
b40b2a40
using
Newtonsoft.Json
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Web
;
namespace
FTT.Board.Models
{
/// <summary>
/// 成型车间看板出参
/// </summary>
public
class
FactoryBoardResponse
{
/// <summary>
/// 员工工资排名
/// </summary>
public
List
<
UserWageRanking
>
UserWageRanking
{
get
;
set
;
}
/// <summary>
/// 实时工资
/// </summary>
public
List
<
ConstantlyWage
>
ConstantlyWage
{
get
;
set
;
}
/// <summary>
/// 每日产量
/// </summary>
public
List
<
YieldInfo
>
YieldInfo
{
get
;
set
;
}
/// <summary>
/// 折线图
/// </summary>
public
List
<
LineChart
>
LineChart
{
get
;
set
;
}
/// <summary>
/// 当日产量
/// </summary>
public
int
DayYield
{
get
;
set
;
}
/// <summary>
/// 标题
/// </summary>
public
string
Title
{
get
;
set
;
}
public
override
string
ToString
()
{
JsonSerializerSettings
jsSettings
=
new
JsonSerializerSettings
();
jsSettings
.
ReferenceLoopHandling
=
ReferenceLoopHandling
.
Ignore
;
return
JsonConvert
.
SerializeObject
(
this
,
jsSettings
).
ToString
();
}
}
/// <summary>
/// 每日产量
/// </summary>
public
class
YieldInfo
{
/// <summary>
/// 日期
/// </summary>
public
string
PlanDate
{
get
;
set
;
}
/// <summary>
/// 货号(型体)
/// </summary>
public
string
StyleCode
{
get
;
set
;
}
/// <summary>
/// 昨日遗留
/// </summary>
public
int
MarginQty
{
get
;
set
;
}
/// <summary>
/// 今日计划
/// </summary>
public
int
TodayPlanQty
{
get
;
set
;
}
/// <summary>
/// 总计划
/// </summary>
public
int
PlanQty
{
get
;
set
;
}
/// <summary>
/// 实际产量
/// </summary>
public
int
ReportQty
{
get
;
set
;
}
/// <summary>
/// 产量比例
/// </summary>
public
string
PlanPercent
{
get
;
set
;
}
}
public
class
LineChart
{
/// <summary>
/// 日期
/// </summary>
public
string
PlanDate
{
get
;
set
;
}
/// <summary>
/// 实际产量
/// </summary>
public
int
ReportQty
{
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