diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 12372b524..a450b8465 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -463,6 +463,7 @@ INNER JOIN logpm_distribution_reservation AS ldr ON ldr.id = lds.reservation_id ldr.reservation_status != '40' + AND ldr.is_deleted = 0 and lddl.id = #{id} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.java index 045b4ddd7..14fdf8efd 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.java @@ -287,4 +287,11 @@ public interface WarehouseIndexMapper { * @return */ String findBillLadingPlanNumByDay(@Param("param")IndexDTO indexDTO); + + /** + *查询当月自提计划数 + * @param indexDTO + * @return + */ + String findBillLadingPlanNumByMonth(@Param("param")IndexDTO indexDTO); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml index 2c2a9f932..a5c690343 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml @@ -887,6 +887,22 @@ +