diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml index 4a1f1d2d6..7b7c25237 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml @@ -5,6 +5,7 @@ select pickup_batch, warehouse, + warehouse_id, waybill_number, order_code, consigneeUnit, @@ -120,6 +123,7 @@ createdTime from (select obj.pickup_batch, lww.name as warehouse, + lww.id as warehouse_id, ldsa.waybill_number, ldsa.order_code, ldsa.mall_name consigneeUnit, 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 1012644b8..367490493 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 @@ -202,6 +202,7 @@ stock_article_id, task_time, warehouse_name, + warehouse_id, receiving_unit, mall_name, consignee, @@ -231,6 +232,7 @@ stockarticle.code stock_article_id, lddl.task_time task_time, lddl.warehouse_name warehouse_name, + lddl.warehouse_id warehouse_id, obj.receiving_unit receiving_unit, obj.mall_name mall_name, obj.consignee, @@ -307,6 +309,7 @@ reservation_code, task_time, warehouse_name, + warehouse_id, type, kind, vehicle_name, @@ -350,6 +353,7 @@ obj.reservation_code reservation_code, obj.reservation_date task_time, dpl.warehouse warehouse_name, + dpl.warehouse_id warehouse_id, CASE WHEN obj.delivery_type = 1 THEN '商配' @@ -473,6 +477,7 @@ reservation_code, task_time, warehouse_name, + warehouse_id, type, kind, vehicle_name, @@ -517,6 +522,7 @@ obj.reservation_code reservation_code, obj.reservation_date task_time, dpl.warehouse warehouse_name, + dpl.warehouse warehouse_id, CASE WHEN obj.delivery_type = 1 THEN '商配' @@ -645,6 +651,7 @@ mall_name, description_goods, warehouse, + warehouse_id, warehouse_entry_time, warehouse_entry_time_end, store_time, @@ -679,6 +686,7 @@ ldsa.mall_name, ldsa.description_goods, ldsa.warehouse, + ldsa.warehouse_id, ldsa.warehouse_entry_time, ldsa.warehouse_entry_time_end, ldsa.store_time, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapper.xml index 8890989a0..de92a9f3b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapper.xml @@ -3,7 +3,9 @@