diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml index 8e9cf2c81..03b32589c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml @@ -259,7 +259,7 @@ ltad.send_date_str sendDateStr, lddl.train_number deliveryTrainNumber, ldl.scan_time deliveryLoadingTime, - ldl.signing_time deliverySignTime, + IFNULL(ldl.signing_time,ldbls.create_time) deliverySignTime, ltad.warehouse_name importWarehouseName, lta.create_user_name createUserName, lta.create_time createTime, @@ -269,6 +269,7 @@ left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = ltad.order_package_code and ldpl.warehouse_id = ltad.now_warehouse_id left join logpm_distribution_loadscan ldl on ldl.order_package_code = ltad.order_package_code and ldl.scan_status != 1 and ldl.is_deleted = 0 left join logpm_distribution_delivery_list lddl on lddl.id = ldl.delivery_id + LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldpl.id = ldbls.parcel_list_id where 1=1 and ltad.is_deleted = 0