diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 1f6ec2c34..f0a763a7d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -2027,6 +2027,8 @@ ldpl.quantity AS retentionQuantity, 1 AS conditions, ldpl.waybill_number AS waybillNumber, + ldpl.material_name AS materialName, + ldpl.material_code AS materialNumber, ldpl.waybill_id AS waybillId, ldpl.order_package_status AS orderPackageStatus, ldpl.warehouse_id AS warehouseId, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 7d57ee7fa..d8b12076e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -6009,6 +6009,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl - select * from logpm_warehouse_retention_scan where is_deleted = 0 + select * from logpm_warehouse_retention_scan where is_deleted = 0 ORDER BY create_time DESC