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 4f2d2ef53..45f7ddfbe 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 @@ -84,10 +84,10 @@ GROUP BY lds.delivery_id) rsln ON rsln.delivery_id = d.id left join (select t.delivery_id, - SUM(t.loaded_nub) loadedNum, - sum(t.received_quantity) reNum, - sum(t.is_abnormal_loading) exLoadedNum, - sum(t.is_abnormal_signing) exReNum + 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 group by t.delivery_id) loadScan on loadScan.delivery_id = d.id @@ -268,37 +268,37 @@ auditing_status, auditing_user, auditing_time - from (SELECT drp.reservation_id id, - lddl.train_number train_number, - obj.reservation_code reservation_code, - obj.reservation_date task_time, - dpl.warehouse warehouse_name, + from (SELECT drp.reservation_id id, + lddl.train_number train_number, + obj.reservation_code reservation_code, + obj.reservation_date task_time, + dpl.warehouse warehouse_name, CASE WHEN obj.delivery_type = 1 THEN '商配' WHEN obj.delivery_type = 2 THEN '市配' - END type, + END type, CASE WHEN lddl.kind = 1 THEN '自主配送' WHEN lddl.kind = 2 THEN '自主配送' ELSE '' - END kind, - lddl.vehicle_name vehicle_name, - lddl.driver_name driver_name, - lddl.distribution_company distribution_company, - ldsa.customer_name dr_consignee, - ldsa.customer_telephone delivery_phone, - ldsa.customer_address delivery_address, - wi.consignee consignee, - wi.consignee_name consignee_name, - wi.consignee_mobile consignee_mobile, - dpl.waybill_number waybill_no, - dpl.order_code stock_article_id, - dpl.order_package_code order_package_code, - dpl.train_number customer_train, + END kind, + lddl.vehicle_name vehicle_name, + lddl.driver_name driver_name, + lddl.distribution_company distribution_company, + ldsa.customer_name dr_consignee, + ldsa.customer_telephone delivery_phone, + ldsa.customer_address delivery_address, + wi.consignee consignee, + wi.consignee_name consignee_name, + wi.consignee_mobile consignee_mobile, + dpl.waybill_number waybill_no, + dpl.order_code stock_article_id, + dpl.order_package_code order_package_code, + dpl.train_number customer_train, CASE WHEN dpl.conditions = 1 THEN @@ -308,48 +308,48 @@ WHEN dpl.conditions = 3 THEN '零担' ELSE '' - END conditions, + END conditions, dpl.firsts, - dpl.SECOND decond, - dpl.third_product third_product, - dpl.material_code material_code, - dpl.material_name material_name, - dpl.send_warehouse_name start_war, - '' start_war_in_time, - '' start_war_out_time, + dpl.SECOND decond, + dpl.third_product third_product, + dpl.material_code material_code, + dpl.material_name material_name, + dpl.send_warehouse_name start_war, + '' start_war_in_time, + '' start_war_out_time, ifnull(dpl.warehouse_entry_time_end, dpl.create_time) warehouse_entry_time_end, CASE WHEN lds.driver_signing = 1 THEN '未签收' WHEN lds.driver_signing = 2 THEN '已签收' - END driver_signing, - ldl.scan_time unload_time, - ldl.scan_user un_administrators_name, + END driver_signing, + ldl.scan_time unload_time, + ldl.scan_user un_administrators_name, - lds.sjsigning_time sjsigning_time, - lds.signee_name lds_signee_name, + lds.sjsigning_time sjsigning_time, + lds.signee_name lds_signee_name, CASE WHEN lds.signing_status = 1 THEN '未签收' WHEN lds.signing_status = 2 THEN '已签收' - END signing_status, - lds.signing_time signing_time, - lds.examine_user_name examine_user_name, + END signing_status, + lds.signing_time signing_time, + lds.examine_user_name examine_user_name, CASE WHEN ldl.is_abnormal_signing = 1 THEN '否' WHEN ldl.is_abnormal_signing = 2 THEN '是' - END abnormal_signing, + END abnormal_signing, CASE WHEN ldl.is_abnormal_loading = 1 THEN '否' WHEN ldl.is_abnormal_loading = 2 THEN '是' - END abnormal_loading, + END abnormal_loading, CASE WHEN ldla.auditing_status = 3 THEN '异常' @@ -357,9 +357,9 @@ '未审核' WHEN ldla.auditing_status = 2 THEN '已审核' - END auditing_status, - ldla.auditing_user auditing_user, - ldla.auditing_time auditing_time + END auditing_status, + ldla.auditing_user auditing_user, + ldla.auditing_time auditing_time FROM logpm_distribution_reservation_package drp LEFT JOIN logpm_distribution_parcel_list dpl ON dpl.id = drp.parce_list_id @@ -435,37 +435,37 @@ auditing_user, auditing_time from ( - SELECT drp.reservation_id id, - lddl.train_number train_number, - obj.reservation_code reservation_code, - obj.reservation_date task_time, - dpl.warehouse warehouse_name, + SELECT drp.reservation_id id, + lddl.train_number train_number, + obj.reservation_code reservation_code, + obj.reservation_date task_time, + dpl.warehouse warehouse_name, CASE WHEN obj.delivery_type = 1 THEN '商配' WHEN obj.delivery_type = 2 THEN '市配' - END type, + END type, CASE WHEN lddl.kind = 1 THEN '自主配送' WHEN lddl.kind = 2 THEN '自主配送' ELSE '' - END kind, - lddl.vehicle_name vehicle_name, - lddl.driver_name driver_name, - lddl.distribution_company distribution_company, - ldsa.customer_name dr_consignee, - ldsa.customer_telephone delivery_phone, - ldsa.customer_address delivery_address, - wi.consignee consignee, - wi.consignee_name consignee_name, - wi.consignee_mobile consignee_mobile, - dpl.waybill_number waybill_no, - dpl.order_code stock_article_id, - dpl.order_package_code order_package_code, - dpl.train_number customer_train, + END kind, + lddl.vehicle_name vehicle_name, + lddl.driver_name driver_name, + lddl.distribution_company distribution_company, + ldsa.customer_name dr_consignee, + ldsa.customer_telephone delivery_phone, + ldsa.customer_address delivery_address, + wi.consignee consignee, + wi.consignee_name consignee_name, + wi.consignee_mobile consignee_mobile, + dpl.waybill_number waybill_no, + dpl.order_code stock_article_id, + dpl.order_package_code order_package_code, + dpl.train_number customer_train, CASE WHEN dpl.conditions = 1 THEN @@ -475,48 +475,48 @@ WHEN dpl.conditions = 3 THEN '零担' ELSE '' - END conditions, + END conditions, dpl.firsts, - dpl.SECOND decond, - dpl.third_product third_product, - dpl.material_code material_code, - dpl.material_name material_name, - dpl.send_warehouse_name start_war, - '' start_war_in_time, - '' start_war_out_time, + dpl.SECOND decond, + dpl.third_product third_product, + dpl.material_code material_code, + dpl.material_name material_name, + dpl.send_warehouse_name start_war, + '' start_war_in_time, + '' start_war_out_time, ifnull(dpl.warehouse_entry_time_end, dpl.create_time) warehouse_entry_time_end, CASE WHEN lds.driver_signing = 1 THEN '未签收' WHEN lds.driver_signing = 2 THEN '已签收' - END driver_signing, - ldl.scan_time unload_time, - ldl.scan_user un_administrators_name, + END driver_signing, + ldl.scan_time unload_time, + ldl.scan_user un_administrators_name, - lds.sjsigning_time sjsigning_time, - lds.signee_name lds_signee_name, + lds.sjsigning_time sjsigning_time, + lds.signee_name lds_signee_name, CASE WHEN lds.signing_status = 1 THEN '未签收' WHEN lds.signing_status = 2 THEN '已签收' - END signing_status, - lds.signing_time signing_time, - lds.examine_user_name examine_user_name, + END signing_status, + lds.signing_time signing_time, + lds.examine_user_name examine_user_name, CASE WHEN ldl.is_abnormal_signing = 1 THEN '否' WHEN ldl.is_abnormal_signing = 2 THEN '是' - END abnormal_signing, + END abnormal_signing, CASE WHEN ldl.is_abnormal_loading = 1 THEN '否' WHEN ldl.is_abnormal_loading = 2 THEN '是' - END abnormal_loading, + END abnormal_loading, CASE WHEN ldla.auditing_status = 3 THEN '异常' @@ -524,9 +524,9 @@ '未审核' WHEN ldla.auditing_status = 2 THEN '已审核' - END auditing_status, - ldla.auditing_user auditing_user, - ldla.auditing_time auditing_time + END auditing_status, + ldla.auditing_user auditing_user, + ldla.auditing_time auditing_time FROM logpm_distribution_reservation_zero_package drp LEFT JOIN logpm_distribution_parcel_list dpl ON dpl.id = drp.parcel_list_id @@ -640,7 +640,7 @@