|
@@ -133,12 +133,21 @@ public class AwaitSendController {
|
|
|
// 查询确认的订单
|
|
|
salesOrder.setSalesStatus(1);
|
|
|
PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(1, 1000, salesOrder, false);
|
|
|
+ // 待发货产品总数
|
|
|
+ int waitProductTotal = 0;
|
|
|
// 查询订单项
|
|
|
if (pagedResult != null && pagedResult.getDataList() != null && !pagedResult.getDataList().isEmpty()) {
|
|
|
for (SalesOrder temp : pagedResult.getDataList()) {
|
|
|
SalesOrderItem item = new SalesOrderItem();
|
|
|
item.setItemOrderId(temp.getSalesId());
|
|
|
- temp.setSalesOrderItemList(salesOrderService.listSalesOrderItem(item));
|
|
|
+ List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
|
|
|
+ // 计算产品数量
|
|
|
+ if (items != null && !items.isEmpty()) {
|
|
|
+ for (SalesOrderItem itemTemp : items) {
|
|
|
+ waitProductTotal += itemTemp.getItemNum();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ temp.setSalesOrderItemList(items);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -165,7 +174,11 @@ public class AwaitSendController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- return new ModelAndView("order/salesOrder/print_order").addObject("page", postMap).addObject("orderSize", pagedResult.getDataList().size()).addObject("errorOrderNum", errorOrderNum);
|
|
|
+ return new ModelAndView("order/salesOrder/print_order")
|
|
|
+ .addObject("page", postMap)
|
|
|
+ .addObject("orderSize", pagedResult.getDataList().size())
|
|
|
+ .addObject("errorOrderNum", errorOrderNum)
|
|
|
+ .addObject("waitProductTotal", waitProductTotal);
|
|
|
}
|
|
|
|
|
|
/**
|