From 40e5a2b3274c48f8707f4785463d670fe17bb9b4 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 15 Oct 2024 18:12:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E9=85=8D?= =?UTF-8?q?=E9=80=81=E6=98=8E=E7=BB=862.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 优化配送明细报表 --- .../controller/ReportDeliveryController.java | 14 ++++ .../report/mapper/ReportDeliverMapeer.java | 3 + .../report/mapper/ReportDeliverMapper.xml | 73 +++++++++++++++++++ .../report/reader/DeliveryDetailV2Reader.java | 43 +++++++++++ .../logpm/report/service/IAsyncService.java | 2 + .../report/service/ReportDeliverService.java | 5 ++ .../report/service/impl/AsyncServiceImpl.java | 5 ++ .../impl/ReportDeliverServiceImpl.java | 27 +++++++ 8 files changed, 172 insertions(+) create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailV2Reader.java diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java index 09de067aa..5f4f171f2 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java @@ -90,6 +90,13 @@ public class ReportDeliveryController extends BladeController { IPage pages = reportDeliverService.detailsPage(vo, query); return R.data(pages); } + @GetMapping("/details/v2") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "配送明细报表v2", notes = "配送明细报表v2") + public R> detailsPageV2(ReportDetailVO vo, DevilerDetailsQuery query) { + IPage pages = reportDeliverService.detailsPageV2(vo, query); + return R.data(pages); + } @GetMapping("/exportDetails") @ApiOperationSupport(order = 6) @@ -97,6 +104,13 @@ public class ReportDeliveryController extends BladeController { public void exportDetails(HttpServletResponse response, ReportDetailVO vo, DevilerDetailsQuery query) { reportDeliverService.exportDetails(response, vo, query); + } + @GetMapping("/exportDetails/v2") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "导出配送明细报表v2", notes = "导出配送明细报表v2") + public void exportDetailsV2(HttpServletResponse response, ReportDetailVO vo, DevilerDetailsQuery query) { + reportDeliverService.exportDetailsV2(response, vo, query); + } @GetMapping("/stockOrder") diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java index bd6a6bacc..7795250d3 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java @@ -70,6 +70,9 @@ public interface ReportDeliverMapeer extends BaseMapper { List getDeliveryTrainLoadSacnInvnByIds(@Param("idBatch") List idBatch); Long getDetailsPageCount(@Param("ew") Wrapper query); + Long getDetailsV2PageCount(@Param("ew") Wrapper query); List getDetailsPageExport(@Param("ew") Wrapper queryWrapper, @Param("current") Integer current, @Param("size") Integer size); + + List getDetailsPageV2(IPage page, @Param("ew") Wrapper queryWrapper); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml index e4d158a4a..b6f6a8d9d 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml @@ -500,6 +500,74 @@ + + + select * + from (select plan_train_number train_number, + plan_reservation_code reservation_code, + delivery_time task_time, + warehouse_name warehouse_name, + warehouse_id warehouse_id, + delivery_type type, + delivery_kind kind, + vehicle_name vehicle_name, + driver_name driver_name, + distribution_company distribution_company, + custom_name dr_consignee, + custom_phone delivery_phone, + custom_address delivery_address, + consignee_unit consignee, + consignee_person consignee_name, + consignee_mobile consignee_mobile, + waybill_number waybill_no, + order_code stock_article_id, + order_package_code order_package_code, + train_number customer_train, + case + when conditions = 1 then '订制品' + when conditions = 2 then '零担' + when conditions = 3 then '库存品' end conditions, + firsts_product firsts, + second_product decond, + third_product third_product, + materiel_code material_code, + materiel_name material_name, + begin_warehouse_name start_war, + begin_warehouse_in_time start_war_in_time, + begin_warehouse_out_time start_war_out_time, + end_warehouse_in_time warehouse_entry_time_end, + case + when sign_status = 1 then '已签收' + when sign_status = 0 then '未签收' + when sign_status = -1 then '已回库' end driver_signing, + load_time unload_time, + load_user_name un_administrators_name, + sign_time sjsigning_time, + sign_user_name lds_signee_name, + case when review_time is null then '未复核' else '已复核' end signing_status, + review_time signing_time, + sign_num sign_num, + case + when sign_type = 1 then '司机扫描签收' + when sign_type = 2 then '司机批量签收' + when sign_type = 1 then '文员批量签收' end sign_type, + case + when load_type = 2 then '按件装车' + when load_type = 3 then '按订单装车' + when load_type = 4 then '一键装车' + when load_type = 5 then '补录装车' end loading_mode, + brand_name brand, + review_user_name examine_user_name, + case + when plan_reservation_code = sign_reservation_code then '否' + when plan_reservation_code != sign_reservation_code then '是' + else '' end abnormal_signing + from logpm_quality_deliver + order by id desc + ) t ${ew.customSqlSegment} + select id, @@ -837,6 +905,11 @@ ) t +