From a38e0693fb925a1ee396af91b6845f160eef3532 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sun, 17 Mar 2024 01:18:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A4=87=E8=B4=A7=E8=AF=A6=E6=83=85=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=93=81=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IDistributionStockListClient.java | 3 ++ .../IDistributionStockListInfoClient.java | 4 ++ .../vo/DistributionStockupVO.java | 1 + .../feign/IWarehouseUpdownTypeClient.java | 3 ++ .../feign/DistributionStockListClient.java | 5 ++ .../DistributionStockListInfoClient.java | 8 +++ .../DistributionStockListInfoMapper.java | 2 +- .../DistributionStockListInfoMapper.xml | 10 ++++ .../mapper/DistributionStockListMapper.java | 2 + .../mapper/DistributionStockListMapper.xml | 10 ++++ .../mapper/DistributionStockupMapper.xml | 53 +++++++++---------- .../IDistributionStockListInfoService.java | 4 +- .../IDistributionStockListService.java | 2 + .../DistributionStockListInfoServiceImpl.java | 5 ++ .../DistributionStockListServiceImpl.java | 5 ++ .../impl/DistributionStockupServiceImpl.java | 14 ++++- .../feign/WarehouseUpdownTypeClient.java | 5 ++ .../mapper/WarehouseUpdownGoodsMapper.java | 4 ++ .../mapper/WarehouseUpdownGoodsMapper.xml | 21 ++++++++ .../service/IWarehouseUpdownGoodsService.java | 4 ++ .../service/IWarehouseUpdownTypeService.java | 2 + .../impl/WarehouseUpdownGoodsServiceImpl.java | 10 ++++ .../impl/WarehouseUpdownTypeServiceImpl.java | 17 ++++++ 23 files changed, 164 insertions(+), 30 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java index c5846b971..1998a5498 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java @@ -130,4 +130,7 @@ public interface IDistributionStockListClient { @GetMapping(API_PREFIX+"/updeteSourceTypeById") void updeteSourceTypeById(@RequestParam String sourceType, @RequestParam Long stockListId); + + @GetMapping(API_PREFIX+"/getListByMarketIdAndSku") + List getListByMarketIdAndSku(@RequestParam Long mallId, @RequestParam String sku, @RequestParam Long warehouseId); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListInfoClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListInfoClient.java index 883a71487..9c76902b6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListInfoClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListInfoClient.java @@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 库存品明细 Feign接口类 * @@ -57,4 +59,6 @@ public interface IDistributionStockListInfoClient { @PostMapping(ADDSTOCKLISTINFOENTITY) boolean addStockListInfoEntity(@RequestBody DistributionStockListInfoEntity distributionStockListInfo); + @GetMapping(API_PREFIX + "/getAllOrderPackageCodes") + List getAllOrderPackageCodes(@RequestParam String incomingBatch, @RequestParam String sku, @RequestParam Long mallId, @RequestParam Long warehouseId); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java index aa4bd36b0..2cdecbcf4 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java @@ -66,6 +66,7 @@ public class DistributionStockupVO extends DistributionStockupEntity { private String deliveryAddress; private String deliveryPhone; private String mallName; + private Long mallId; private String stockArticleId; private String orderCode; //订单自编号 private String descriptionGoods; diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java index 545dea1b9..5761d863b 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java @@ -75,4 +75,7 @@ public interface IWarehouseUpdownTypeClient { R findAllGoodsByAllocationId(@RequestParam Long allocationId, @RequestParam Long warehouseId); @GetMapping(TOP + "/findZeroAllocation") List findZeroAllocation(@RequestParam String orderCode, @RequestParam Long warehouseId); + + @GetMapping(API_PREFIX+"/findStockListAllocations") + String findStockListAllocations(@RequestParam Long warehouseId, @RequestParam Long mallId, @RequestParam String sku); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java index 06b7328c6..b93cf236d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java @@ -199,4 +199,9 @@ public class DistributionStockListClient implements IDistributionStockListClient public void updeteSourceTypeById(String sourceType, Long stockListId) { distributionStockListService.updeteSourceTypeById(sourceType,stockListId); } + + @Override + public List getListByMarketIdAndSku(Long mallId, String sku, Long warehouseId) { + return distributionStockListService.getListByMarketIdAndSku(mallId,sku,warehouseId); + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListInfoClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListInfoClient.java index e0f811056..cb93656d4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListInfoClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListInfoClient.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.feign; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.entity.DistributionStockListInfoEntity; import com.logpm.distribution.service.IDistributionStockListInfoService; @@ -28,6 +29,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.List; + /** * 库存品明细 Feign实现类 * @@ -57,4 +60,9 @@ public class DistributionStockListInfoClient implements IDistributionStockListIn return distributionStockListInfoService.save(distributionStockListInfo); } + @Override + public List getAllOrderPackageCodes(String incomingBatch, String sku, Long mallId, Long warehouseId) { + return distributionStockListInfoService.getAllOrderPackageCodes(incomingBatch,sku,mallId,warehouseId); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.java index fb53eb126..c13502730 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.java @@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.entity.DistributionStockListInfoEntity; -import com.logpm.distribution.excel.DistributionStockListInfoExcel; import com.logpm.distribution.vo.DistributionStockListInfoVO; import org.apache.ibatis.annotations.Param; @@ -57,4 +56,5 @@ public interface DistributionStockListInfoMapper extends BaseMapper getStockListInfo(IPage page,@Param("par") Map distributionStockListInfo); + List getAllOrderPackageCodes(@Param("incomingBatch") String incomingBatch, @Param("sku") String sku, @Param("mallId") Long mallId, @Param("warehouseId") Long warehouseId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml index ce9678bca..6b47f77ee 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml @@ -105,4 +105,14 @@ warehouse_id=#{par.warehouseId} AND is_deleted = 0 ) OR (stock_list_id =#{par.stockListId} AND is_deleted = 0) + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java index 41fcf1452..514488ca4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java @@ -154,4 +154,6 @@ public interface DistributionStockListMapper extends BaseMapper selectMerchantNotHaveDataStockListInfo(@Param("stockListId")Long id); IPage listAllocationOrder(IPage page, @Param("param") DistributionStockListEntity distributionStockListEntity); + + List getListByMarketIdAndSku(@Param("mallId")Long mallId, @Param("sku")String sku, @Param("warehouseId")Long warehouseId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 04dfc1663..a1697f7f5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -592,4 +592,14 @@ UPDATE logpm_distribution_stock_list SET quantity_occupied = (quantity_occupied - #{num}) WHERE id = #{stockListId} + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index bca20f3a3..4ffedc255 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -866,7 +866,8 @@ from logpm_distribution_reservation_package ldrp LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id where ldrp.reservation_id = ldsi.reservation_id - ) goodsAllocation,ldr.stockup_status stockStatus, + ) goodsAllocation, + ldr.stockup_status stockStatus, ldr.reservation_num reservationNum, ldr.reservation_stock_list_num reservationStockListNum from logpm_distribution_reservation ldr @@ -910,33 +911,31 @@ + + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java index cbf908562..88af6a62d 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java @@ -150,4 +150,8 @@ public interface IWarehouseUpdownGoodsService extends BaseService findStockOrderDetailList(Long allocationId, Long warehouseId); List orderUpshelfDetailByAllocationId(String orderCode, Long allocationId, Long warehouseId); + + List getAllocationsByOrderPackages(List orderPackageOrders, Long warehouseId); + + List getAllocationsByWarehouseIdAndMarketIdAndSku(Long mallId, String sku, Long warehouseId); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java index 213e9934c..e23a2031b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java @@ -88,4 +88,6 @@ public interface IWarehouseUpdownTypeService extends BaseService orderUpshelfDetailByAllocationId(String orderCode, Long allocationId, Long warehouseId); + + String findStockListAllocations(Long warehouseId, Long mallId, String sku); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java index af9d5a2d7..58b020cbf 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java @@ -263,4 +263,14 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl getAllocationsByOrderPackages(List orderPackageOrders, Long warehouseId) { + return baseMapper.getAllocationsByOrderPackages(orderPackageOrders,warehouseId); + } + + @Override + public List getAllocationsByWarehouseIdAndMarketIdAndSku(Long mallId, String sku, Long warehouseId) { + return baseMapper.getAllocationsByWarehouseIdAndMarketIdAndSku(mallId,sku,warehouseId); + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index a9b29c915..f9c9b77b6 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -10,6 +10,7 @@ import com.logpm.distribution.entity.DistributionStockListEntity; import com.logpm.distribution.feign.IDistributionParcelListClient; import com.logpm.distribution.feign.IDistributionStockArticleClient; import com.logpm.distribution.feign.IDistributionStockListClient; +import com.logpm.distribution.feign.IDistributionStockListInfoClient; import com.logpm.warehouse.bean.Resp; import com.logpm.warehouse.dto.*; import com.logpm.warehouse.entity.*; @@ -51,6 +52,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl orderPackageCodes) { @@ -157,6 +159,21 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl stockListEntityList = distributionStockListClient.getListByMarketIdAndSku(mallId, sku, warehouseId); + Set allocations = new HashSet<>(); + for (DistributionStockListEntity stockListEntity : stockListEntityList) { + String incomingBatch = stockListEntity.getIncomingBatch(); + List orderPackageOrders = distributionStockListInfoClient.getAllOrderPackageCodes(incomingBatch,sku,mallId,warehouseId); + allocations.addAll(warehouseUpdownGoodsService.getAllocationsByOrderPackages(orderPackageOrders,warehouseId)); + } + + allocations.addAll(warehouseUpdownGoodsService.getAllocationsByWarehouseIdAndMarketIdAndSku(mallId,sku,warehouseId)); + + return String.join(",",allocations); + } + private void packageChangeStockByAllocaton(WarehouseUpdownGoodsEntity one) { //当前登录人选择的仓库