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;
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index a1671ff64..48dab7273 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -57,11 +57,12 @@
lawo.work_order_type,
lawo.discovery_node,
lawo.work_order_number,
- lawo.waybill_number,
+ laap.waybill_number,
lawo.order_code,
lawo.train_number,
- lawo.FIRST,
- lawo.secondary,
+ GROUP_CONCAT(laap.`first` separator ',') as `first`,
+ GROUP_CONCAT(laap.secondary separator ',') as secondary,
+ group_concat( DISTINCT laap.brand_name SEPARATOR ',' ) AS brandName,
lawo.vehicle_route,
lawo.deliver_goods_time,
lawo.discovery_time,
@@ -84,7 +85,6 @@
lawo.process_number,
lawo.customer_service_name customerServiceName,
lawo.warehouse_id warehouseId,
- lawo.brand_name brandName,
lawo.customer_service_id customerServiceId
FROM
logpm_aftersales_work_order lawo
@@ -93,6 +93,7 @@
AND lap.conditions IN ( 1, 2 )
LEFT JOIN logpm_aftersales_completion_record lacr ON lacr.work_order_id = lawo.id
AND lacr.is_deleted = '0'
+ left join logpm_aftersales_abnormal_package laap on lawo.id = laap.work_order_id
lawo.is_deleted = 0
and lawo.work_order_status = #{param.workOrderStatusNameS }
@@ -156,9 +157,10 @@
and lawo.vehicle_route like concat('%', #{param.vehicleRoute },'%')
and lawo.work_order_status in ( #{param.workOrderStatus })
and lawo.work_order_status in ('10')
- ORDER BY lawo.create_time DESC
-
+
+ group by lawo.id
+ ORDER BY lawo.create_time DESC
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}