diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 2ba651f41..2b5c82d2e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -90,7 +90,7 @@ lds.loaded_number loadedNub, lds.loadedin_number inventoryNub, lds.reservation_id reservationId, - lds.received_quantity receivedQuantity, + (lds.received_quantity + lds.receivedin_quantity) receivedQuantity, lds.is_have_abnormal_package isHaveAbnormalPackage, lds.signee_name signeeName, CASE @@ -652,7 +652,7 @@ FROM lds.loaded_number loadedNub, lds.loadedin_number inventoryNub, lds.reservation_id reservationId, - lds.received_quantity receivedQuantity, + (lds.received_quantity + lds.receivedin_quantity) receivedQuantity, lds.is_have_abnormal_package isHaveAbnormalPackage, lds.signee_name signeeName, (SELECT 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 96ddc6826..6e8f6b11f 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 @@ -5352,7 +5352,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl