Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes
Project
Project
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
ximai
mes
Commits
d429aca0
Commit
d429aca0
authored
Dec 11, 2024
by
温志超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新报表
parent
5c639228
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
0 deletions
+24
-0
WeeklyProductionReportController.java
...s/report/controller/WeeklyProductionReportController.java
+14
-0
WeeklyProductionReportService.java
...mai/mes/report/service/WeeklyProductionReportService.java
+2
-0
WeeklyProductionReportServiceImp.java
...report/service/impl/WeeklyProductionReportServiceImp.java
+8
-0
No files found.
mes/src/main/java/com/ximai/mes/report/controller/WeeklyProductionReportController.java
View file @
d429aca0
...
...
@@ -3,6 +3,7 @@ package com.ximai.mes.report.controller;
import
com.ximai.common.annotation.Log
;
import
com.ximai.common.core.domain.AjaxResult
;
import
com.ximai.common.enums.BusinessType
;
import
com.ximai.mes.report.request.DailyProductionReportRequest
;
import
com.ximai.mes.report.request.WeeklyProductionReportRequest
;
import
com.ximai.mes.report.service.MonthlyProductionReportService
;
import
com.ximai.mes.report.service.WeeklyProductionReportService
;
...
...
@@ -23,6 +24,19 @@ public class WeeklyProductionReportController {
@Autowired
WeeklyProductionReportService
weeklyProductionReportService
;
@ApiOperation
(
"日产能对比统计:获取周表头"
)
@PreAuthorize
(
"@ss.hasPermi('mes:pro:dailyProductionReport:get')"
)
@Log
(
title
=
"日产能对比统计:获取周表头"
,
businessType
=
BusinessType
.
QUERY
)
@GetMapping
(
"/getDatas"
)
public
AjaxResult
<
List
>
getDatas
(
WeeklyProductionReportRequest
weeklyProductionReportRequest
)
{
List
data
=
weeklyProductionReportService
.
getDatas
(
weeklyProductionReportRequest
);
return
AjaxResult
.
success
(
data
);
}
@ApiOperation
(
"周产能对比统计:统计方式工序"
)
@PreAuthorize
(
"@ss.hasPermi('mes:pro:dailyProductionReport:get')"
)
@Log
(
title
=
"周产能对比统计:统计方式工序"
,
businessType
=
BusinessType
.
QUERY
)
...
...
mes/src/main/java/com/ximai/mes/report/service/WeeklyProductionReportService.java
View file @
d429aca0
...
...
@@ -14,4 +14,6 @@ public interface WeeklyProductionReportService {
List
getListByWorkunit
(
WeeklyProductionReportRequest
weeklyProductionReportRequest
);
List
getListByUser
(
WeeklyProductionReportRequest
weeklyProductionReportRequest
);
List
getDatas
(
WeeklyProductionReportRequest
weeklyProductionReportRequest
);
}
mes/src/main/java/com/ximai/mes/report/service/impl/WeeklyProductionReportServiceImp.java
View file @
d429aca0
...
...
@@ -78,6 +78,14 @@ public class WeeklyProductionReportServiceImp implements WeeklyProductionReportS
return
returnList
;
}
@Override
public
List
getDatas
(
WeeklyProductionReportRequest
weeklyProductionReportRequest
)
{
ExceptionUtil
.
checkTrueThrowException
(
weeklyProductionReportRequest
.
getDateWeekly
()
==
null
,
"请传入年月份"
);
List
<
String
>
dateList
=
getWeeks
(
new
Integer
(
weeklyProductionReportRequest
.
getDateWeekly
().
split
(
"-"
)[
0
]),
new
Integer
(
weeklyProductionReportRequest
.
getDateWeekly
().
split
(
"-"
)[
1
]));
return
dateList
;
}
public
static
List
<
String
>
getWeeksInMonth
(
String
dateWeekly
)
{
dateWeekly
=
dateWeekly
+
"-01"
;
...
...
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