|
@@ -175,7 +175,7 @@ public class WarehouseOutManagerImpl extends BaseServiceImpl<WarehouseOutMapper,
|
|
throw new ServiceException("未找到冻结记录");
|
|
throw new ServiceException("未找到冻结记录");
|
|
}
|
|
}
|
|
one.setUnLockedTime(new Date());
|
|
one.setUnLockedTime(new Date());
|
|
- if (one.getLockedNum() == (aDo.getOutNum()+one.getUnLockedNum())){
|
|
|
|
|
|
+ if (one.getLockedNum() == (aDo.getOutNum() + one.getUnLockedNum())) {
|
|
one.setStatus(true);
|
|
one.setStatus(true);
|
|
}
|
|
}
|
|
one.setUnLockedNum(one.getUnLockedNum() + aDo.getOutNum());
|
|
one.setUnLockedNum(one.getUnLockedNum() + aDo.getOutNum());
|
|
@@ -417,7 +417,7 @@ public class WarehouseOutManagerImpl extends BaseServiceImpl<WarehouseOutMapper,
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Page<ProductStockVO> getGoodByWarehouse(Long warehouseId, BaseQueryParam queryParam, String orderType, List<Long> warehouseIds) {
|
|
|
|
|
|
+ public Page<ProductStockVO> getGoodByWarehouse(Long warehouseId, BaseQueryParam queryParam, String orderType, List<Long> warehouseIds, String keyWord) {
|
|
//找出所有上架的商品
|
|
//找出所有上架的商品
|
|
LambdaQueryWrapper<GoodsDO> wrapper = new LambdaQueryWrapper<GoodsDO>().eq(GoodsDO::getMarketEnable, true);
|
|
LambdaQueryWrapper<GoodsDO> wrapper = new LambdaQueryWrapper<GoodsDO>().eq(GoodsDO::getMarketEnable, true);
|
|
|
|
|
|
@@ -443,6 +443,12 @@ public class WarehouseOutManagerImpl extends BaseServiceImpl<WarehouseOutMapper,
|
|
.eq(ObjectUtil.isNotNull(warehouseId), ProductStockDO::getWarehouseId, warehouseId)
|
|
.eq(ObjectUtil.isNotNull(warehouseId), ProductStockDO::getWarehouseId, warehouseId)
|
|
.in(CollUtil.isNotEmpty(warehouseIds), ProductStockDO::getWarehouseId, warehouseIds)
|
|
.in(CollUtil.isNotEmpty(warehouseIds), ProductStockDO::getWarehouseId, warehouseIds)
|
|
.in(ProductStockDO::getGoodsId, goodsId)
|
|
.in(ProductStockDO::getGoodsId, goodsId)
|
|
|
|
+ .and(StrUtil.isNotBlank(keyWord), wa -> wa
|
|
|
|
+ .like(ProductStockDO::getGoodsName, keyWord)
|
|
|
|
+ .or()
|
|
|
|
+ .like(ProductStockDO::getGoodsBarCode, keyWord)
|
|
|
|
+ .or()
|
|
|
|
+ .like(ProductStockDO::getGoodsSnCode, keyWord))
|
|
.gt(ProductStockDO::getUsableStock, 0));
|
|
.gt(ProductStockDO::getUsableStock, 0));
|
|
Page<ProductStockVO> convert = productStockConverter.convert(page1);
|
|
Page<ProductStockVO> convert = productStockConverter.convert(page1);
|
|
for (ProductStockVO record : convert.getRecords()) {
|
|
for (ProductStockVO record : convert.getRecords()) {
|
|
@@ -457,13 +463,19 @@ public class WarehouseOutManagerImpl extends BaseServiceImpl<WarehouseOutMapper,
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public IPage<ProductStockVO> getGoodByWarehouseInventory(Long warehouseId, BaseQueryParam queryParam) {
|
|
|
|
|
|
+ public IPage<ProductStockVO> getGoodByWarehouseInventory(Long warehouseId, BaseQueryParam queryParam, String keyWord) {
|
|
//找出所有上架的商品
|
|
//找出所有上架的商品
|
|
List<GoodsDO> list = goodsMapper.selectList(new LambdaQueryWrapper<GoodsDO>().eq(GoodsDO::getMarketEnable, true));
|
|
List<GoodsDO> list = goodsMapper.selectList(new LambdaQueryWrapper<GoodsDO>().eq(GoodsDO::getMarketEnable, true));
|
|
List<Long> goodsId = list.stream().map(GoodsDO::getId).collect(Collectors.toList());
|
|
List<Long> goodsId = list.stream().map(GoodsDO::getId).collect(Collectors.toList());
|
|
//找到所有的商品
|
|
//找到所有的商品
|
|
Page<ProductStockDO> page = productStockManager.page(new Page<>(queryParam.getPageNo(), queryParam.getPageSize()), new LambdaQueryWrapper<ProductStockDO>()
|
|
Page<ProductStockDO> page = productStockManager.page(new Page<>(queryParam.getPageNo(), queryParam.getPageSize()), new LambdaQueryWrapper<ProductStockDO>()
|
|
- .eq(ProductStockDO::getWarehouseId, warehouseId).in(ProductStockDO::getGoodsId, goodsId));
|
|
|
|
|
|
+ .eq(ProductStockDO::getWarehouseId, warehouseId).in(ProductStockDO::getGoodsId, goodsId)
|
|
|
|
+ .and(StrUtil.isNotBlank(keyWord), wa -> wa
|
|
|
|
+ .like(ProductStockDO::getGoodsName, keyWord)
|
|
|
|
+ .or()
|
|
|
|
+ .like(ProductStockDO::getGoodsBarCode, keyWord)
|
|
|
|
+ .or()
|
|
|
|
+ .like(ProductStockDO::getGoodsSnCode, keyWord)));
|
|
Page<ProductStockVO> convert = productStockConverter.convert(page);
|
|
Page<ProductStockVO> convert = productStockConverter.convert(page);
|
|
for (ProductStockVO record : convert.getRecords()) {
|
|
for (ProductStockVO record : convert.getRecords()) {
|
|
record.setGoodsVO(BeanUtil.copyProperties(goodsMapper.selectById(record.getGoodsId()), GoodsVO.class));
|
|
record.setGoodsVO(BeanUtil.copyProperties(goodsMapper.selectById(record.getGoodsId()), GoodsVO.class));
|
|
@@ -474,9 +486,15 @@ public class WarehouseOutManagerImpl extends BaseServiceImpl<WarehouseOutMapper,
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public IPage<LockedStockDetailDO>
|
|
|
|
- getLockedStock(BaseQueryParam queryParam) {
|
|
|
|
- Page<LockedStockDetailDO> page = lockedStockDetailManager.page(new Page<>(queryParam.getPageNo(), queryParam.getPageSize()));
|
|
|
|
|
|
+ public IPage<LockedStockDetailDO> getLockedStock(LockedStockParams queryParam) {
|
|
|
|
+ LambdaQueryWrapper<LockedStockDetailDO> wrapper = new LambdaQueryWrapper<LockedStockDetailDO>().eq(ObjectUtil.isNotNull(queryParam.getStatus()), LockedStockDetailDO::getStatus, queryParam.getStatus());
|
|
|
|
+ if (ObjectUtil.isNotNull(queryParam.getStartTime()) && ObjectUtil.isNotNull(queryParam.getEndTime())) {
|
|
|
|
+ wrapper.between(LockedStockDetailDO::getLockedTime, new Date(queryParam.getStartTime()), new Date(queryParam.getEndTime()));
|
|
|
|
+ }
|
|
|
|
+ Page<LockedStockDetailDO> page = lockedStockDetailManager.page(new Page<>(queryParam.getPageNo(), queryParam.getPageSize()), wrapper);
|
|
|
|
+ if (queryParam.getStartTime() != null) {
|
|
|
|
+ System.out.println(new Date(queryParam.getStartTime()));
|
|
|
|
+ }
|
|
for (LockedStockDetailDO record : page.getRecords()) {
|
|
for (LockedStockDetailDO record : page.getRecords()) {
|
|
ProductStockDO byId = productStockManager.getById(record.getProductStockId());
|
|
ProductStockDO byId = productStockManager.getById(record.getProductStockId());
|
|
record.setGoodsVO(goodsMapper.selectById(byId.getGoodsId()));
|
|
record.setGoodsVO(goodsMapper.selectById(byId.getGoodsId()));
|