Commit 99ae5185 authored by honghy's avatar honghy Committed by wux

bug162 预装页面,调仓订单数据显示和统计问题

parent 409473d8
......@@ -1128,8 +1128,27 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
//预装,查询的要过滤装柜里面补单的
// query.setIsCover(0);
query.setIsRemove(0);
//校验始发仓
Long startWarehouseId = query.getStartWarehouseId();
if (startWarehouseId!=null) {
query.setStartWarehouseId(null);
}
List<BoxPreloadGoodsBackVO> goodsItemList = boxPreloadGoodsMapper.orderPreloaded(query);
if (startWarehouseId!=null) {
query.setStartWarehouseId(null);
Iterator<BoxPreloadGoodsBackVO> it = goodsItemList.iterator();
while (it.hasNext()) {
BoxPreloadGoodsBackVO preloadVO = it.next();
Long adjustToDestWarehouseId = preloadVO.getAdjustToDestWarehouseId();
if (adjustToDestWarehouseId != null && adjustToDestWarehouseId != 0) {
//有调仓,判断调仓是否符合条件,不符合条件则直接移除
if (!startWarehouseId.equals(adjustToDestWarehouseId)) it.remove();
} else {
//没有调仓,判断始发仓是否符合条件
if (!startWarehouseId.equals(preloadVO.getStartWarehouseId())) it.remove();
}
}
}
Map<Long, List<BoxPreloadGoodsBackVO>> sectionGoodsMap = goodsItemList.stream()
.collect(Collectors.groupingBy(BoxPreloadGoodsBackVO::getSecId));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment