Commit 164fce4e authored by 332784038@qq.com's avatar 332784038@qq.com

Merge branch 'master-fix' into release

# Conflicts:
#	yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java
parents bc94a0e8 d654886e
......@@ -1030,7 +1030,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
List<OrderItemDO> orderItemVOList = orderItemService.getOrderItemList(orderItemIds);
AtomicInteger atomicInteger = new AtomicInteger(1);
Map<String, Object> totalItemMap = new HashMap<>();
List<Map<String, Object>> dataList = orderItemVOList.stream().filter(item -> item.getWarehouseInInfoVO() != null).map(item -> {
List<Map<String, Object>> dataList = orderItemVOList.stream().filter(item -> item.getWarehouseInInfoVO() != null && item.getWarehouseInInfoVO().getCartonsNum() > 0).map(item -> {
Map<String, Object> paramMap = new HashMap<>();
//订单项
paramMap.put("index", atomicInteger.getAndIncrement());
......
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