Browse Source

feat(all): 配送明细报表

1 修改配送明细报表查询导出逻辑
dev
zhaoqiaobo 2 months ago
parent
commit
ea3f180b3f
  1. 9
      blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java
  2. 2
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
  3. 8
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java

9
blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java

@ -124,13 +124,8 @@ public class ReportDeliveryController extends BladeController {
@GetMapping("/exportDetails/v2")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "导出配送明细报表v2", notes = "导出配送明细报表v2")
public R exportDetailsV3(HttpServletResponse response, DevilerDetailsQuery query) {
try {
reportDeliverService.exportDetailsV3(response, query);
return R.success("导出成功");
} catch (Exception e) {
return R.fail("导出失败,多仓权限最多只能导1周的数据,单仓权限最多只能导1个月的数");
}
public void exportDetailsV3(HttpServletResponse response, DevilerDetailsQuery query) {
reportDeliverService.exportDetailsV3(response, query);
}
@GetMapping("/stockOrder")

2
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@ -455,6 +455,8 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
@Override
public void exportDetailsV3(HttpServletResponse response, DevilerDetailsQuery query) {
IPage<ReportDetailVO> page = Condition.getPage(query);
page.setPages(1);
page.setSize(100000);
if (StrUtil.isEmpty(query.getWarehouseNameRange())) {
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if (ObjectUtil.isNotEmpty(myCurrentWarehouse)) {

8
blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java

@ -29,10 +29,6 @@ public class ReportDetailVO implements Serializable {
@ExcelProperty("车次")
private String trainNumber;
@ApiModelProperty(value = "回库状态")
@ExcelProperty("回库状态")
private String returnToStockStatus;
@ApiModelProperty(value = "品牌")
@ExcelProperty("品牌")
private String brand;
@ -213,4 +209,8 @@ public class ReportDetailVO implements Serializable {
@ExcelProperty("签收方式")
private String signType;
@ApiModelProperty(value = "回库状态")
@ExcelProperty("回库状态")
private String returnToStockStatus;
}

Loading…
Cancel
Save