出库统计

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

@@ -980,7 +980,7 @@ public class AwaitSendController {
                     salesDeliver = "未出库";
                 }else{
                    ///出库状态  1：未出库   2：已出库
-                    switch (salesOrder.getSalesShippingStatus()){
+                    switch (salesOrder.getSalesDeliver()){
                         case 1:
                             salesDeliver = "未出库";
                             break;

watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/order_statistics.ftl

@@ -176,7 +176,7 @@
                     </td>
                     <td>
                         ${(order.salesDeliverTime?string("yyyy-MM-dd"))!''}</br>
-                     <#--${(order.salesDeliverTime?string("HH:mm:ss"))!''}-->
+                     ${(order.salesDeliverTime?string("HH:mm:ss"))!''}
                     </td>
                     <td>
                         <#if order.salesStatus == 0>