diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.java index 98e4c5370..43e87f851 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.java @@ -82,4 +82,12 @@ public interface WarehouseUpdownStockupAreaMapper extends BaseMapper> selectStockUpAreaStockList(@Param("warehouseId")Long warehouseId,@Param("allocationId") Long allocationId); + + /** + * + * @param warehouseId + * @param allocationId + * @return + */ + List> selectStockUpAreaZeroStockArticle(@Param("warehouseId")Long warehouseId,@Param("allocationId") Long allocationId ); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml index 8ee43e3f8..423485a7d 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml @@ -135,6 +135,22 @@ GROUP BY lwusa.incoming_batch + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java index e901d53bb..1b39496a9 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java @@ -365,6 +365,12 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl> inventoryMap = baseMapper.selectStockUpAreaStockList(warehouseId,allocationId); maps.addAll(inventoryMap); } + //查询无数据零担订单信息 + List notSourceOrderData = warehouseUpdownStockupAreaEntities.stream().filter(f -> "2".equals(f.getGoodsType())&& "1".equals(f.getAssociationType())).collect(Collectors.toList()); + if (Func.isNotEmpty(notSourceOrderData)){ + List> zeroStockArticleMap = baseMapper.selectStockUpAreaZeroStockArticle(warehouseId,allocationId); + maps.addAll(zeroStockArticleMap); + } } return R.data(maps); }