From 699e5dccff102508149fabae8b997288bb72107b Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Mon, 13 May 2024 19:29:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(all):=20=E4=BC=98=E5=8C=96=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/mapper/ReportDeliverMapper.xml | 368 +++++++++--------- 1 file changed, 182 insertions(+), 186 deletions(-) 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 df9dc5c3b..a13e2174d 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 @@ -27,198 +27,194 @@ ss_num, unloading_team_name from (select - d.train_number train_number, - d.task_time task_time, - d.warehouse_name warehouse_name, - CASE - WHEN d.type = 1 THEN - '商配' - WHEN d.type = 2 THEN - '市配' - ELSE '' - END type, - CASE - WHEN d.kind = 1 THEN - '自主配送' - WHEN d.kind = 2 THEN - '自主配送' - ELSE '' - END kind, - d.vehicle_name vehicle_name, - d.driver_name driver_name, - d.distribution_company distribution_company, - CASE - WHEN d.delivery_status = 1 THEN - '待配送' - WHEN d.delivery_status = 2 THEN - '配送中' - WHEN d.delivery_status = 3 THEN - '已完成' - ELSE '' - END delivery_status, - d.customers_number customers_number, - d.price, - d.order_number order_number, - rn.num reservation_num, - rn.stnum reservation_stock_listNum, - IFNULL(loadScan.loadedNum, 0) loaded_num, - IFNULL(loadscaninvn.loadedNum, 0) invn_loaded_num, - IFNULL(loadScan.exLoadedNum, 0) ex_loaded_num, - IFNULL(loadScan.reNum, 0) re_num, - IFNULL(loadscaninvn.reNum, 0) invn_re_num, - IFNULL(loadScan.exReNum, 0) ex_reNum, - ifnull(rn.dsNum, 0) ds_num, - ifnull(rn.ssNum, 0) ss_num, - ifnull(d.unloading_team_name, '') unloading_team_name - from - logpm_distribution_delivery_list d - LEFT JOIN ( - SELECT lds.delivery_id, - COALESCE(sum(ldr1.reservation_num), 0) num, - COALESCE(sum(ldr1.reservation_stock_list_num), 0) stnum, - SUM(CASE - WHEN lds.driver_signing = 2 THEN - 1 - ELSE - 0 - END) dsNum, - SUM(CASE - WHEN lds.signing_status = 2 THEN - 1 - ELSE - 0 - END) ssNum - FROM logpm_distribution_signfor lds - JOIN logpm_distribution_reservation ldr1 ON lds.reservation_id = ldr1.id - WHERE ldr1.reservation_status != '40' - GROUP BY lds.delivery_id order by null - ) rn ON rn.delivery_id = d.id - left join (select t.delivery_id, - SUM(t.loaded_nub) loadedNum, - sum(t.received_quantity) reNum, - sum(if(t.is_abnormal_loading = 1, 0, 1)) exLoadedNum, - sum(if(t.is_abnormal_signing = 1, 0, 1)) exReNum - from logpm_distribution_loadscan t - where t.scan_status != 1 - group by t.delivery_id order by null) loadScan on loadScan.delivery_id = d.id - left join (select t.delivery_id, - SUM(t.loaded_nub) loadedNum, - sum(t.received_quantity) reNum - from logpm_distribution_loadscaninvn t - where t.scan_status != 1 - group by t.delivery_id order by null) loadscaninvn on loadscaninvn.delivery_id = d.id - where d.customers_number != 0) t + d.train_number train_number, + d.task_time task_time, + d.warehouse_name warehouse_name, + CASE + WHEN d.type = 1 THEN + '商配' + WHEN d.type = 2 THEN + '市配' + ELSE '' + END type, + CASE + WHEN d.kind = 1 THEN + '自主配送' + WHEN d.kind = 2 THEN + '自主配送' + ELSE '' + END kind, + d.vehicle_name vehicle_name, + d.driver_name driver_name, + d.distribution_company distribution_company, + CASE + WHEN d.delivery_status = 1 THEN + '待配送' + WHEN d.delivery_status = 2 THEN + '配送中' + WHEN d.delivery_status = 3 THEN + '已完成' + ELSE '' + END delivery_status, + d.customers_number customers_number, + d.price, + d.order_number order_number, + rn.num reservation_num, + rn.stnum reservation_stock_listNum, + IFNULL(loadScan.loadedNum, 0) loaded_num, + IFNULL(loadscaninvn.loadedNum, 0) invn_loaded_num, + IFNULL(loadScan.exLoadedNum, 0) ex_loaded_num, + IFNULL(loadScan.reNum, 0) re_num, + IFNULL(loadscaninvn.reNum, 0) invn_re_num, + IFNULL(loadScan.exReNum, 0) ex_reNum, + ifnull(rn.dsNum, 0) ds_num, + ifnull(rn.ssNum, 0) ss_num, + ifnull(d.unloading_team_name, '') unloading_team_name + from logpm_distribution_delivery_list d + LEFT JOIN (SELECT lds.delivery_id, + COALESCE(sum(ldr1.reservation_num), 0) num, + COALESCE(sum(ldr1.reservation_stock_list_num), 0) stnum, + SUM(CASE + WHEN lds.driver_signing = 2 THEN + 1 + ELSE + 0 + END) dsNum, + SUM(CASE + WHEN lds.signing_status = 2 THEN + 1 + ELSE + 0 + END) ssNum + FROM logpm_distribution_signfor lds + left JOIN logpm_distribution_reservation ldr1 ON lds.reservation_id = ldr1.id + WHERE ldr1.reservation_status '40' + GROUP BY lds.delivery_id + order by null) rn ON rn.delivery_id = d.id + left join (select t.delivery_id, + SUM(t.loaded_nub) loadedNum, + sum(t.received_quantity) reNum, + sum(if(t.is_abnormal_loading = 1, 0, 1)) exLoadedNum, + sum(if(t.is_abnormal_signing = 1, 0, 1)) exReNum + from logpm_distribution_loadscan t + where t.scan_status != 1 + group by t.delivery_id + order by null) loadScan on loadScan.delivery_id = d.id + left join (select t.delivery_id, + SUM(t.loaded_nub) loadedNum, + sum(t.received_quantity) reNum + from logpm_distribution_loadscaninvn t + where t.scan_status != 1 + group by t.delivery_id + order by null) loadscaninvn on loadscaninvn.delivery_id = d.id + where + d.customers_number > 0 + and rn.num > 0) t ${ew.customSqlSegment} From fbc2acfc92d068940e69b605b3571ff4ea5ea5b7 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Tue, 14 May 2024 09:54:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(all):=20=E4=BB=B7=E6=A0=BC=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=E4=BB=93=E5=82=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?90=E5=A4=A9=E4=BB=A5=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BasicdataPriceCategoryWarehouseEntity.java | 4 +++- .../java/com/logpm/basicdata/vo/PriceWarehouseBasicVO.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryWarehouseEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryWarehouseEntity.java index d4002783b..eb171e3ef 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryWarehouseEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryWarehouseEntity.java @@ -60,8 +60,10 @@ public class BasicdataPriceCategoryWarehouseEntity extends TenantEntity { private Double withinThirtyPrice; @ApiModelProperty(value = "30-60天") private Double betweenThirtySixtyPrice; - @ApiModelProperty(value = "60天外") + @ApiModelProperty(value = "60-90天外") private Double beyondSixtyPrice; + @ApiModelProperty(value = "90天外") + private Double beyondNinetyPrice; @ApiModelProperty(value = "上限价格") private Double maximumPrice; @ApiModelProperty(value = "操作/装卸费") diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseBasicVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseBasicVO.java index baccf6292..a360b415e 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseBasicVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseBasicVO.java @@ -38,8 +38,10 @@ public class PriceWarehouseBasicVO implements Serializable { private Double withinThirtyPrice; @ApiModelProperty(value = "30-60天") private Double betweenThirtySixtyPrice; - @ApiModelProperty(value = "60天外") + @ApiModelProperty(value = "60-90天") private Double beyondSixtyPrice; + @ApiModelProperty(value = "90天外") + private Double beyondNinetyPrice; @ApiModelProperty(value = "上限价格") private Double maximumPrice;