FeiDaBaoKai/wms_server_kate_suzhou
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加工作总结查询导出结束时间功能

Browse Source
This commit is contained in:
葛林强 2025-03-11 15:21:12 +08:00
parent ade4d84ec9
commit 9b113f8c0a
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/wms/controller/ExcelController.java
View File

@ -764,7 +764,7 @@ public class ExcelController {
@PostMapping("/downloadWorkSummaryExcel")
@ResponseBody
public void downloadWorkSummaryExcel(@RequestBody WorkSummaryQuery workSummaryQuery, HttpServletResponse response) throws IOException {
logger.info("导出物料报表，筛选参数：{}，请求ip：{}", convertJsonString(workSummaryQuery), getIpAddr(servletRequest));
logger.info("导出工作总结，筛选参数：{}，请求ip：{}", convertJsonString(workSummaryQuery), getIpAddr(servletRequest));
//设置响应格式
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
@ -774,13 +774,19 @@ public class ExcelController {
// 内容样式
HorizontalCellStyleStrategy horizontalCellStyleStrategy = ExcelContentStyle.getContentStyle();
// 查询参数
List<WorkSummary> goodsList = workSummaryService.list(new LambdaQueryWrapper<WorkSummary>()
var workSummaryQueryWrapper = new LambdaQueryWrapper<WorkSummary>()
.eq(workSummaryQuery.getLackStatus() != null, WorkSummary::getLackStatus, workSummaryQuery.getLackStatus())
.eq(workSummaryQuery.getWorkDate() != null, WorkSummary::getWorkDate, workSummaryQuery.getWorkDate())
.like(StringUtils.isNotEmpty(workSummaryQuery.getWorkStation()), WorkSummary::getWorkStation, workSummaryQuery.getWorkStation())
.like(StringUtils.isNotEmpty(workSummaryQuery.getWorkOrder()), WorkSummary::getWorkOrder, workSummaryQuery.getWorkOrder())
.like(StringUtils.isNotEmpty(workSummaryQuery.getWorkCenter()), WorkSummary::getWorkCenter, workSummaryQuery.getWorkCenter())
.like(StringUtils.isNotEmpty(workSummaryQuery.getGoodsId()), WorkSummary::getGoodsId, workSummaryQuery.getGoodsId()));
.like(StringUtils.isNotEmpty(workSummaryQuery.getGoodsId()), WorkSummary::getGoodsId, workSummaryQuery.getGoodsId());
if(workSummaryQuery.getWorkDate() != null && workSummaryQuery.getWorkEndDate() != null) {
workSummaryQueryWrapper.between(WorkSummary::getWorkDate, workSummaryQuery.getWorkDate(), workSummaryQuery.getWorkEndDate());
}
if(workSummaryQuery.getWorkDate() != null && workSummaryQuery.getWorkEndDate() == null) {
workSummaryQueryWrapper.eq(WorkSummary::getWorkDate, workSummaryQuery.getWorkDate());
}
List<WorkSummary> goodsList = workSummaryService.list(workSummaryQueryWrapper);
EasyExcel.write(response.getOutputStream(), WorkSummaryExcelVo.class)
.excelType(ExcelTypeEnum.XLSX)
.registerWriteHandler(horizontalCellStyleStrategy)
@ -817,4 +823,4 @@ public class ExcelController {
.sheet("库位报表")
.doWrite(locations.stream().map(LocationExcelVo::of).toList());
}
}
}

16
src/main/java/com/wms/controller/KateWorkQueryController.java
View File

@ -773,14 +773,20 @@ public class KateWorkQueryController {
logger.info("接收到查询工作总结请求：{}，请求ip：{}", convertJsonString(workSummaryQuery), HttpUtils.getIpAddr(servletRequest));
ResponseEntity response = new ResponseEntity();
try {
Page<WorkSummary> page = workSummaryQuery.toMpPage();
Page<WorkSummary> workSummaryPage = workSummaryService.page(page, new LambdaQueryWrapper<WorkSummary>()
var workSummaryQueryWrapper = new LambdaQueryWrapper<WorkSummary>()
.eq(workSummaryQuery.getLackStatus() != null, WorkSummary::getLackStatus, workSummaryQuery.getLackStatus())
.eq(workSummaryQuery.getWorkDate() != null, WorkSummary::getWorkDate, workSummaryQuery.getWorkDate())
.like(StringUtils.isNotEmpty(workSummaryQuery.getWorkStation()), WorkSummary::getWorkStation, workSummaryQuery.getWorkStation())
.like(StringUtils.isNotEmpty(workSummaryQuery.getWorkOrder()), WorkSummary::getWorkOrder, workSummaryQuery.getWorkOrder())
.like(StringUtils.isNotEmpty(workSummaryQuery.getWorkCenter()), WorkSummary::getWorkCenter, workSummaryQuery.getWorkCenter())
.like(StringUtils.isNotEmpty(workSummaryQuery.getGoodsId()), WorkSummary::getGoodsId, workSummaryQuery.getGoodsId()));
.like(StringUtils.isNotEmpty(workSummaryQuery.getGoodsId()), WorkSummary::getGoodsId, workSummaryQuery.getGoodsId());
if(workSummaryQuery.getWorkDate() != null && workSummaryQuery.getWorkEndDate() != null) {
workSummaryQueryWrapper.between(WorkSummary::getWorkDate, workSummaryQuery.getWorkDate(), workSummaryQuery.getWorkEndDate());
}
if(workSummaryQuery.getWorkDate() != null && workSummaryQuery.getWorkEndDate() == null) {
workSummaryQueryWrapper.eq(WorkSummary::getWorkDate, workSummaryQuery.getWorkDate());
}
Page<WorkSummary> page = workSummaryQuery.toMpPage();
Page<WorkSummary> workSummaryPage = workSummaryService.page(page, workSummaryQueryWrapper);
PageDto<WorkSummaryVo> pageDto = PageDto.of(workSummaryPage, workSummary -> BeanUtil.copyProperties(workSummary, WorkSummaryVo.class));
logger.info("查询工作总结成功。");
response.setCode(ResponseCode.OK.getCode());
@ -883,4 +889,4 @@ public class KateWorkQueryController {
return convertJsonString(response);
}
}
}
}

10
src/main/java/com/wms/entity/app/request/WorkSummaryQuery.java
View File

@ -56,12 +56,20 @@ public class WorkSummaryQuery extends PageQuery {
@JsonProperty("lackNum")
private BigDecimal lackNum;
/**
* 工作日期
* 工作日期 - 起始日期
*/
@JsonProperty("workDate")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime workDate;
/**
* 工作日期 - 结束日期
*/
@JsonProperty("workEndDate")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime workEndDate;
/**
* 工作状态
* 0：未开始