Quellcode durchsuchen

打印订单页面增加产品数量统计

xian vor 6 Jahren
Ursprung
Commit
c6cc366dc4

+ 15 - 2
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -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);
     }
 
     /**

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/print_order.ftl

@@ -18,7 +18,7 @@
 
     <div class="order-list">
         <div>
-            本次共 <span style="color: red;">${(orderSize)!"0"}</span> 个订单&nbsp;&nbsp;未分配物流的订单数量: <span style="color: red;">${errorOrderNum}</span>
+            本次共 <span style="color: red;">${(orderSize)!"0"}</span> 个订单&nbsp;&nbsp; 产品共 <span style="color: red;">${(waitProductTotal)!"0"}</span>&nbsp;&nbsp;未分配物流的订单数量: <span style="color: red;">${errorOrderNum}</span>
             <p style="margin-top: 5px;color: blue;">请设置好默认打印机:Windows开始菜单 >> 设备和打印机 >> 寻找到要打印的机器,将其设置为默认打印机</p>
         </div>
         <div class="mt-20" style="height: 500px;overflow: auto;overflow-x: hidden;margin-bottom: 12px;border: 1px solid #ddd;">