root/rl_mg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: 窑内实时报表

Browse Source
This commit is contained in:
liyongde
2023-08-03 17:09:53 +08:00
parent 13c1cdb824
commit 54cf09546d
9 changed files with 116 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java
View File

@@ -60,4 +60,10 @@ public class ReportController {
public ResponseEntity<Object> outKilnReport(Map json, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(reportService.outKilnReport(json,page)), HttpStatus.OK);
}
@GetMapping("/inKilnReport")
@Log("窑内物料实时报表")
@ApiOperation("窑内物料实时报表")
public ResponseEntity<Object> inKilnReport(Map json, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(reportService.inKilnReport(json,page)), HttpStatus.OK);
}
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java
View File

@@ -16,5 +16,7 @@ public interface ReportService {
IPage<IOKilnReportVo> outKilnReport(Map json, PageQuery page);
IPage<IOKilnReportVo> inKilnReport(Map json, PageQuery page);
// IPage<> mudTransfer(JSONObject json, PageQuery page);
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java
View File

@@ -13,4 +13,6 @@ public interface ReportMapper {
IPage<IOKilnReportVo> intoKilnReportByPage(IPage<IOKilnReportVo> pages, JSONObject query);
IPage<IOKilnReportVo> outKilnReportByPage(IPage<IOKilnReportVo> pages, JSONObject object);
IPage<IOKilnReportVo> inKilnReport(IPage<IOKilnReportVo> pages, JSONObject object);
}

16
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml
View File

@@ -4,6 +4,7 @@
<select id="intoKilnReportByPage" resultType="org.nl.wms.report.service.dao.vo.IOKilnReportVo">
SELECT
vg.into_kiln_time,
vg.out_kiln_time,
vg.vehicle_code,
vg.pcsn,
vg.material_qty,
@@ -12,7 +13,7 @@
FROM
`sch_base_vehiclematerialgroup` vg
LEFT JOIN md_base_material m ON m.material_id = vg.material_id
WHERE vg.into_kiln_time IS NOT NULL AND vg.out_kiln_time IS NULL
WHERE vg.into_kiln_time IS NOT NULL
</select>
<select id="outKilnReportByPage" resultType="org.nl.wms.report.service.dao.vo.IOKilnReportVo">
SELECT
@@ -28,4 +29,17 @@
LEFT JOIN md_base_material m ON m.material_id = vg.material_id
WHERE vg.into_kiln_time IS NOT NULL AND vg.out_kiln_time IS NOT NULL
</select>
<select id="inKilnReport" resultType="org.nl.wms.report.service.dao.vo.IOKilnReportVo">
SELECT
vg.into_kiln_time,
vg.vehicle_code,
vg.pcsn,
vg.material_qty,
m.material_code,
m.material_name
FROM
`sch_base_vehiclematerialgroup` vg
LEFT JOIN md_base_material m ON m.material_id = vg.material_id
WHERE vg.into_kiln_time IS NOT NULL AND vg.out_kiln_time IS NULL
</select>
</mapper>

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java
View File

@@ -36,4 +36,11 @@ public class ReportServiceImpl implements ReportService {
pages = reportMapper.outKilnReportByPage(pages, new JSONObject(query));
return pages;
}
@Override
public IPage<IOKilnReportVo> inKilnReport(Map query, PageQuery page) {
IPage<IOKilnReportVo> pages = new Page<>(page.getPage() + 1, page.getSize());
pages = reportMapper.inKilnReport(pages, new JSONObject(query));
return pages;
}
}