From c766aaa6472c895525db846b543399397fc34d56 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 7 Apr 2024 18:02:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E9=85=8D=E9=80=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8BUG=E4=BF=AE=E5=A4=8D=E3=80=81=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=96=E6=B6=88=E5=8C=85=E4=BB=B6=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E5=8C=85=E4=BB=B6=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/app/DistributionAppReservationVO.java | 6 + .../feign/IWarehouseTrayGoodsClient.java | 9 ++ .../mapper/DistributionDeliveryInfoMapper.xml | 8 +- .../mapper/DistributionReservationMapper.xml | 2 + .../DistributionDeliveryListServiceImpl.java | 126 ++++-------------- .../feign/WarehouseTrayGoodsClient.java | 11 ++ .../mapper/WarehouseTrayGoodsMapper.java | 8 ++ .../mapper/WarehouseTrayGoodsMapper.xml | 10 ++ .../service/IWarehouseTrayGoodsService.java | 7 + .../impl/WarehouseTrayGoodsServiceImpl.java | 10 ++ 10 files changed, 93 insertions(+), 104 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java index 0b888375e..03511c2e9 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java @@ -53,6 +53,12 @@ public class DistributionAppReservationVO extends DistributionReservationEntity @ApiModelProperty(value = "装车件数") private Integer loadingNub; + /** + * 备货数量 + */ + @ApiModelProperty(value = "备货数量") + private Integer stockupNum; + /** * 签收数 diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java index 31741a40b..88e524d39 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; +import java.util.Map; /** * 托盘 货物 绑定 Feign接口类 @@ -101,4 +102,12 @@ public interface IWarehouseTrayGoodsClient { @GetMapping(API_PREFIX+"/delTrayGoodsById") void delTrayGoodsById(@RequestParam Long trayGoodsId, @RequestParam Long warehouseId); + + /** + * 查询一批包件所在托盘 + * @param map + * @return + */ + @PostMapping(GETTRAYLIST+"/getPackageTrayInfo") + List getPackageTrayInfo(@RequestBody Map map); } 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 eca99ab76..ab317cc83 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 @@ -574,12 +574,12 @@ ) ordNub, COALESCE ( lds.received_quantity + lds.receivedin_quantity, 0 ) signNub, ldsk.stockup_area stockupArea, - (SELECT SUM(reservation_num) FROM logpm_distribution_reservation_stocklist WHERE reservation_id = ldr.id ) inventoryNub --- COUNT(DISTINCT lwtg.tray_id) AS trayNum + (SELECT SUM(reservation_num) FROM logpm_distribution_reservation_stocklist WHERE reservation_id = ldr.id ) inventoryNub, + IFNULL((SELECT SUM(loaded_nub) FROM logpm_distribution_loadscan WHERE reservation_id = lds.reservation_id AND is_abnormal_loading != 2 AND is_deleted = 0 ),0) + IFNULL((SELECT SUM(loaded_nub) FROM logpm_distribution_loadscaninvn WHERE reservation_id = lds.reservation_id AND scan_status != 1 AND is_deleted = 0 ),0) AS loadingNub, + IFNULL((SELECT SUM(stock_quantity) FROM logpm_distribution_stock WHERE reservation_id = lds.reservation_id AND is_deleted = 0 ),0) AS stockupNum FROM logpm_distribution_signfor lds LEFT JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id - AND ldr.reservation_status != '40' LEFT JOIN logpm_distribution_stockup_info ldsi ON ldr.id = ldsi.reservation_id LEFT JOIN logpm_distribution_stockup ldsk ON ldsk.id = ldsi.stockup_id LEFT JOIN logpm_distribution_reservation_stocklist ldrs ON ldrs.reservation_id = ldr.id @@ -587,7 +587,7 @@ FROM LEFT JOIN logpm_distribution_reservation_package AS ldrp ON lds.reservation_id = ldrp.reservation_id LEFT JOIN logpm_warehouse_tray_goods AS lwtg ON lwtg.association_id = ldrp.parce_list_id AND lwtg.association_type = 3 WHERE - lds.delivery_id = #{deliveryListId} and ldr.id is not null + lds.delivery_id = #{deliveryListId} and ldr.id is not null AND ldr.reservation_num + ldr.reservation_stock_list_num > 0 AND ldr.reservation_status != '40' GROUP BY ldr.id,lds.loaded_number,lds.loadedin_number,lds.received_quantity,lds.receivedin_quantity,ldsk.stockup_area,ldrs.reservation_num + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java index 6798df263..16eaf848c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java @@ -8,6 +8,7 @@ import com.logpm.warehouse.vo.*; import org.springblade.core.mp.base.BaseService; import java.util.List; +import java.util.Map; public interface IWarehouseTrayGoodsService extends BaseService { @@ -113,4 +114,10 @@ public interface IWarehouseTrayGoodsService extends BaseService findStockOrderDetailList(String trayCode, Long warehouseId); + /** + * + * @param map + * @return + */ + List getPackageTrayInfo(Map map); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java index 41d6e8010..9cf616cde 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Objects; @Log4j2 @@ -331,6 +332,15 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl getPackageTrayInfo(Map map) { + return baseMapper.getPackageTrayInfo(map); + } + @Override public Boolean deleteByMasterId(Long masterId) { int delete = baseMapper.delete(new QueryWrapper().lambda()