bug修复

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -309,7 +309,7 @@ public interface SalesOrderService {
      * @param salesOrder
      * @return
      */
-    SalesOrderItem getDeliverNum(SalesOrder salesOrder);
+    List<SalesOrderItem> getDeliverNum(SalesOrder salesOrder);
 
     /**
      * 查询订单集合与订单项集合

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -988,7 +988,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     }
 
     @Override
-    public SalesOrderItem getDeliverNum(SalesOrder salesOrder) {
+    public List<SalesOrderItem> getDeliverNum(SalesOrder salesOrder) {
         return salesOrderMapper.getDeliverNum(salesOrder);
     }
 

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/SalesOrderMapper.java

@@ -257,7 +257,7 @@ public interface SalesOrderMapper {
      * @param salesOrder
      * @return
      */
-    SalesOrderItem getDeliverNum(SalesOrder salesOrder);
+    List<SalesOrderItem> getDeliverNum(SalesOrder salesOrder);
 
     /**
      * 查询订单集合与订单项集合

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

@@ -525,27 +525,63 @@ public class AwaitSendController {
         calendarEnd.set(Calendar.SECOND,59);
 
         List<Map<String,Object>> list = new ArrayList<>();
-        Map<String,Object> map = new HashMap<>();
 
-        SalesOrder salesOrder = new SalesOrder();
+        SalesOrder waitSalesOrder = new SalesOrder();
+        SalesOrder sendSalesOrder = new SalesOrder();
         if(type == 1){
-            salesOrder.setStartDate(calendarStart.getTime());
-            salesOrder.setEndDate(calendarEnd.getTime());
-            SalesOrderItem salesOrderItem = salesOrderService.getDeliverNum(salesOrder);
-            map.put("productName",salesOrderItem.getItemProductName());
-            map.put("colorName",salesOrderItem.getItemProductColor());
-            map.put("num",salesOrderItem.getItemProductColor());
+            //今日
+            waitSalesOrder.setStartDate(calendarStart.getTime());
+            waitSalesOrder.setEndDate(calendarEnd.getTime());
+            waitSalesOrder.setSalesShippingStatus(11);
+
+            sendSalesOrder.setStartDate(calendarStart.getTime());
+            sendSalesOrder.setEndDate(calendarEnd.getTime());
+            sendSalesOrder.setSalesShippingStatus(1);
+            sendSalesOrder.setSalesDeliver(2);  //已出库
         }else{
             //2：昨日
             calendarStart.add(Calendar.DATE, -1);// 日期减1
             calendarEnd.add(Calendar.DATE, -1);// 日期减1
-            salesOrder.setStartDate(calendarStart.getTime());
-            salesOrder.setEndDate(calendarEnd.getTime());
-            salesOrderService.getDeliverNum(salesOrder);
+
+            waitSalesOrder.setStartDate(calendarStart.getTime());
+            waitSalesOrder.setEndDate(calendarEnd.getTime());
+            waitSalesOrder.setSalesShippingStatus(11);
+
+            sendSalesOrder.setStartDate(calendarStart.getTime());
+            sendSalesOrder.setEndDate(calendarEnd.getTime());
+            sendSalesOrder.setSalesShippingStatus(1);
+            sendSalesOrder.setSalesDeliver(2);  //已出库
+        }
+        List<SalesOrderItem> waitOrderItemList = salesOrderService.getDeliverNum(waitSalesOrder);
+        List<SalesOrderItem> sentOrderItemList = salesOrderService.getDeliverNum(sendSalesOrder);
+        for(SalesOrderItem  waitOrderItem : waitOrderItemList){
+            Map<String,Object> map = new HashMap<>();
+            map.put("productName",waitOrderItem.getItemProductName());
+            map.put("colorName",waitOrderItem.getItemProductColor());
+            map.put("bar",waitOrderItem.getItemColorBar());
+            map.put("waitNum",waitOrderItem.getItemNum());
+            map.put("sendNum",0);
+            list.add(map);
+        }
+        for (SalesOrderItem sentOrderItem : sentOrderItemList) {
+            boolean flag = false;
+            for (Map<String,Object> m:list) {
+                if( m.get("bar").equals(sentOrderItem.getItemColorBar())){
+                    m.put("sendNum",sentOrderItem.getItemNum());
+                    flag = true;
+                }
+            }
+            if(!flag){
+                Map<String,Object> map = new HashMap<>();
+                map.put("productName",sentOrderItem.getItemProductName());
+                map.put("colorName",sentOrderItem.getItemProductColor());
+                map.put("bar",sentOrderItem.getItemColorBar());
+                map.put("waitNum",0);
+                map.put("sendNum",sentOrderItem.getItemNum());
+                list.add(map);
+            }
         }
-        //type: 1：今日
-//        Map<String,Object> map = new HashMap<>();
-//        Integer num = 0;
+        rj.addResponseKeyValue("list",list);
         return rj;
     }
 

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_list.ftl

@@ -85,52 +85,23 @@
                 <table class="table table-border table-bg table-bordered">
                     <tbody>
                         <tr class="text-c">
-                            <td width="10">今日<br>代发货的产品</td>
+                            <td width="10">今日订单<br>产品发货出库统计<br></td>
                             <td width="100">
 
                                 <table class="table table-border table-bg table-bordered">
-                                    <tbody>
-                                        <tr class="text-c">
-                                            <td width="16">产品名称</td>
-                                            <td width="16">代发货总数</td>
-                                            <td width="16">已出库数量</td>
-                                        </tr>
-                                        <tr class="text-c">
-                                            <td width="16">美国watero</td>
-                                            <td width="16">1</td>
-                                            <td width="16">1</td>
-                                        </tr>
-                                        <tr class="text-c">
-                                            <td width="16">美国watero</td>
-                                            <td width="16">1</td>
-                                            <td width="16">1</td>
-                                        </tr>
+                                    <tbody id="todayOrderNumber">
+
                                     </tbody>
                                 </table>
-
                             </td>
                         </tr>
                         <tr class="text-c">
-                            <td width="10">昨日<br>代发货的产品</td>
+                            <td width="10">昨日订单<br>产品发货出库统计</td>
                             <td width="100">
 
                                 <table class="table table-border table-bg table-bordered">
-                                    <tbody>
-                                    <tr class="text-c">
-                                        <td width="16">产品名称</td>
-                                        <td width="16">代发货总数</td>
-                                        <td width="16">已出库数量</td>
-                                    </tr>
-                                    <tr class="text-c">
-                                        <td width="16">美国watero</td>
-                                        <td width="16">1</td>
-                                        <td width="16">1</td>
-                                    </tr>
-                                    <tr class="text-c">
-                                        <td width="16">美国watero</td>
-                                        <td width="16">1</td>
-                                        <td width="16">1</td>
-                                    </tr>
+                                    <tbody id="yesterdayOrderNumber">
+
                                     </tbody>
                                 </table>
 
@@ -190,8 +161,8 @@
 
 <script>
     $(function (){
-//        getdeliver(1);
-//        getdeliver(2);
+        getdeliver(1);
+        getdeliver(2);
     })
 
     /**
@@ -207,7 +178,22 @@
             },
             dataType: 'json',
             success:function(res) {
-
+                var html = '<tr class="text-c"><td width="16">产品名称</td><td width="16">代发货总数</td><td width="16">已出库数量</td></tr>';
+                for(var i=0;i<res.returnMsg.list.length;i++){
+                    var order = res.returnMsg.list[i];
+                    html += '<tr class="text-c">';
+                    html += '<td width="16">'+ order.productName + '('+ order.colorName +')' +'</td>';
+                    html += '<td width="16">'+ order.waitNum +'</td>';
+                    html += '<td width="16">'+ order.sendNum +'</td>';
+                    html += '</tr>';
+                }
+                if(type == 1){
+                    //今日
+                    $("#todayOrderNumber").html(html);
+                }else{
+                    //昨日
+                    $("#yesterdayOrderNumber").html(html);
+                }
             }
         });
     }