|
@@ -171,6 +171,9 @@ public class StockInventoryManagerImpl extends ServiceImpl<StockInventoryMapper,
|
|
|
stockInventory.setStatus(DamageinventoryEnum.HAS_HANDLE);
|
|
|
updateById(stockInventory);
|
|
|
List<StockInventoryProduct> goodsList = this.stockInventoryProductManager.list(id);
|
|
|
+ if (CollUtil.isEmpty(goodsList)){
|
|
|
+ throw new ServiceException("未录入任何商品");
|
|
|
+ }
|
|
|
List<Long> collect = goodsList.stream().map(StockInventoryProduct::getProductId).collect(Collectors.toList());
|
|
|
List<ProductStockDO> list = productStockManager.list(new LambdaQueryWrapper<ProductStockDO>()
|
|
|
.eq(ProductStockDO::getWarehouseId, stockInventory.getWarehouseId())
|
|
@@ -224,28 +227,32 @@ public class StockInventoryManagerImpl extends ServiceImpl<StockInventoryMapper,
|
|
|
StockInventoryVO stockInventoryVO = BeanUtil.copyProperties(stockInventory, StockInventoryVO.class);
|
|
|
//获取库存盘点单商品信息
|
|
|
List<StockInventoryProduct> goodsList = this.stockInventoryProductManager.list(id);
|
|
|
- List<Long> collect = goodsList.stream().map(StockInventoryProduct::getProductId).collect(Collectors.toList());
|
|
|
- List<ProductStockDO> page = productStockManager.list(new LambdaQueryWrapper<ProductStockDO>()
|
|
|
- .eq(ProductStockDO::getWarehouseId, stockInventory.getWarehouseId())
|
|
|
- .in(ProductStockDO::getProductId, collect));
|
|
|
- List<StockInventoryProductDTO> beanList = BeanUtils.toBean(goodsList, StockInventoryProductDTO.class);
|
|
|
- for (StockInventoryProductDTO dto : beanList) {
|
|
|
- ProductStockDO aDo = page.stream().filter(item -> item.getProductId().equals(dto.getProductId())).findFirst().get();
|
|
|
- ProductVO productVO = BeanUtil.copyProperties(productManager.getById(dto.getProductId()), ProductVO.class);
|
|
|
- dto.setProductVO(productVO);
|
|
|
- GoodsVO goodsVO = BeanUtil.copyProperties(goodsManager.getById(productVO.getGoodsId()), GoodsVO.class);
|
|
|
- dto.setUsableStock(aDo.getUsableStock());
|
|
|
- dto.setActualStock(aDo.getActualStock());
|
|
|
- List<ItemSnCodeDO> list2 = itemSnCodeManager.list(new LambdaQueryWrapper<ItemSnCodeDO>().eq(ItemSnCodeDO::getItemId, dto.getId()));
|
|
|
- if (CollUtil.isNotEmpty(list2)) {
|
|
|
- List<Long> collected = list2.stream().map(ItemSnCodeDO::getSnCodeId).collect(Collectors.toList());
|
|
|
- dto.setSnCodeList(goodsSnManager.list(new LambdaQueryWrapper<GoodsSnDO>().in(GoodsSnDO::getId, collected)));
|
|
|
+ if (CollUtil.isNotEmpty(goodsList)) {
|
|
|
+
|
|
|
+ List<Long> collect = goodsList.stream().map(StockInventoryProduct::getProductId).collect(Collectors.toList());
|
|
|
+ List<ProductStockDO> page = productStockManager.list(new LambdaQueryWrapper<ProductStockDO>()
|
|
|
+ .eq(ProductStockDO::getWarehouseId, stockInventory.getWarehouseId())
|
|
|
+ .in(ProductStockDO::getProductId, collect));
|
|
|
+ List<StockInventoryProductDTO> beanList = BeanUtils.toBean(goodsList, StockInventoryProductDTO.class);
|
|
|
+ for (StockInventoryProductDTO dto : beanList) {
|
|
|
+ ProductStockDO aDo = page.stream().filter(item -> item.getProductId().equals(dto.getProductId())).findFirst().get();
|
|
|
+ ProductVO productVO = BeanUtil.copyProperties(productManager.getById(dto.getProductId()), ProductVO.class);
|
|
|
+ dto.setProductVO(productVO);
|
|
|
+ GoodsVO goodsVO = BeanUtil.copyProperties(goodsManager.getById(productVO.getGoodsId()), GoodsVO.class);
|
|
|
+ dto.setUsableStock(aDo.getUsableStock());
|
|
|
+ dto.setActualStock(aDo.getActualStock());
|
|
|
+ List<ItemSnCodeDO> list2 = itemSnCodeManager.list(new LambdaQueryWrapper<ItemSnCodeDO>().eq(ItemSnCodeDO::getItemId, dto.getId()));
|
|
|
+ if (CollUtil.isNotEmpty(list2)) {
|
|
|
+ List<Long> collected = list2.stream().map(ItemSnCodeDO::getSnCodeId).collect(Collectors.toList());
|
|
|
+ dto.setSnCodeList(goodsSnManager.list(new LambdaQueryWrapper<GoodsSnDO>().in(GoodsSnDO::getId, collected)));
|
|
|
+ }
|
|
|
+ List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, dto.getProductStockId()));
|
|
|
+ dto.setAreaStockList(areaStockList);
|
|
|
+ dto.setGoodsId(productVO.getGoodsId());
|
|
|
+ dto.setGoodsVO(goodsVO);
|
|
|
}
|
|
|
- List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, dto.getProductStockId()));
|
|
|
- dto.setAreaStockList(areaStockList);
|
|
|
- dto.setGoodsVO(goodsVO);
|
|
|
+ stockInventoryVO.setProductList(beanList);
|
|
|
}
|
|
|
- stockInventoryVO.setProductList(beanList);
|
|
|
return stockInventoryVO;
|
|
|
}
|
|
|
|
|
@@ -268,7 +275,6 @@ public class StockInventoryManagerImpl extends ServiceImpl<StockInventoryMapper,
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 库存盘点单提交审核
|
|
|
*
|